From 0a73875d17d7cebbc5fcb7c907e55c6ad320c63d Mon Sep 17 00:00:00 2001
From: nikunj59 <nikunj.sharma@4science.com>
Date: Tue, 21 Jun 2022 21:42:33 +0530
Subject: [PATCH 01/73] CST-6110 changes for robust password error

---
 .../profile-page-security-form.component.html  |  1 +
 ...rofile-page-security-form.component.spec.ts | 13 +++++++++++++
 .../profile-page-security-form.component.ts    |  6 ++++++
 .../profile-page/profile-page.component.html   |  1 +
 src/app/profile-page/profile-page.component.ts |  5 ++++-
 .../create-profile.component.html              |  1 +
 .../create-profile.component.spec.ts           | 18 ++++++++++++++++++
 .../create-profile/create-profile.component.ts |  8 +++++---
 src/assets/i18n/en.json5                       |  4 ++++
 9 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
index 7c1dff5bdf..66c9d73be2 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
@@ -9,3 +9,4 @@
 <div id="notLongEnough" class="container-fluid text-danger" *ngIf="formGroup.hasError('notLongEnough')">{{FORM_PREFIX + 'error.password-length' | translate}}</div>
 <div id="notSame" class="container-fluid text-danger" *ngIf="formGroup.hasError('notSame')">{{FORM_PREFIX + 'error.matching-passwords' | translate}}</div>
 <div id="emptyPassword" class="container-fluid text-danger" *ngIf="(formGroup.dirty || formGroup.touched) && formGroup.hasError('emptyPassword')">{{FORM_PREFIX + 'error.empty-password' | translate}}</div>
+<div data-test="robust-password-error" class="container-fluid text-danger" *ngIf="isRobustPasswordError">{{FORM_PREFIX + 'error.robust-password' | translate}}</div>
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
index 213a83b86e..e8fd4740eb 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
@@ -9,6 +9,7 @@ import { FormBuilderService } from '../../shared/form/builder/form-builder.servi
 import { ProfilePageSecurityFormComponent } from './profile-page-security-form.component';
 import { of as observableOf } from 'rxjs';
 import { RestResponse } from '../../core/cache/response.models';
+import { By } from '@angular/platform-browser';
 
 describe('ProfilePageSecurityFormComponent', () => {
   let component: ProfilePageSecurityFormComponent;
@@ -76,4 +77,16 @@ describe('ProfilePageSecurityFormComponent', () => {
       }));
     });
   });
+
+  describe('On robust password Error', () => {
+    it('should show/hide robust password error', () => {
+      component.isRobustPasswordError = true;
+      fixture.detectChanges();
+      expect(fixture.debugElement.query(By.css('[data-test="robust-password-error"]'))).toBeTruthy();
+
+      component.isRobustPasswordError = false;
+      fixture.detectChanges();
+      expect(fixture.debugElement.query(By.css('[data-test="robust-password-error"]'))).toBeFalsy();
+    })
+  });
 });
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
index 4f310204e3..1eacb9f1be 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
@@ -60,6 +60,12 @@ export class ProfilePageSecurityFormComponent implements OnInit {
    */
   @Input()
   FORM_PREFIX: string;
+
+  /**
+   * monitor to password is weak or not from server response
+   */
+  @Input()
+  isRobustPasswordError: boolean;
   private subs: Subscription[] = [];
 
   constructor(protected formService: DynamicFormService,
diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index 6e22f73a75..63c34d02b3 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -24,6 +24,7 @@
                 [FORM_PREFIX]="'profile.security.form.'"
                 (isInvalid)="setInvalid($event)"
                 (passwordValue)="setPasswordValue($event)"
+                [isRobustPasswordError]="isRobustPasswordError | async"
         ></ds-profile-page-security-form>
       </div>
     </div>
diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index 5629a1ae18..5762192e92 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -73,6 +73,7 @@ export class ProfilePageComponent implements OnInit {
    */
   private currentUser: EPerson;
   canChangePassword$: Observable<boolean>;
+  isRobustPasswordError: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   isResearcherProfileEnabled$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
@@ -147,7 +148,9 @@ export class ProfilePageComponent implements OnInit {
       this.epersonService.patch(this.currentUser, [operation]).pipe(
         getFirstCompletedRemoteData()
       ).subscribe((response: RemoteData<EPerson>) => {
-        if (response.hasSucceeded) {
+        if (response.statusCode === 422) {
+          this.isRobustPasswordError.next(true);
+        } else if (response.hasSucceeded) {
           this.notificationsService.success(
             this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'success.title'),
             this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'success.content')
diff --git a/src/app/register-page/create-profile/create-profile.component.html b/src/app/register-page/create-profile/create-profile.component.html
index f56059ad69..5ef17c6b64 100644
--- a/src/app/register-page/create-profile/create-profile.component.html
+++ b/src/app/register-page/create-profile/create-profile.component.html
@@ -73,6 +73,7 @@
                     [FORM_PREFIX]="'register-page.create-profile.security.'"
                     (isInvalid)="setInValid($event)"
                     (passwordValue)="setPasswordValue($event)"
+                    [isRobustPasswordError]="isRobustPasswordError | async"
             ></ds-profile-page-security-form>
         </div>
     </div>
diff --git a/src/app/register-page/create-profile/create-profile.component.spec.ts b/src/app/register-page/create-profile/create-profile.component.spec.ts
index b95e380e08..d2d4c4c0ee 100644
--- a/src/app/register-page/create-profile/create-profile.component.spec.ts
+++ b/src/app/register-page/create-profile/create-profile.component.spec.ts
@@ -238,6 +238,24 @@ describe('CreateProfileComponent', () => {
       expect(router.navigate).not.toHaveBeenCalled();
       expect(notificationsService.error).toHaveBeenCalled();
     });
+
+    it('should submit an eperson for creation but password is weak', () => {
+
+      (ePersonDataService.createEPersonForToken as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Error', 422));
+
+      comp.firstName.patchValue('First');
+      comp.lastName.patchValue('Last');
+      comp.contactPhone.patchValue('Phone');
+      comp.language.patchValue('en');
+      comp.password = 'password';
+      comp.isInValidPassword = false;
+
+      comp.submitEperson();
+
+      expect(ePersonDataService.createEPersonForToken).toHaveBeenCalledWith(eperson, 'test-token');
+      expect(comp.isRobustPasswordError.value).toBeTrue();
+    });
+
     it('should submit not create an eperson when the user info form is invalid', () => {
 
       (ePersonDataService.createEPersonForToken as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Error', 500));
diff --git a/src/app/register-page/create-profile/create-profile.component.ts b/src/app/register-page/create-profile/create-profile.component.ts
index d042e63ece..ff71e1ee01 100644
--- a/src/app/register-page/create-profile/create-profile.component.ts
+++ b/src/app/register-page/create-profile/create-profile.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { map } from 'rxjs/operators';
 import { Registration } from '../../core/shared/registration.model';
-import { Observable } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
 import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
 import { TranslateService } from '@ngx-translate/core';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
@@ -40,7 +40,7 @@ export class CreateProfileComponent implements OnInit {
 
   userInfoForm: FormGroup;
   activeLangs: LangConfig[];
-
+  isRobustPasswordError: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
   constructor(
     private translateService: TranslateService,
     private ePersonDataService: EPersonDataService,
@@ -160,7 +160,9 @@ export class CreateProfileComponent implements OnInit {
       this.ePersonDataService.createEPersonForToken(eperson, this.token).pipe(
         getFirstCompletedRemoteData(),
       ).subscribe((rd: RemoteData<EPerson>) => {
-        if (rd.hasSucceeded) {
+        if (rd.statusCode === 422) {
+          this.isRobustPasswordError.next(true);
+        } else if (rd.hasSucceeded) {
           this.notificationsService.success(this.translateService.get('register-page.create-profile.submit.success.head'),
             this.translateService.get('register-page.create-profile.submit.success.content'));
           this.store.dispatch(new AuthenticateAction(this.email, this.password));
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index cb664e19f7..bf5ccb4f06 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3056,6 +3056,8 @@
 
   "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
 
+  "profile.security.form.notifications.error.robust-password": "Please select a more robust password.",
+
   "profile.title": "Update Profile",
 
   "profile.card.researcher": "Researcher Profile",
@@ -3146,6 +3148,8 @@
 
   "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
 
+  "register-page.create-profile.security.error.robust-password": "Please select a more robust password.",
+
   "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
 
   "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.",

From 17a89387f290da1ba4a6c6829c96881fa77314b0 Mon Sep 17 00:00:00 2001
From: nikunj59 <nikunj.sharma@4science.com>
Date: Wed, 22 Jun 2022 13:03:06 +0530
Subject: [PATCH 02/73] CST-6110 changes for robust password error

---
 .../profile-page/profile-page.component.spec.ts | 17 +++++++++++++++++
 src/assets/i18n/en.json5                        |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts
index 6893ac2437..bd85448566 100644
--- a/src/app/profile-page/profile-page.component.spec.ts
+++ b/src/app/profile-page/profile-page.component.spec.ts
@@ -228,6 +228,23 @@ describe('ProfilePageComponent', () => {
           expect(epersonService.patch).toHaveBeenCalledWith(user, operations);
         });
       });
+
+      describe('when password is filled in, and is weak', () => {
+        let result;
+        let operations;
+
+        it('should return call epersonService.patch', () => {
+          (epersonService.patch as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Error', 422));
+          component.setPasswordValue('testest');
+
+          component.setInvalid(false);
+          operations = [{ op: 'add', path: '/password', value: 'testest' }];
+          result = component.updateSecurity();
+          expect(result).toEqual(true);
+          expect(epersonService.patch).toHaveBeenCalledWith(user, operations);
+          expect(component.isRobustPasswordError.value).toBeTrue();
+        });
+      });
     });
 
     describe('canChangePassword$', () => {
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index bf5ccb4f06..353912a6b7 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3056,7 +3056,7 @@
 
   "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
 
-  "profile.security.form.notifications.error.robust-password": "Please select a more robust password.",
+  "profile.security.form.error.robust-password": "Please select a more robust password.",
 
   "profile.title": "Update Profile",
 

From 7afa4dcd8dc426ed10b54c8d3edc116ecdc50f74 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Thu, 4 Aug 2022 11:21:14 -0700
Subject: [PATCH 03/73] New themable components

---
 .../community-page.component.html             |  3 +-
 .../community-page/community-page.module.ts   |  8 ++++++
 ...nity-page-sub-collection-list.component.ts |  7 ++++-
 ...nity-page-sub-collection-list.component.ts | 28 +++++++++++++++++++
 ...unity-page-sub-community-list.component.ts |  9 ++++--
 ...unity-page-sub-community-list.component.ts | 28 +++++++++++++++++++
 ...ty-page-sub-collection-list.component.html |  0
 ...ty-page-sub-collection-list.component.scss |  0
 ...nity-page-sub-collection-list.component.ts | 12 ++++++++
 ...ity-page-sub-community-list.component.html |  0
 ...ity-page-sub-community-list.component.scss |  0
 ...unity-page-sub-community-list.component.ts | 12 ++++++++
 src/themes/custom/eager-theme.module.ts       |  2 +-
 src/themes/custom/lazy-theme.module.ts        | 11 ++++++++
 14 files changed, 115 insertions(+), 5 deletions(-)
 create mode 100644 src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts
 create mode 100644 src/app/community-page/sub-community-list/themed-community-page-sub-community-list.component.ts
 create mode 100644 src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html
 create mode 100644 src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss
 create mode 100644 src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
 create mode 100644 src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.html
 create mode 100644 src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.scss
 create mode 100644 src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.ts

diff --git a/src/app/community-page/community-page.component.html b/src/app/community-page/community-page.component.html
index 6b277bd07f..314a14658d 100644
--- a/src/app/community-page/community-page.component.html
+++ b/src/app/community-page/community-page.component.html
@@ -25,11 +25,12 @@
         </div>
       </div>
       <section class="comcol-page-browse-section">
+
         <!-- Browse-By Links -->
         <ds-themed-comcol-page-browse-by [id]="communityPayload.id" [contentType]="communityPayload.type">
         </ds-themed-comcol-page-browse-by>
 
-        <ds-community-page-sub-community-list [community]="communityPayload"></ds-community-page-sub-community-list>
+        <ds-themed-community-page-sub-community-list [community]="communityPayload"></ds-themed-community-page-sub-community-list>
         <ds-community-page-sub-collection-list [community]="communityPayload"></ds-community-page-sub-collection-list>
       </section>
       <footer  *ngIf="communityPayload.copyrightText"  class="border-top my-5 pt-4">
diff --git a/src/app/community-page/community-page.module.ts b/src/app/community-page/community-page.module.ts
index 724b762e90..7cf2c8db8a 100644
--- a/src/app/community-page/community-page.module.ts
+++ b/src/app/community-page/community-page.module.ts
@@ -13,10 +13,18 @@ import { StatisticsModule } from '../statistics/statistics.module';
 import { CommunityFormModule } from './community-form/community-form.module';
 import { ThemedCommunityPageComponent } from './themed-community-page.component';
 import { ComcolModule } from '../shared/comcol/comcol.module';
+import {
+  ThemedCommunityPageSubCommunityListComponent
+} from './sub-community-list/themed-community-page-sub-community-list.component';
+import {
+  ThemedCollectionPageSubCollectionListComponent
+} from './sub-collection-list/themed-community-page-sub-collection-list.component';
 
 const DECLARATIONS = [CommunityPageComponent,
   ThemedCommunityPageComponent,
+  ThemedCommunityPageSubCommunityListComponent,
   CommunityPageSubCollectionListComponent,
+  ThemedCollectionPageSubCollectionListComponent,
   CommunityPageSubCommunityListComponent,
   CreateCommunityPageComponent,
   DeleteCommunityPageComponent];
diff --git a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
index adb4c32a32..e117ab4102 100644
--- a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
+++ b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -22,6 +22,11 @@ import { switchMap } from 'rxjs/operators';
 export class CommunityPageSubCollectionListComponent implements OnInit {
   @Input() community: Community;
 
+  /**
+   * Optional page size (defaults to 5)
+   */
+  @Input() pageSize: number;
+
   /**
    * The pagination configuration
    */
@@ -50,7 +55,7 @@ export class CommunityPageSubCollectionListComponent implements OnInit {
   ngOnInit(): void {
     this.config = new PaginationComponentOptions();
     this.config.id = this.pageId;
-    this.config.pageSize = 5;
+    this.pageSize ? this.config.pageSize = this.pageSize : this.config.pageSize = 5;
     this.config.currentPage = 1;
     this.sortConfig = new SortOptions('dc.title', SortDirection.ASC);
     this.initPage();
diff --git a/src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts b/src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts
new file mode 100644
index 0000000000..a2d3d3a39d
--- /dev/null
+++ b/src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts
@@ -0,0 +1,28 @@
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { CommunityPageSubCollectionListComponent } from './community-page-sub-collection-list.component';
+import { Component, Input } from '@angular/core';
+import { Community } from '../../core/shared/community.model';
+
+@Component({
+  selector: 'ds-themed-community-page-sub-collection-list',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+export class ThemedCollectionPageSubCollectionListComponent extends ThemedComponent<CommunityPageSubCollectionListComponent> {
+  protected getComponentName(): string {
+    return 'CommunityPageSubCollectionListComponent';
+  }
+
+  @Input() community: Community;
+  @Input() pageSize: number;
+  protected inAndOutputNames: (keyof CommunityPageSubCollectionListComponent & keyof this)[] = ['community', 'pageSize'];
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/community-page/sub-community-list/community-page-sub-collection-list.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./community-page-sub-collection-list.component`);
+  }
+
+}
diff --git a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
index 2c30ede554..1ab2af5cf8 100644
--- a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
+++ b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
@@ -14,7 +14,7 @@ import { switchMap } from 'rxjs/operators';
 import { PaginationService } from '../../core/pagination/pagination.service';
 
 @Component({
-  selector: 'ds-community-page-sub-community-list',
+  selector: ' ',
   styleUrls: ['./community-page-sub-community-list.component.scss'],
   templateUrl: './community-page-sub-community-list.component.html',
   animations: [fadeIn]
@@ -25,6 +25,11 @@ import { PaginationService } from '../../core/pagination/pagination.service';
 export class CommunityPageSubCommunityListComponent implements OnInit {
   @Input() community: Community;
 
+  /**
+   * Optional page size (defaults to 5)
+   */
+  @Input() pageSize: number;
+
   /**
    * The pagination configuration
    */
@@ -53,7 +58,7 @@ export class CommunityPageSubCommunityListComponent implements OnInit {
   ngOnInit(): void {
     this.config = new PaginationComponentOptions();
     this.config.id = this.pageId;
-    this.config.pageSize = 5;
+    this.pageSize ? this.config.pageSize = this.pageSize : this.config.pageSize = 5;
     this.config.currentPage = 1;
     this.sortConfig = new SortOptions('dc.title', SortDirection.ASC);
     this.initPage();
diff --git a/src/app/community-page/sub-community-list/themed-community-page-sub-community-list.component.ts b/src/app/community-page/sub-community-list/themed-community-page-sub-community-list.component.ts
new file mode 100644
index 0000000000..407085c292
--- /dev/null
+++ b/src/app/community-page/sub-community-list/themed-community-page-sub-community-list.component.ts
@@ -0,0 +1,28 @@
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { CommunityPageSubCommunityListComponent } from './community-page-sub-community-list.component';
+import { Component, Input } from '@angular/core';
+import { Community } from '../../core/shared/community.model';
+
+@Component({
+  selector: 'ds-themed-community-page-sub-community-list',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+export class ThemedCommunityPageSubCommunityListComponent extends ThemedComponent<CommunityPageSubCommunityListComponent> {
+  protected getComponentName(): string {
+    return 'CommunityPageSubCommunityListComponent';
+  }
+
+  @Input() community: Community;
+  @Input() pageSize: number;
+  protected inAndOutputNames: (keyof CommunityPageSubCommunityListComponent & keyof this)[] = ['community', 'pageSize'];
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/community-page/sub-community-list/community-page-sub-community-list.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./community-page-sub-community-list.component`);
+  }
+
+}
diff --git a/src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html b/src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss b/src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts b/src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
new file mode 100644
index 0000000000..a228fe1071
--- /dev/null
+++ b/src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+import { CommunityPageSubCollectionListComponent as BaseComponent }
+  from '../../../../../app/community-page/sub-collection-list/community-page-sub-collection-list.component';
+
+@Component({
+  selector: 'ds-community-page-sub-collection-list',
+  // styleUrls: ['./community-page-sub-collection-list.component.scss'],
+  styleUrls: ['../../../../../app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss'],
+  // templateUrl: './community-page-sub-collection-list.component.html',
+  templateUrl: '../../../../../app/community-page/sub-collection-list/community-page-sub-collection-list.component.html'
+})
+export class CommunityPageSubCollectionListComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.html b/src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.scss b/src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.ts b/src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
new file mode 100644
index 0000000000..1db265a844
--- /dev/null
+++ b/src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+import { CommunityPageSubCommunityListComponent as BaseComponent }
+  from '../../../../../app/community-page/sub-community-list/community-page-sub-community-list.component';
+
+@Component({
+  selector: 'ds-community-page-sub-community-list',
+  // styleUrls: ['./community-page-sub-community-list.component.scss'],
+  styleUrls: ['../../../../../app/community-page/sub-community-list/community-page-sub-community-list.component.scss'],
+  // templateUrl: './community-page-sub-community-list.component.html',
+  templateUrl: '../../../../../app/community-page/sub-community-list/community-page-sub-community-list.component.html'
+})
+export class CommunityPageSubCommunityListComponent extends BaseComponent {}
diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts
index 5256d2fd7c..63f14ebaf5 100644
--- a/src/themes/custom/eager-theme.module.ts
+++ b/src/themes/custom/eager-theme.module.ts
@@ -40,7 +40,7 @@ const DECLARATIONS = [
   HeaderComponent,
   HeaderNavbarWrapperComponent,
   NavbarComponent,
-  FooterComponent,
+  FooterComponent
 ];
 
 @NgModule({
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index 5b9d5b7230..6bab3ebd28 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -99,6 +99,12 @@ import {
 import { LoadingComponent } from './app/shared/loading/loading.component';
 import { SearchResultsComponent } from './app/shared/search/search-results/search-results.component';
 import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
+import {
+  CommunityPageSubCommunityListComponent
+} from './app/community-page/sub-community-list/community-page-sub-community-list.component';
+import {
+  CommunityPageSubCollectionListComponent
+} from './app/community-page/sub-collection-list/community-page-sub-collection-list.component';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -118,6 +124,8 @@ const DECLARATIONS = [
   ItemStatisticsPageComponent,
   SiteStatisticsPageComponent,
   CommunityPageComponent,
+  CommunityPageSubCommunityListComponent,
+  CommunityPageSubCollectionListComponent,
   CollectionPageComponent,
   ItemPageComponent,
   FullItemPageComponent,
@@ -196,6 +204,9 @@ const DECLARATIONS = [
     ComcolModule,
   ],
   declarations: DECLARATIONS,
+  exports: [
+    CommunityPageSubCollectionListComponent
+  ]
 })
 
   /**

From 2ac8d4140f9cdbc4e990f7ae96a4649a36f15fe1 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Thu, 4 Aug 2022 11:24:15 -0700
Subject: [PATCH 04/73] Html template updated.

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

diff --git a/src/app/community-page/community-page.component.html b/src/app/community-page/community-page.component.html
index 314a14658d..17512f10a9 100644
--- a/src/app/community-page/community-page.component.html
+++ b/src/app/community-page/community-page.component.html
@@ -31,7 +31,7 @@
         </ds-themed-comcol-page-browse-by>
 
         <ds-themed-community-page-sub-community-list [community]="communityPayload"></ds-themed-community-page-sub-community-list>
-        <ds-community-page-sub-collection-list [community]="communityPayload"></ds-community-page-sub-collection-list>
+        <ds-themed-community-page-sub-collection-list [community]="communityPayload"></ds-themed-community-page-sub-collection-list>
       </section>
       <footer  *ngIf="communityPayload.copyrightText"  class="border-top my-5 pt-4">
         <!-- Copyright -->

From f4c0f792885928c9da98329a8cdab977f8098c41 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Thu, 4 Aug 2022 12:10:45 -0700
Subject: [PATCH 05/73] Lint errors.

---
 .../community-page-sub-collection-list.component.ts       | 4 ++--
 ...themed-community-page-sub-collection-list.component.ts | 8 ++++----
 .../community-page-sub-community-list.component.ts        | 8 ++++----
 .../themed-community-page-sub-community-list.component.ts | 7 ++++---
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
index e117ab4102..f72405ce13 100644
--- a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
+++ b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 
 import { BehaviorSubject, combineLatest as observableCombineLatest } from 'rxjs';
 
@@ -19,7 +19,7 @@ import { switchMap } from 'rxjs/operators';
   templateUrl: './community-page-sub-collection-list.component.html',
   animations:[fadeIn]
 })
-export class CommunityPageSubCollectionListComponent implements OnInit {
+export class CommunityPageSubCollectionListComponent implements OnInit, OnDestroy {
   @Input() community: Community;
 
   /**
diff --git a/src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts b/src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts
index a2d3d3a39d..95d9968819 100644
--- a/src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts
+++ b/src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts
@@ -9,14 +9,14 @@ import { Community } from '../../core/shared/community.model';
   templateUrl: '../../shared/theme-support/themed.component.html',
 })
 export class ThemedCollectionPageSubCollectionListComponent extends ThemedComponent<CommunityPageSubCollectionListComponent> {
-  protected getComponentName(): string {
-    return 'CommunityPageSubCollectionListComponent';
-  }
-
   @Input() community: Community;
   @Input() pageSize: number;
   protected inAndOutputNames: (keyof CommunityPageSubCollectionListComponent & keyof this)[] = ['community', 'pageSize'];
 
+  protected getComponentName(): string {
+    return 'CommunityPageSubCollectionListComponent';
+  }
+
   protected importThemedComponent(themeName: string): Promise<any> {
     return import(`../../../themes/${themeName}/app/community-page/sub-community-list/community-page-sub-collection-list.component`);
   }
diff --git a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
index 1ab2af5cf8..5ba89490b9 100644
--- a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
+++ b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 
 import { BehaviorSubject, combineLatest as observableCombineLatest } from 'rxjs';
 
@@ -14,7 +14,7 @@ import { switchMap } from 'rxjs/operators';
 import { PaginationService } from '../../core/pagination/pagination.service';
 
 @Component({
-  selector: ' ',
+  selector: 'ds-community-page-sub-community-list',
   styleUrls: ['./community-page-sub-community-list.component.scss'],
   templateUrl: './community-page-sub-community-list.component.html',
   animations: [fadeIn]
@@ -22,11 +22,11 @@ import { PaginationService } from '../../core/pagination/pagination.service';
 /**
  * Component to render the sub-communities of a Community
  */
-export class CommunityPageSubCommunityListComponent implements OnInit {
+export class CommunityPageSubCommunityListComponent implements OnInit, OnDestroy {
   @Input() community: Community;
 
   /**
-   * Optional page size (defaults to 5)
+   * Optional page size (defaults to 5).
    */
   @Input() pageSize: number;
 
diff --git a/src/app/community-page/sub-community-list/themed-community-page-sub-community-list.component.ts b/src/app/community-page/sub-community-list/themed-community-page-sub-community-list.component.ts
index 407085c292..852c53186e 100644
--- a/src/app/community-page/sub-community-list/themed-community-page-sub-community-list.component.ts
+++ b/src/app/community-page/sub-community-list/themed-community-page-sub-community-list.component.ts
@@ -9,14 +9,15 @@ import { Community } from '../../core/shared/community.model';
   templateUrl: '../../shared/theme-support/themed.component.html',
 })
 export class ThemedCommunityPageSubCommunityListComponent extends ThemedComponent<CommunityPageSubCommunityListComponent> {
-  protected getComponentName(): string {
-    return 'CommunityPageSubCommunityListComponent';
-  }
 
   @Input() community: Community;
   @Input() pageSize: number;
   protected inAndOutputNames: (keyof CommunityPageSubCommunityListComponent & keyof this)[] = ['community', 'pageSize'];
 
+  protected getComponentName(): string {
+    return 'CommunityPageSubCommunityListComponent';
+  }
+
   protected importThemedComponent(themeName: string): Promise<any> {
     return import(`../../../themes/${themeName}/app/community-page/sub-community-list/community-page-sub-community-list.component`);
   }

From 7a3284f6bcded77d8f148c5e662b709c1ee3aac0 Mon Sep 17 00:00:00 2001
From: "Mark H. Wood" <mwood@IUPUI.Edu>
Date: Tue, 16 Aug 2022 16:32:38 -0400
Subject: [PATCH 06/73] Make the size of a browse result page configurable.

---
 .../browse-by-metadata-page.component.ts        |  3 ++-
 src/config/browse-by-config.interface.ts        | 17 +++++++++++++----
 src/config/default-app-config.ts                |  4 +++-
 src/environments/environment.test.ts            |  2 ++
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
index f789389697..dcef03b1b1 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -17,6 +17,7 @@ import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
 import { BrowseByDataType, rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { map } from 'rxjs/operators';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'ds-browse-by-metadata-page',
@@ -52,7 +53,7 @@ export class BrowseByMetadataPageComponent implements OnInit {
   paginationConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'bbm',
     currentPage: 1,
-    pageSize: 20
+    pageSize: environment.browseBy.pageSize,
   });
 
   /**
diff --git a/src/config/browse-by-config.interface.ts b/src/config/browse-by-config.interface.ts
index 6adba66b92..eadcdff1a9 100644
--- a/src/config/browse-by-config.interface.ts
+++ b/src/config/browse-by-config.interface.ts
@@ -1,21 +1,30 @@
 import { Config } from './config.interface';
 
 /**
- * Config that determines how the dropdown list of years are created for browse-by-date components
+ * Config that determines how the dropdown list of years are created for
+ * browse-by-date components.
  */
 export interface BrowseByConfig extends Config {
   /**
-   * The max amount of years to display using jumps of one year (current year - oneYearLimit)
+   * The max amount of years to display using jumps of one year
+   * (current year - oneYearLimit)
    */
   oneYearLimit: number;
 
   /**
-   * Limit for years to display using jumps of five years (current year - fiveYearLimit)
+   * Limit for years to display using jumps of five years
+   * (current year - fiveYearLimit)
    */
   fiveYearLimit: number;
 
   /**
-   * The absolute lowest year to display in the dropdown when no lowest date can be found for all items
+   * The absolute lowest year to display in the dropdown when no lowest date can
+   * be found for all items.
    */
   defaultLowerLimit: number;
+
+  /**
+   * Number of entries in the viewport of a paginated browse-by list.
+   */
+   pageSize: number;
 }
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index dc54c2fcb0..ac9c691d9d 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -193,7 +193,9 @@ export class DefaultAppConfig implements AppConfig {
     // Limit for years to display using jumps of five years (current year - fiveYearLimit)
     fiveYearLimit: 30,
     // The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
-    defaultLowerLimit: 1900
+    defaultLowerLimit: 1900,
+    // The number of entries in a paginated browse results list.
+    pageSize: 20
   };
 
   // Item Page Config
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 7c24ef8f05..47d33cb7a5 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -192,6 +192,8 @@ export const environment: BuildConfig = {
     fiveYearLimit: 30,
     // The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
     defaultLowerLimit: 1900,
+    // The number of entries in a paginated browse results list.
+    pageSize: 20,
   },
   item: {
     edit: {

From 904c6168a80cb003a7697319dc6ac1e427d26301 Mon Sep 17 00:00:00 2001
From: Nikunj Sharma <nikunj.sharma@4science.com>
Date: Wed, 17 Aug 2022 13:39:09 +0530
Subject: [PATCH 07/73] CST-6110 changes for robust error message changed and
 clear message on paasword update

---
 .../forgot-password-form.component.html          |  1 +
 .../forgot-password-form.component.spec.ts       | 16 ++++++++++++++++
 .../forgot-password-form.component.ts            |  8 ++++++--
 src/app/profile-page/profile-page.component.ts   |  1 +
 .../create-profile/create-profile.component.ts   |  1 +
 src/assets/i18n/en.json5                         |  7 ++++---
 6 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
index 5fb0006279..f3bc9005c6 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
@@ -21,6 +21,7 @@
                     [FORM_PREFIX]="'forgot-password.form.'"
                     (isInvalid)="setInValid($event)"
                     (passwordValue)="setPasswordValue($event)"
+                    [isRobustPasswordError]="isRobustPasswordError | async"
             ></ds-profile-page-security-form>
         </div>
     </div>
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
index 7f4776b5a1..a618e7b46d 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
@@ -108,6 +108,22 @@ describe('ForgotPasswordFormComponent', () => {
       expect(router.navigate).not.toHaveBeenCalled();
       expect(notificationsService.error).toHaveBeenCalled();
     });
+
+    it('should submit a patch request for the user uuid and get robust password error stay on page', () => {
+
+      (ePersonDataService.patchPasswordWithToken as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Error', 422));
+
+      comp.password = 'password';
+      comp.isInValid = false;
+
+      comp.submit();
+
+      expect(ePersonDataService.patchPasswordWithToken).toHaveBeenCalledWith('test-uuid', 'test-token', 'password');
+      expect(store.dispatch).not.toHaveBeenCalled();
+      expect(router.navigate).not.toHaveBeenCalled();
+      expect(comp.isRobustPasswordError.value).toBeTrue();
+    });
+
     it('should submit a patch request for the user uuid when the form is invalid', () => {
 
       comp.password = 'password';
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index 63d590dbf0..5e4439fa20 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { TranslateService } from '@ngx-translate/core';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { Observable } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
 import { Registration } from '../../core/shared/registration.model';
 import { map } from 'rxjs/operators';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -39,6 +39,7 @@ export class ForgotPasswordFormComponent {
    * Prefix for the notification messages of this component
    */
   NOTIFICATIONS_PREFIX = 'forgot-password.form.notification';
+  isRobustPasswordError: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   constructor(private ePersonDataService: EPersonDataService,
               private translateService: TranslateService,
@@ -67,6 +68,7 @@ export class ForgotPasswordFormComponent {
 
   setPasswordValue($event: string) {
     this.password = $event;
+    this.isRobustPasswordError.next(false);
   }
 
   /**
@@ -78,7 +80,9 @@ export class ForgotPasswordFormComponent {
       this.ePersonDataService.patchPasswordWithToken(this.user, this.token, this.password).pipe(
         getFirstCompletedRemoteData()
       ).subscribe((response: RemoteData<EPerson>) => {
-        if (response.hasSucceeded) {
+        if (response.statusCode === 422) {
+          this.isRobustPasswordError.next(true);
+        } else if (response.hasSucceeded) {
           this.notificationsService.success(
             this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.success.title'),
             this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.success.content')
diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index 5762192e92..940422628d 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -171,6 +171,7 @@ export class ProfilePageComponent implements OnInit {
    */
   setPasswordValue($event: string) {
     this.password = $event;
+    this.isRobustPasswordError.next(false);
   }
 
   /**
diff --git a/src/app/register-page/create-profile/create-profile.component.ts b/src/app/register-page/create-profile/create-profile.component.ts
index ff71e1ee01..09449b9be8 100644
--- a/src/app/register-page/create-profile/create-profile.component.ts
+++ b/src/app/register-page/create-profile/create-profile.component.ts
@@ -93,6 +93,7 @@ export class CreateProfileComponent implements OnInit {
   setPasswordValue($event: string) {
     this.password = $event;
     this.isInValidPassword = this.isInValidPassword || isEmpty(this.password);
+    this.isRobustPasswordError.next(false);
   }
 
   get firstName() {
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index f150f77928..85f93f06a4 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -640,7 +640,7 @@
   "bitstream-request-a-copy.alert.canDownload2": "here",
 
   "bitstream-request-a-copy.header": "Request a copy of the file",
-  
+
   "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: ",
@@ -1516,6 +1516,7 @@
 
   "forgot-password.form.submit": "Submit password",
 
+  "forgot-password.form.error.robust-password": "Selected password is invalid, it should be at least 8 and at most 15 characters long and must contain at least one uppercase and one lowercase character and a number.",
 
 
   "form.add": "Add more",
@@ -3060,7 +3061,7 @@
 
   "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
 
-  "profile.security.form.error.robust-password": "Please select a more robust password.",
+  "profile.security.form.error.robust-password": "Selected password is invalid, it should be at least 8 and at most 15 characters long and must contain at least one uppercase and one lowercase character and a number.",
 
   "profile.title": "Update Profile",
 
@@ -3152,7 +3153,7 @@
 
   "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
 
-  "register-page.create-profile.security.error.robust-password": "Please select a more robust password.",
+  "register-page.create-profile.security.error.robust-password": "Selected password is invalid, it should be at least 8 and at most 15 characters long and must contain at least one uppercase and one lowercase character and a number.",
 
   "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
 

From 762f8930b720e21c8dd696724a509a082960ab6a Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 16 Aug 2022 18:27:01 +0200
Subject: [PATCH 08/73] 93889: Invalidate EPerson when their Groups change and
 groups when a subgroup is added

---
 .../group-form/group-form.component.ts        |   4 +-
 .../members-list/members-list.component.ts    |   2 +-
 .../core/eperson/group-data.service.spec.ts   |  60 ++++++-
 src/app/core/eperson/group-data.service.ts    | 163 ++++++++++++++++--
 src/app/shared/testing/data-service.stub.ts   |   9 +
 5 files changed, 222 insertions(+), 16 deletions(-)
 create mode 100644 src/app/shared/testing/data-service.stub.ts

diff --git a/src/app/access-control/group-registry/group-form/group-form.component.ts b/src/app/access-control/group-registry/group-form/group-form.component.ts
index b0178f1294..337f4470c1 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.ts
+++ b/src/app/access-control/group-registry/group-form/group-form.component.ts
@@ -377,7 +377,9 @@ export class GroupFormComponent implements OnInit, OnDestroy {
    */
   setActiveGroup(groupId: string) {
     this.groupDataService.cancelEditGroup();
-    this.groupDataService.findById(groupId)
+    const nextGroup$ = this.groupDataService.findById(groupId);
+    this.subs.push(nextGroup$.subscribe());
+    nextGroup$
       .pipe(
         getFirstSucceededRemoteData(),
         getRemoteDataPayload())
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
index 54d144da51..b092afa40e 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -174,7 +174,7 @@ export class MembersListComponent implements OnInit, OnDestroy {
           return this.ePersonDataService.findAllByHref(group._links.epersons.href, {
             currentPage: 1,
             elementsPerPage: 9999
-          }, false)
+          })
             .pipe(
               getFirstSucceededRemoteData(),
               getRemoteDataPayload(),
diff --git a/src/app/core/eperson/group-data.service.spec.ts b/src/app/core/eperson/group-data.service.spec.ts
index c30b74e966..01c8632afa 100644
--- a/src/app/core/eperson/group-data.service.spec.ts
+++ b/src/app/core/eperson/group-data.service.spec.ts
@@ -26,6 +26,12 @@ import { EPersonMock, EPersonMock2 } from '../../shared/testing/eperson.mock';
 import { createPaginatedList, createRequestEntry$ } from '../../shared/testing/utils.test';
 import { CoreState } from '../core-state.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { DataService } from '../data/data.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { getMockLinkService } from '../../shared/mocks/link-service.mock';
+import { DataServiceStub } from '../../shared/testing/data-service.stub';
+import { of as observableOf } from 'rxjs';
+import { ObjectCacheEntry } from '../cache/object-cache.reducer';
 
 describe('GroupDataService', () => {
   let service: GroupDataService;
@@ -38,6 +44,8 @@ describe('GroupDataService', () => {
   let groups$;
   let halService;
   let rdbService;
+  let objectCache: ObjectCacheService;
+  let dataService: DataServiceStub;
 
   function init() {
     restEndpointURL = 'https://dspace.4science.it/dspace-spring-rest/api/eperson';
@@ -46,6 +54,8 @@ describe('GroupDataService', () => {
     groups$ = createSuccessfulRemoteDataObject$(createPaginatedList(groups));
     rdbService = getMockRemoteDataBuildServiceHrefMap(undefined, { 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups': groups$ });
     halService = new HALEndpointServiceStub(restEndpointURL);
+    objectCache = new ObjectCacheService(store, getMockLinkService());
+    dataService = new DataServiceStub();
     TestBed.configureTestingModule({
       imports: [
         CommonModule,
@@ -58,7 +68,9 @@ describe('GroupDataService', () => {
         }),
       ],
       declarations: [],
-      providers: [],
+      providers: [
+        { provide: DataService, useValue: dataService },
+      ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
     });
   }
@@ -71,7 +83,7 @@ describe('GroupDataService', () => {
       requestService,
       rdbService,
       store,
-      null,
+      objectCache,
       halService,
       null,
     );
@@ -109,6 +121,10 @@ describe('GroupDataService', () => {
 
   describe('addSubGroupToGroup', () => {
     beforeEach(() => {
+      spyOn(objectCache, 'getByHref').and.returnValue(observableOf({
+        requestUUIDs: ['request1', 'request2']
+      } as ObjectCacheEntry));
+      spyOn(dataService, 'invalidateByHref');
       service.addSubGroupToGroup(GroupMock, GroupMock2).subscribe();
     });
     it('should send PostRequest to eperson/groups/group-id/subgroups endpoint with new subgroup link in body', () => {
@@ -119,20 +135,40 @@ describe('GroupDataService', () => {
       const expected = new PostRequest(requestService.generateRequestId(), GroupMock.self + '/' + service.subgroupsEndpoint, GroupMock2.self, options);
       expect(requestService.send).toHaveBeenCalledWith(expected);
     });
+    it('should invalidate the previous requests of the parent group', () => {
+      expect(objectCache.getByHref).toHaveBeenCalledWith(GroupMock._links.self.href);
+      expect(requestService.setStaleByUUID).toHaveBeenCalledTimes(2);
+      expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request1');
+      expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request2');
+    });
   });
 
   describe('deleteSubGroupFromGroup', () => {
     beforeEach(() => {
+      spyOn(objectCache, 'getByHref').and.returnValue(observableOf({
+        requestUUIDs: ['request1', 'request2']
+      } as ObjectCacheEntry));
+      spyOn(dataService, 'invalidateByHref');
       service.deleteSubGroupFromGroup(GroupMock, GroupMock2).subscribe();
     });
     it('should send DeleteRequest to eperson/groups/group-id/subgroups/group-id endpoint', () => {
       const expected = new DeleteRequest(requestService.generateRequestId(), GroupMock.self + '/' + service.subgroupsEndpoint + '/' + GroupMock2.id);
       expect(requestService.send).toHaveBeenCalledWith(expected);
     });
+    it('should invalidate the previous requests of the parent group\'', () => {
+      expect(objectCache.getByHref).toHaveBeenCalledWith(GroupMock._links.self.href);
+      expect(requestService.setStaleByUUID).toHaveBeenCalledTimes(2);
+      expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request1');
+      expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request2');
+    });
   });
 
   describe('addMemberToGroup', () => {
     beforeEach(() => {
+      spyOn(objectCache, 'getByHref').and.returnValue(observableOf({
+        requestUUIDs: ['request1', 'request2']
+      } as ObjectCacheEntry));
+      spyOn(dataService, 'invalidateByHref');
       service.addMemberToGroup(GroupMock, EPersonMock2).subscribe();
     });
     it('should send PostRequest to eperson/groups/group-id/epersons endpoint with new eperson member in body', () => {
@@ -143,20 +179,38 @@ describe('GroupDataService', () => {
       const expected = new PostRequest(requestService.generateRequestId(), GroupMock.self + '/' + service.ePersonsEndpoint, EPersonMock2.self, options);
       expect(requestService.send).toHaveBeenCalledWith(expected);
     });
+    it('should invalidate the previous requests of the EPerson and the group', () => {
+      expect(objectCache.getByHref).toHaveBeenCalledWith(EPersonMock2._links.self.href);
+      expect(objectCache.getByHref).toHaveBeenCalledWith(GroupMock._links.self.href);
+      expect(requestService.setStaleByUUID).toHaveBeenCalledTimes(4);
+      expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request1');
+      expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request2');
+    });
   });
 
   describe('deleteMemberFromGroup', () => {
     beforeEach(() => {
+      spyOn(objectCache, 'getByHref').and.returnValue(observableOf({
+        requestUUIDs: ['request1', 'request2']
+      } as ObjectCacheEntry));
+      spyOn(dataService, 'invalidateByHref');
       service.deleteMemberFromGroup(GroupMock, EPersonMock).subscribe();
     });
     it('should send DeleteRequest to eperson/groups/group-id/epersons/eperson-id endpoint', () => {
       const expected = new DeleteRequest(requestService.generateRequestId(), GroupMock.self + '/' + service.ePersonsEndpoint + '/' + EPersonMock.id);
       expect(requestService.send).toHaveBeenCalledWith(expected);
     });
+    it('should invalidate the previous requests of the EPerson and the group', () => {
+      expect(objectCache.getByHref).toHaveBeenCalledWith(EPersonMock._links.self.href);
+      expect(objectCache.getByHref).toHaveBeenCalledWith(GroupMock._links.self.href);
+      expect(requestService.setStaleByUUID).toHaveBeenCalledTimes(4);
+      expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request1');
+      expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request2');
+    });
   });
 
   describe('editGroup', () => {
-    it('should dispatch a EDIT_GROUP action with the groupp to start editing', () => {
+    it('should dispatch a EDIT_GROUP action with the group to start editing', () => {
       service.editGroup(GroupMock);
       expect(store.dispatch).toHaveBeenCalledWith(new GroupRegistryEditGroupAction(GroupMock));
     });
diff --git a/src/app/core/eperson/group-data.service.ts b/src/app/core/eperson/group-data.service.ts
index 4467e26240..a994170281 100644
--- a/src/app/core/eperson/group-data.service.ts
+++ b/src/app/core/eperson/group-data.service.ts
@@ -2,8 +2,8 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 
 import { createSelector, select, Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
-import { filter, map, take } from 'rxjs/operators';
+import { Observable, AsyncSubject, zip as observableZip } from 'rxjs';
+import { filter, map, take, switchMap } from 'rxjs/operators';
 import {
   GroupRegistryCancelGroupAction,
   GroupRegistryEditGroupAction
@@ -110,7 +110,8 @@ export class GroupDataService extends DataService<Group> {
   }
 
   /**
-   * Adds given subgroup as a subgroup to the given active group
+   * Adds given subgroup as a subgroup to the given active group and waits until the {@link activeGroup} and
+   * the {@link subgroup} are invalidated.
    * @param activeGroup   Group we want to add subgroup to
    * @param subgroup      Group we want to add as subgroup to activeGroup
    */
@@ -123,11 +124,46 @@ export class GroupDataService extends DataService<Group> {
     const postRequest = new PostRequest(requestId, activeGroup.self + '/' + this.subgroupsEndpoint, subgroup.self, options);
     this.requestService.send(postRequest);
 
-    return this.rdbService.buildFromRequestUUID(requestId);
+    const response$ = this.rdbService.buildFromRequestUUID(requestId);
+
+    const invalidated$ = new AsyncSubject<boolean>();
+    response$.pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((rd: RemoteData<Group>) => {
+        if (rd.hasSucceeded) {
+          return observableZip(
+            this.invalidateByHref(activeGroup._links.self.href),
+            this.requestService.setStaleByHrefSubstring(activeGroup._links.subgroups.href).pipe(take(1)),
+          ).pipe(
+            map((arr: boolean[]) => arr.every((b: boolean) => b === true))
+          );
+        } else {
+          return [true];
+        }
+      })
+    ).subscribe(() => {
+      invalidated$.next(true);
+      invalidated$.complete();
+    });
+
+    return response$.pipe(
+      switchMap((rd: RemoteData<Group>) => {
+        if (rd.hasSucceeded) {
+          return invalidated$.pipe(
+            filter((invalidated: boolean) => invalidated),
+            map(() => rd)
+          );
+        } else {
+          return [rd];
+        }
+      })
+    );
   }
 
   /**
-   * Deletes a given subgroup from the subgroups of the given active group
+   * Deletes a given subgroup from the subgroups of the given active group and waits until the {@link activeGroup} and
+   * the {@link subgroup} are invalidated.
+   * are invalidated.
    * @param activeGroup   Group we want to delete subgroup from
    * @param subgroup      Subgroup we want to delete from activeGroup
    */
@@ -136,11 +172,45 @@ export class GroupDataService extends DataService<Group> {
     const deleteRequest = new DeleteRequest(requestId, activeGroup.self + '/' + this.subgroupsEndpoint + '/' + subgroup.id);
     this.requestService.send(deleteRequest);
 
-    return this.rdbService.buildFromRequestUUID(requestId);
+    const response$ = this.rdbService.buildFromRequestUUID(requestId);
+
+    const invalidated$ = new AsyncSubject<boolean>();
+    response$.pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((rd: RemoteData<NoContent>) => {
+        if (rd.hasSucceeded) {
+          return observableZip(
+            this.invalidateByHref(activeGroup._links.self.href),
+            this.requestService.setStaleByHrefSubstring(activeGroup._links.subgroups.href).pipe(take(1)),
+          ).pipe(
+            map((arr: boolean[]) => arr.every((b: boolean) => b === true))
+          );
+        } else {
+          return [true];
+        }
+      })
+    ).subscribe(() => {
+      invalidated$.next(true);
+      invalidated$.complete();
+    });
+
+    return response$.pipe(
+      switchMap((rd: RemoteData<NoContent>) => {
+        if (rd.hasSucceeded) {
+          return invalidated$.pipe(
+            filter((invalidated: boolean) => invalidated),
+            map(() => rd)
+          );
+        } else {
+          return [rd];
+        }
+      })
+    );
   }
 
   /**
-   * Adds given ePerson as member to given group
+   * Adds given ePerson as member to a given group and invalidates the ePerson and waits until the {@link ePerson} and
+   * the {@link activeGroup} are invalidated.
    * @param activeGroup   Group we want to add member to
    * @param ePerson       EPerson we want to add as member to given activeGroup
    */
@@ -153,11 +223,47 @@ export class GroupDataService extends DataService<Group> {
     const postRequest = new PostRequest(requestId, activeGroup.self + '/' + this.ePersonsEndpoint, ePerson.self, options);
     this.requestService.send(postRequest);
 
-    return this.rdbService.buildFromRequestUUID(requestId);
+    const response$ = this.rdbService.buildFromRequestUUID(requestId);
+
+    const invalidated$ = new AsyncSubject<boolean>();
+    response$.pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((rd: RemoteData<NoContent>) => {
+        if (rd.hasSucceeded) {
+          return observableZip(
+            this.invalidateByHref(ePerson._links.self.href),
+            this.invalidateByHref(activeGroup._links.self.href),
+            this.requestService.setStaleByHrefSubstring(ePerson._links.groups.href).pipe(take(1)),
+            this.requestService.setStaleByHrefSubstring(activeGroup._links.epersons.href).pipe(take(1)),
+          ).pipe(
+            map((arr: boolean[]) => arr.every((b: boolean) => b === true))
+          );
+        } else {
+          return [true];
+        }
+      })
+    ).subscribe(() => {
+      invalidated$.next(true);
+      invalidated$.complete();
+    });
+
+    return response$.pipe(
+      switchMap((rd: RemoteData<Group>) => {
+        if (rd.hasSucceeded) {
+          return invalidated$.pipe(
+            filter((invalidated: boolean) => invalidated),
+            map(() => rd)
+          );
+        } else {
+          return [rd];
+        }
+      })
+    );
   }
 
   /**
-   * Deletes a given ePerson from the members of the given active group
+   * Deletes a given ePerson from the members of the given active group and waits until the {@link ePerson} and the
+   * {@link activeGroup} are invalidated.
    * @param activeGroup   Group we want to delete member from
    * @param ePerson       EPerson we want to delete from members of given activeGroup
    */
@@ -166,7 +272,42 @@ export class GroupDataService extends DataService<Group> {
     const deleteRequest = new DeleteRequest(requestId, activeGroup.self + '/' + this.ePersonsEndpoint + '/' + ePerson.id);
     this.requestService.send(deleteRequest);
 
-    return this.rdbService.buildFromRequestUUID(requestId);
+    const response$ = this.rdbService.buildFromRequestUUID(requestId);
+
+    const invalidated$ = new AsyncSubject<boolean>();
+    response$.pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((rd: RemoteData<NoContent>) => {
+        if (rd.hasSucceeded) {
+          return observableZip(
+            this.invalidateByHref(ePerson._links.self.href),
+            this.invalidateByHref(activeGroup._links.self.href),
+            this.requestService.setStaleByHrefSubstring(ePerson._links.groups.href).pipe(take(1)),
+            this.requestService.setStaleByHrefSubstring(activeGroup._links.epersons.href).pipe(take(1)),
+          ).pipe(
+            map((arr: boolean[]) => arr.every((b: boolean) => b === true))
+          );
+        } else {
+          return [true];
+        }
+      })
+    ).subscribe(() => {
+      invalidated$.next(true);
+      invalidated$.complete();
+    });
+
+    return response$.pipe(
+      switchMap((rd: RemoteData<NoContent>) => {
+        if (rd.hasSucceeded) {
+          return invalidated$.pipe(
+            filter((invalidated: boolean) => invalidated),
+            map(() => rd)
+          );
+        } else {
+          return [rd];
+        }
+      })
+    );
   }
 
   /**
@@ -262,7 +403,7 @@ export class GroupDataService extends DataService<Group> {
    * @param role        The name of the role for which to create a group
    * @param link        The REST endpoint to create the group
    */
-  createComcolGroup(dso: Community|Collection, role: string, link: string): Observable<RemoteData<Group>> {
+  createComcolGroup(dso: Community | Collection, role: string, link: string): Observable<RemoteData<Group>> {
 
     const requestId = this.requestService.generateRequestId();
     const group = Object.assign(new Group(), {
diff --git a/src/app/shared/testing/data-service.stub.ts b/src/app/shared/testing/data-service.stub.ts
new file mode 100644
index 0000000000..62334a95e0
--- /dev/null
+++ b/src/app/shared/testing/data-service.stub.ts
@@ -0,0 +1,9 @@
+import { Observable, of as observableOf } from 'rxjs';
+
+export class DataServiceStub {
+
+  invalidateByHref(_href: string): Observable<boolean> {
+    return observableOf(true);
+  }
+
+}

From d7fc14aba3bd590928f120d79299afba06fce27a Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 17 Aug 2022 16:09:14 +0200
Subject: [PATCH 09/73] 93889: Fixed issue with DataService.deleteByHref where
 the success response would not be emitted if it were set to stale first

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

diff --git a/src/app/core/data/data.service.ts b/src/app/core/data/data.service.ts
index 6176694d9d..695b2e5fea 100644
--- a/src/app/core/data/data.service.ts
+++ b/src/app/core/data/data.service.ts
@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Store } from '@ngrx/store';
 import { Operation } from 'fast-json-patch';
-import { AsyncSubject, combineLatest, from as observableFrom, Observable, of as observableOf } from 'rxjs';
+import { AsyncSubject, from as observableFrom, Observable, of as observableOf } from 'rxjs';
 import {
   distinctUntilChanged,
   filter,
@@ -166,7 +166,7 @@ export abstract class DataService<T extends CacheableObject> implements UpdateDa
    */
   buildHrefWithParams(href: string, params: RequestParam[], ...linksToFollow: FollowLinkConfig<T>[]): string {
 
-    let  args = [];
+    let args = [];
     if (hasValue(params)) {
       params.forEach((param: RequestParam) => {
         args = this.addHrefArg(href, args, `${param.fieldName}=${param.fieldValue}`);
@@ -181,6 +181,7 @@ export abstract class DataService<T extends CacheableObject> implements UpdateDa
       return href;
     }
   }
+
   /**
    * Adds the embed options to the link for the request
    * @param href            The href the params are to be added to
@@ -487,7 +488,7 @@ export abstract class DataService<T extends CacheableObject> implements UpdateDa
   }
 
   createPatchFromCache(object: T): Observable<Operation[]> {
-    const oldVersion$ = this.findByHref(object._links.self.href, true,  false);
+    const oldVersion$ = this.findByHref(object._links.self.href, true, false);
     return oldVersion$.pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
@@ -665,9 +666,17 @@ export abstract class DataService<T extends CacheableObject> implements UpdateDa
       invalidated$.complete();
     });
 
-    return combineLatest([response$, invalidated$]).pipe(
-      filter(([_, invalidated]) => invalidated),
-      map(([response, _]) => response),
+    return response$.pipe(
+      switchMap((rd: RemoteData<NoContent>) => {
+        if (rd.hasSucceeded) {
+          return invalidated$.pipe(
+            filter((invalidated: boolean) => invalidated),
+            map(() => rd)
+          );
+        } else {
+          return [rd];
+        }
+      })
     );
   }
 

From 8c40ed42da83388232e11ef876bde42b679f06b4 Mon Sep 17 00:00:00 2001
From: corrado lombardi <corrado.lombardi@4science.com>
Date: Thu, 18 Aug 2022 09:33:39 +0200
Subject: [PATCH 10/73] [CST-6110] fix lint error

---
 .../profile-page-security-form.component.spec.ts                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
index e8fd4740eb..621d67cab6 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
@@ -87,6 +87,6 @@ describe('ProfilePageSecurityFormComponent', () => {
       component.isRobustPasswordError = false;
       fixture.detectChanges();
       expect(fixture.debugElement.query(By.css('[data-test="robust-password-error"]'))).toBeFalsy();
-    })
+    });
   });
 });

From 18c208f6a4cb7e21e23d6904b2214fbd773cee8c Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 31 Aug 2022 18:02:36 +0200
Subject: [PATCH 11/73] 94072: Group page list issue fixes

---
 .../group-form/group-form.component.ts        |  4 +--
 .../members-list/members-list.component.ts    | 15 +++++-----
 .../remote-data-build.service.spec.ts         | 18 +++++++++++
 .../builders/remote-data-build.service.ts     | 30 ++++++++++++++-----
 .../shared/mocks/object-cache.service.mock.ts |  3 +-
 5 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/src/app/access-control/group-registry/group-form/group-form.component.ts b/src/app/access-control/group-registry/group-form/group-form.component.ts
index 337f4470c1..b0178f1294 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.ts
+++ b/src/app/access-control/group-registry/group-form/group-form.component.ts
@@ -377,9 +377,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
    */
   setActiveGroup(groupId: string) {
     this.groupDataService.cancelEditGroup();
-    const nextGroup$ = this.groupDataService.findById(groupId);
-    this.subs.push(nextGroup$.subscribe());
-    nextGroup$
+    this.groupDataService.findById(groupId)
       .pipe(
         getFirstSucceededRemoteData(),
         getRemoteDataPayload())
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
index b092afa40e..d777c2ca52 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -10,7 +10,7 @@ import {
   combineLatest as observableCombineLatest,
   ObservedValueOf,
 } from 'rxjs';
-import { map, mergeMap, switchMap, take } from 'rxjs/operators';
+import { defaultIfEmpty, map, mergeMap, switchMap, take } from 'rxjs/operators';
 import {buildPaginatedList, PaginatedList} from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
@@ -25,6 +25,7 @@ import { NotificationsService } from '../../../../shared/notifications/notificat
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 import {EpersonDtoModel} from '../../../../core/eperson/models/eperson-dto.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { isNotEmpty } from '../../../../shared/empty.util';
 
 /**
  * Keys to keep track of specific subscriptions
@@ -144,7 +145,7 @@ export class MembersListComponent implements OnInit, OnDestroy {
         }
       }),
       switchMap((epersonListRD: RemoteData<PaginatedList<EPerson>>) => {
-        const dtos$ = observableCombineLatest(...epersonListRD.payload.page.map((member: EPerson) => {
+        const dtos$ = observableCombineLatest([...epersonListRD.payload.page.map((member: EPerson) => {
           const dto$: Observable<EpersonDtoModel> = observableCombineLatest(
             this.isMemberOfGroup(member), (isMember: ObservedValueOf<Observable<boolean>>) => {
               const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel();
@@ -153,8 +154,8 @@ export class MembersListComponent implements OnInit, OnDestroy {
               return epersonDtoModel;
             });
           return dto$;
-        }));
-        return dtos$.pipe(map((dtos: EpersonDtoModel[]) => {
+        })]);
+        return dtos$.pipe(defaultIfEmpty([]), map((dtos: EpersonDtoModel[]) => {
           return buildPaginatedList(epersonListRD.payload.pageInfo, dtos);
         }));
       }))
@@ -274,7 +275,7 @@ export class MembersListComponent implements OnInit, OnDestroy {
           }
         }),
         switchMap((epersonListRD: RemoteData<PaginatedList<EPerson>>) => {
-          const dtos$ = observableCombineLatest(...epersonListRD.payload.page.map((member: EPerson) => {
+          const dtos$ = observableCombineLatest([...epersonListRD.payload.page.map((member: EPerson) => {
             const dto$: Observable<EpersonDtoModel> = observableCombineLatest(
               this.isMemberOfGroup(member), (isMember: ObservedValueOf<Observable<boolean>>) => {
                 const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel();
@@ -283,8 +284,8 @@ export class MembersListComponent implements OnInit, OnDestroy {
                 return epersonDtoModel;
               });
             return dto$;
-          }));
-          return dtos$.pipe(map((dtos: EpersonDtoModel[]) => {
+          })]);
+          return dtos$.pipe(defaultIfEmpty([]), map((dtos: EpersonDtoModel[]) => {
             return buildPaginatedList(epersonListRD.payload.pageInfo, dtos);
           }));
         }))
diff --git a/src/app/core/cache/builders/remote-data-build.service.spec.ts b/src/app/core/cache/builders/remote-data-build.service.spec.ts
index 1d22da494f..ef79121753 100644
--- a/src/app/core/cache/builders/remote-data-build.service.spec.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.spec.ts
@@ -18,6 +18,7 @@ import { take } from 'rxjs/operators';
 import { HALLink } from '../../shared/hal-link.model';
 import { RequestEntryState } from '../../data/request-entry-state.model';
 import { RequestEntry } from '../../data/request-entry.model';
+import { cold } from 'jasmine-marbles';
 
 describe('RemoteDataBuildService', () => {
   let service: RemoteDataBuildService;
@@ -646,4 +647,21 @@ describe('RemoteDataBuildService', () => {
       });
     });
   });
+
+  describe('buildFromHref', () => {
+    beforeEach(() => {
+      (objectCache.getRequestUUIDBySelfLink as jasmine.Spy).and.returnValue(cold('a', { a: 'request/uuid' }));
+    });
+
+    describe('when both getRequestFromRequestHref and getRequestFromRequestUUID emit nothing', () => {
+      beforeEach(() => {
+        (requestService.getByHref as jasmine.Spy).and.returnValue(cold('a', { a: undefined }));
+        (requestService.getByUUID as jasmine.Spy).and.returnValue(cold('a', { a: undefined }));
+      });
+
+      it('should not emit anything', () => {
+        expect(service.buildFromHref(cold('a', { a: 'rest/api/endpoint' }))).toBeObservable(cold(''));
+      });
+    });
+  });
 });
diff --git a/src/app/core/cache/builders/remote-data-build.service.ts b/src/app/core/cache/builders/remote-data-build.service.ts
index 016f6b16f6..8ceab63e03 100644
--- a/src/app/core/cache/builders/remote-data-build.service.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.ts
@@ -3,9 +3,8 @@ import {
   combineLatest as observableCombineLatest,
   Observable,
   of as observableOf,
-  race as observableRace
 } from 'rxjs';
-import { map, switchMap, filter, distinctUntilKeyChanged } from 'rxjs/operators';
+import { map, switchMap, filter, distinctUntilKeyChanged, startWith } from 'rxjs/operators';
 import { hasValue, isEmpty, isNotEmpty, hasNoValue, isUndefined } from '../../../shared/empty.util';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { FollowLinkConfig, followLink } from '../../../shared/utils/follow-link-config.model';
@@ -21,7 +20,7 @@ import { HALResource } from '../../shared/hal-resource.model';
 import { PAGINATED_LIST } from '../../data/paginated-list.resource-type';
 import { getUrlWithoutEmbedParams } from '../../index/index.selectors';
 import { getResourceTypeValueFor } from '../object-cache.reducer';
-import { hasSucceeded, RequestEntryState } from '../../data/request-entry-state.model';
+import { hasSucceeded, isStale, RequestEntryState } from '../../data/request-entry-state.model';
 import { getRequestFromRequestHref, getRequestFromRequestUUID } from '../../shared/request.operators';
 import { RequestEntry } from '../../data/request-entry.model';
 import { ResponseState } from '../../data/response-state.model';
@@ -207,10 +206,27 @@ export class RemoteDataBuildService {
         this.objectCache.getRequestUUIDBySelfLink(href)),
     );
 
-    const requestEntry$ = observableRace(
-      href$.pipe(getRequestFromRequestHref(this.requestService)),
-      requestUUID$.pipe(getRequestFromRequestUUID(this.requestService)),
-    ).pipe(
+    const requestEntry$ = observableCombineLatest([
+      href$.pipe(getRequestFromRequestHref(this.requestService), startWith(undefined)),
+      requestUUID$.pipe(getRequestFromRequestUUID(this.requestService), startWith(undefined)),
+    ]).pipe(
+      filter(([r1, r2]) => hasValue(r1) || hasValue(r2)),
+      map(([r1, r2]) => {
+        // If one of the two requests has no value, return the other (both is impossible due to the filter above)
+        if (hasNoValue(r2)) {
+          return r1;
+        } else if (hasNoValue(r1)) {
+          return r2;
+        }
+
+        if ((isStale(r1.state) && isStale(r2.state)) || (!isStale(r1.state) && !isStale(r2.state))) {
+          // Neither or both are stale, pick the most recent request
+          return r1.lastUpdated >= r2.lastUpdated ? r1 : r2;
+        } else {
+          // One of the two is stale, return the not stale request
+          return isStale(r2.state) ? r1 : r2;
+        }
+      }),
       distinctUntilKeyChanged('lastUpdated')
     );
 
diff --git a/src/app/shared/mocks/object-cache.service.mock.ts b/src/app/shared/mocks/object-cache.service.mock.ts
index 144c82fe16..515c2abe86 100644
--- a/src/app/shared/mocks/object-cache.service.mock.ts
+++ b/src/app/shared/mocks/object-cache.service.mock.ts
@@ -11,7 +11,8 @@ export function getMockObjectCacheService(): ObjectCacheService {
     'getRequestHrefByUUID',
     'getList',
     'hasByUUID',
-    'hasByHref'
+    'hasByHref',
+    'getRequestUUIDBySelfLink',
   ]);
 
 }

From ac8688ea7913a9059d08255576ab51273230999c Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 1 Sep 2022 12:02:20 +0200
Subject: [PATCH 12/73] 94072: test cases

---
 .../remote-data-build.service.spec.ts         | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)

diff --git a/src/app/core/cache/builders/remote-data-build.service.spec.ts b/src/app/core/cache/builders/remote-data-build.service.spec.ts
index ef79121753..befeabdd90 100644
--- a/src/app/core/cache/builders/remote-data-build.service.spec.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.spec.ts
@@ -663,5 +663,104 @@ describe('RemoteDataBuildService', () => {
         expect(service.buildFromHref(cold('a', { a: 'rest/api/endpoint' }))).toBeObservable(cold(''));
       });
     });
+
+    describe('when one of getRequestFromRequestHref or getRequestFromRequestUUID emits nothing', () => {
+      let requestEntry: RequestEntry;
+
+      beforeEach(() => {
+        requestEntry = Object.assign(new RequestEntry(), {
+          state: RequestEntryState.Success,
+          request: {},
+        });
+        (requestService.getByHref as jasmine.Spy).and.returnValue(cold('a', { a: undefined }));
+        (requestService.getByUUID as jasmine.Spy).and.returnValue(cold('a', { a: requestEntry }));
+        spyOn((service as any), 'buildPayload').and.returnValue(cold('a', { a: {} }));
+      });
+
+      it('should create remote-data with the existing request-entry', () => {
+        expect(service.buildFromHref(cold('a', { a: 'rest/api/endpoint' }))).toBeObservable(cold('a', {
+          a: new RemoteData(undefined, undefined, undefined, RequestEntryState.Success, undefined, {}, undefined),
+        }));
+      });
+    });
+
+    describe('when one of getRequestFromRequestHref or getRequestFromRequestUUID is stale', () => {
+      let requestEntry1: RequestEntry;
+      let requestEntry2: RequestEntry;
+
+      beforeEach(() => {
+        requestEntry1 = Object.assign(new RequestEntry(), {
+          state: RequestEntryState.Success,
+          request: {},
+        });
+        requestEntry2 = Object.assign(new RequestEntry(), {
+          state: RequestEntryState.SuccessStale,
+          request: {},
+        });
+        (requestService.getByHref as jasmine.Spy).and.returnValue(cold('a', { a: requestEntry1 }));
+        (requestService.getByUUID as jasmine.Spy).and.returnValue(cold('a', { a: requestEntry2 }));
+        spyOn((service as any), 'buildPayload').and.returnValue(cold('a', { a: {} }));
+      });
+
+      it('should create remote-data with the non-stale request-entry', () => {
+        expect(service.buildFromHref(cold('a', { a: 'rest/api/endpoint' }))).toBeObservable(cold('a', {
+          a: new RemoteData(undefined, undefined, undefined, RequestEntryState.Success, undefined, {}, undefined),
+        }));
+      });
+    });
+
+    describe('when both getRequestFromRequestHref and getRequestFromRequestUUID are stale', () => {
+      let requestEntry1: RequestEntry;
+      let requestEntry2: RequestEntry;
+
+      beforeEach(() => {
+        requestEntry1 = Object.assign(new RequestEntry(), {
+          state: RequestEntryState.SuccessStale,
+          request: {},
+          lastUpdated: 20,
+        });
+        requestEntry2 = Object.assign(new RequestEntry(), {
+          state: RequestEntryState.SuccessStale,
+          request: {},
+          lastUpdated: 10,
+        });
+        (requestService.getByHref as jasmine.Spy).and.returnValue(cold('a', { a: requestEntry1 }));
+        (requestService.getByUUID as jasmine.Spy).and.returnValue(cold('a', { a: requestEntry2 }));
+        spyOn((service as any), 'buildPayload').and.returnValue(cold('a', { a: {} }));
+      });
+
+      it('should create remote-data with the most up-to-date request-entry', () => {
+        expect(service.buildFromHref(cold('a', { a: 'rest/api/endpoint' }))).toBeObservable(cold('a', {
+          a: new RemoteData(undefined, undefined, 20, RequestEntryState.SuccessStale, undefined, {}, undefined),
+        }));
+      });
+    });
+
+    describe('when both getRequestFromRequestHref and getRequestFromRequestUUID are not stale', () => {
+      let requestEntry1: RequestEntry;
+      let requestEntry2: RequestEntry;
+
+      beforeEach(() => {
+        requestEntry1 = Object.assign(new RequestEntry(), {
+          state: RequestEntryState.Success,
+          request: {},
+          lastUpdated: 25,
+        });
+        requestEntry2 = Object.assign(new RequestEntry(), {
+          state: RequestEntryState.Success,
+          request: {},
+          lastUpdated: 5,
+        });
+        (requestService.getByHref as jasmine.Spy).and.returnValue(cold('a', { a: requestEntry1 }));
+        (requestService.getByUUID as jasmine.Spy).and.returnValue(cold('a', { a: requestEntry2 }));
+        spyOn((service as any), 'buildPayload').and.returnValue(cold('a', { a: {} }));
+      });
+
+      it('should create remote-data with the most up-to-date request-entry', () => {
+        expect(service.buildFromHref(cold('a', { a: 'rest/api/endpoint' }))).toBeObservable(cold('a', {
+          a: new RemoteData(undefined, undefined, 25, RequestEntryState.Success, undefined, {}, undefined),
+        }));
+      });
+    });
   });
 });

From 47b9b09139a6180def8e86aad8e8b2444c530382 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 2 Sep 2022 12:16:30 +0200
Subject: [PATCH 13/73] 94207: Fix ResourcePolicyService.updateTarget

Follow "await invalidation" pattern ~ DataService.deleteByHref
---
 .../resource-policy.service.spec.ts           | 68 ++++++++++++++++---
 .../resource-policy.service.ts                | 47 +++++++++----
 2 files changed, 94 insertions(+), 21 deletions(-)

diff --git a/src/app/core/resource-policy/resource-policy.service.spec.ts b/src/app/core/resource-policy/resource-policy.service.spec.ts
index b788a16520..e4d3358d55 100644
--- a/src/app/core/resource-policy/resource-policy.service.spec.ts
+++ b/src/app/core/resource-policy/resource-policy.service.spec.ts
@@ -15,12 +15,13 @@ import { ActionType } from './models/action-type.model';
 import { RequestParam } from '../cache/models/request-param.model';
 import { PageInfo } from '../shared/page-info.model';
 import { buildPaginatedList } from '../data/paginated-list.model';
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { createPendingRemoteDataObject, createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { RestResponse } from '../cache/response.models';
 import { RequestEntry } from '../data/request-entry.model';
 import { FindListOptions } from '../data/find-list-options.model';
 import { EPersonDataService } from '../eperson/eperson-data.service';
 import { GroupDataService } from '../eperson/group-data.service';
+import { RestRequestMethod } from '../data/rest-request-method';
 
 describe('ResourcePolicyService', () => {
   let scheduler: TestScheduler;
@@ -128,6 +129,14 @@ describe('ResourcePolicyService', () => {
       getBrowseEndpoint: hot('a', {
         a: ePersonEndpoint
       }),
+      getIDHrefObs: cold('a', {
+        a: 'https://rest.api/rest/api/eperson/epersons/' + epersonUUID
+      }),
+    });
+    groupService = jasmine.createSpyObj('groupService', {
+      getIDHrefObs: cold('a', {
+        a: 'https://rest.api/rest/api/eperson/groups/' + groupUUID
+      }),
     });
     objectCache = {} as ObjectCacheService;
     const notificationsService = {} as NotificationsService;
@@ -153,6 +162,7 @@ describe('ResourcePolicyService', () => {
     spyOn((service as any).dataService, 'findByHref').and.callThrough();
     spyOn((service as any).dataService, 'searchBy').and.callThrough();
     spyOn((service as any).dataService, 'getSearchByHref').and.returnValue(observableOf(requestURL));
+    spyOn((service as any).dataService, 'invalidateByHref').and.returnValue(observableOf(requestURL));
   });
 
   describe('create', () => {
@@ -336,14 +346,56 @@ describe('ResourcePolicyService', () => {
   });
 
   describe('updateTarget', () => {
-    it('should create a new PUT request for eperson', () => {
-      const targetType = 'eperson';
+    beforeEach(() => {
+      scheduler.schedule(() => service.create(resourcePolicy, resourceUUID, epersonUUID));
+    });
 
-      const result = service.updateTarget(resourcePolicyId, requestURL, epersonUUID, targetType);
-      const expected = cold('a|', {
-        a: resourcePolicyRD
-      });
-      expect(result).toBeObservable(expected);
+    it('should send a PUT request to update the EPerson', () => {
+      service.updateTarget(resourcePolicyId, requestURL, epersonUUID, 'eperson');
+      scheduler.flush();
+
+      expect(requestService.send).toHaveBeenCalledWith(jasmine.objectContaining({
+        method: RestRequestMethod.PUT,
+        uuid: requestUUID,
+        href: `${resourcePolicy._links.self.href}/eperson`,
+        body: 'https://rest.api/rest/api/eperson/epersons/' + epersonUUID,
+      }));
+    });
+
+    it('should send a PUT request to update the Group', () => {
+      service.updateTarget(resourcePolicyId, requestURL, groupUUID, 'group');
+      scheduler.flush();
+
+      expect(requestService.send).toHaveBeenCalledWith(jasmine.objectContaining({
+        method: RestRequestMethod.PUT,
+        uuid: requestUUID,
+        href: `${resourcePolicy._links.self.href}/group`,
+        body: 'https://rest.api/rest/api/eperson/groups/' + groupUUID,
+      }));
+    });
+
+    it('should invalidate the ResourcePolicy if the PUT request succeeds', () => {
+      service.updateTarget(resourcePolicyId, requestURL, epersonUUID, 'eperson');
+      scheduler.flush();
+
+      expect((service as any).dataService.invalidateByHref).toHaveBeenCalledWith(resourcePolicy._links.self.href);
+    });
+
+    it('should only emit when invalidation is complete', () => {
+      const RD = {
+        p: createPendingRemoteDataObject(),
+        s: createSuccessfulRemoteDataObject({}),
+      };
+      const response$ = cold('(s|)', RD);
+      const invalidate$ = cold('--(d|)', { d: true });
+
+      (rdbService.buildFromRequestUUID as any).and.returnValue(response$);
+      ((service as any).dataService.invalidateByHref).and.returnValue(invalidate$);
+
+      const out$ = service.updateTarget(resourcePolicyId, requestURL, groupUUID, 'group');
+      scheduler.flush();
+
+      expect(out$).toBeObservable(cold('--(s|)', RD));
     });
   });
 
diff --git a/src/app/core/resource-policy/resource-policy.service.ts b/src/app/core/resource-policy/resource-policy.service.ts
index b0b7a6bd97..0178c460f1 100644
--- a/src/app/core/resource-policy/resource-policy.service.ts
+++ b/src/app/core/resource-policy/resource-policy.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 
 import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
+import { AsyncSubject, Observable } from 'rxjs';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { dataService } from '../cache/builders/build-decorators';
 
@@ -23,7 +23,7 @@ import { PaginatedList } from '../data/paginated-list.model';
 import { ActionType } from './models/action-type.model';
 import { RequestParam } from '../cache/models/request-param.model';
 import { isNotEmpty } from '../../shared/empty.util';
-import { map, take } from 'rxjs/operators';
+import { filter, first, map, switchMap } from 'rxjs/operators';
 import { NoContent } from '../shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 import { CoreState } from '../core-state.model';
@@ -37,7 +37,6 @@ import { HALLink } from '../shared/hal-link.model';
 import { EPersonDataService } from '../eperson/eperson-data.service';
 import { GroupDataService } from '../eperson/group-data.service';
 
-
 /**
  * A private DataService implementation to delegate specific methods to.
  */
@@ -241,13 +240,8 @@ export class ResourcePolicyService {
    * @param targetType the type of the target (eperson or group) to which the permission is being granted
    */
   updateTarget(resourcePolicyId: string, resourcePolicyHref: string, targetUUID: string, targetType: string): Observable<RemoteData<any>> {
-
     const targetService = targetType === 'eperson' ? this.ePersonService : this.groupService;
-
-    const targetEndpoint$ = targetService.getBrowseEndpoint().pipe(
-      take(1),
-      map((endpoint: string) =>`${endpoint}/${targetUUID}`),
-    );
+    const targetEndpoint$ = targetService.getIDHrefObs(targetUUID);
 
     const options: HttpOptions = Object.create({});
     let headers = new HttpHeaders();
@@ -256,9 +250,9 @@ export class ResourcePolicyService {
 
     const requestId = this.requestService.generateRequestId();
 
-    this.requestService.setStaleByHrefSubstring(`${this.dataService.getLinkPath()}/${resourcePolicyId}/${targetType}`);
-
-    targetEndpoint$.subscribe((targetEndpoint) => {
+    targetEndpoint$.pipe(
+      first(),
+    ).subscribe((targetEndpoint) => {
       const resourceEndpoint = resourcePolicyHref + '/' + targetType;
       const request = new PutRequest(requestId, resourceEndpoint, targetEndpoint, options);
       Object.assign(request, {
@@ -269,8 +263,35 @@ export class ResourcePolicyService {
       this.requestService.send(request);
     });
 
-    return this.rdbService.buildFromRequestUUID(requestId);
+    const response$ = this.rdbService.buildFromRequestUUID(requestId);
 
+    const invalidated$ = new AsyncSubject<boolean>();
+    response$.pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((rd: RemoteData<any>) => {
+        if (rd.hasSucceeded) {
+          return this.dataService.invalidateByHref(resourcePolicyHref);
+        } else {
+          return [undefined];
+        }
+      }),
+    ).subscribe(() => {
+      invalidated$.next(true);
+      invalidated$.complete();
+    });
+
+    return response$.pipe(
+      switchMap((rd: RemoteData<NoContent>) => {
+        if (rd.hasSucceeded) {
+          return invalidated$.pipe(
+            filter((invalidated: boolean) => invalidated),
+            map(() => rd)
+          );
+        } else {
+          return [rd];
+        }
+      })
+    );
   }
 
 }

From 030b1c33db45412dbc76b8807f5a8462451a6a59 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 2 Sep 2022 12:21:43 +0200
Subject: [PATCH 14/73] 94207: Extract RP entries into a separate component

---
 .../resource-policy-entry.component.html      |  39 +++
 .../resource-policy-entry.component.spec.ts   | 222 ++++++++++++++++++
 .../entry/resource-policy-entry.component.ts  | 103 ++++++++
 .../resource-policies.component.html          |  47 +---
 .../resource-policies.component.spec.ts       |  95 ++------
 .../resource-policies.component.ts            | 148 +-----------
 .../resource-policies.module.ts               |   2 +
 7 files changed, 394 insertions(+), 262 deletions(-)
 create mode 100644 src/app/shared/resource-policies/entry/resource-policy-entry.component.html
 create mode 100644 src/app/shared/resource-policies/entry/resource-policy-entry.component.spec.ts
 create mode 100644 src/app/shared/resource-policies/entry/resource-policy-entry.component.ts

diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.html b/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
new file mode 100644
index 0000000000..5a9494fe00
--- /dev/null
+++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
@@ -0,0 +1,39 @@
+<td class="text-center">
+  <div class="custom-control custom-checkbox">
+    <input type="checkbox"
+           class="custom-control-input"
+           [id]="entry.id"
+           [ngModel]="entry.checked"
+           (ngModelChange)="this.toggleCheckbox.emit($event);">
+    <label class="custom-control-label" [for]="entry.id"></label>
+  </div>
+</td>
+<th scope="row">
+  {{entry.id}}
+</th>
+<td>{{entry.policy.name}}</td>
+<td>{{entry.policy.policyType}}</td>
+<td>{{entry.policy.action}}</td>
+<td>
+  {{ epersonName$ | async }}
+</td>
+<td>
+  {{ groupName$ | async }}
+</td>
+<td>{{formatDate(entry.policy.startDate)}}</td>
+<td>{{formatDate(entry.policy.endDate)}}</td>
+<td class="text-center">
+
+  <div class="btn-group edit-field">
+    <button class="btn btn-outline-primary btn-sm"
+            [title]="'resource-policies.table.headers.edit.policy' | translate"
+            (click)="redirectToResourcePolicyEditPage()">
+      <i class="fas fa-edit fa-fw"></i>
+    </button>
+    <button *ngIf="(groupName$ | async) !== undefined" class="btn btn-outline-primary btn-sm"
+            [title]="'resource-policies.table.headers.edit.group' | translate"
+            (click)="redirectToGroupEditPage()">
+      <i class="fas fa-users fa-fw"></i>
+    </button>
+  </div>
+</td>
diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.spec.ts b/src/app/shared/resource-policies/entry/resource-policy-entry.component.spec.ts
new file mode 100644
index 0000000000..b5232459f5
--- /dev/null
+++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.spec.ts
@@ -0,0 +1,222 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+
+import { of as observableOf } from 'rxjs';
+import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
+import { GroupMock } from '../../testing/group-mock';
+import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
+import { ActionType } from '../../../core/resource-policy/models/action-type.model';
+import { EPersonMock } from '../../testing/eperson.mock';
+import { ResourcePolicyEntryComponent } from './resource-policy-entry.component';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { CommonModule } from '@angular/common';
+import { TranslateModule } from '@ngx-translate/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { RouterStub } from '../../testing/router.stub';
+import { Item } from '../../../core/shared/item.model';
+import { cold } from 'jasmine-marbles';
+import { By } from '@angular/platform-browser';
+import createSpyObj = jasmine.createSpyObj;
+
+const groupRP: any = {
+  id: '1',
+  name: null,
+  description: null,
+  policyType: PolicyType.TYPE_SUBMISSION,
+  action: ActionType.READ,
+  startDate: null,
+  endDate: null,
+  type: 'resourcepolicy',
+  uuid: 'resource-policy-1',
+  _links: {
+    eperson: {
+      href: 'https://rest.api/rest/api/resourcepolicies/1/eperson'
+    },
+    group: {
+      href: 'https://rest.api/rest/api/resourcepolicies/1/group'
+    },
+    self: {
+      href: 'https://rest.api/rest/api/resourcepolicies/1'
+    },
+  },
+  eperson: observableOf(createSuccessfulRemoteDataObject(undefined)),
+  group: observableOf(createSuccessfulRemoteDataObject(GroupMock))
+};
+
+const epersonRP: any = {
+  id: '1',
+  name: null,
+  description: null,
+  policyType: PolicyType.TYPE_SUBMISSION,
+  action: ActionType.READ,
+  startDate: null,
+  endDate: null,
+  type: 'resourcepolicy',
+  uuid: 'resource-policy-1',
+  _links: {
+    eperson: {
+      href: 'https://rest.api/rest/api/resourcepolicies/1/eperson'
+    },
+    group: {
+      href: 'https://rest.api/rest/api/resourcepolicies/1/group'
+    },
+    self: {
+      href: 'https://rest.api/rest/api/resourcepolicies/1'
+    },
+  },
+  eperson: observableOf(createSuccessfulRemoteDataObject(EPersonMock)),
+  group: observableOf(createSuccessfulRemoteDataObject(undefined))
+};
+
+const item = Object.assign(new Item(), {
+  uuid: 'itemUUID',
+  id: 'itemUUID',
+  _links: {
+    self: { href: 'item-selflink' }
+  },
+});
+
+describe('ResourcePolicyEntryComponent', () => {
+  let fixture: ComponentFixture<ResourcePolicyEntryComponent>;
+  let comp: ResourcePolicyEntryComponent;
+  let compAsAny: any;
+
+  let dsoNameService;
+  let groupService;
+  let routeStub;
+  let routerStub;
+
+  it('should pass', () => {
+    expect(true).toBe(true);
+  });
+
+  beforeEach(() => {
+    dsoNameService = createSpyObj('dsoNameMock', {
+      getName: 'NAME'
+    });
+    groupService = jasmine.createSpyObj('groupService', {
+      findByHref: jasmine.createSpy('findByHref'),
+    });
+    routeStub = {
+      data: observableOf({
+        item: createSuccessfulRemoteDataObject(item)
+      })
+    };
+    routerStub = Object.assign(new RouterStub(), {
+      url: `url/edit`
+    });
+
+
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        TranslateModule.forRoot()
+      ],
+      declarations: [
+        ResourcePolicyEntryComponent,
+      ],
+      providers: [
+        { provide: ActivatedRoute, useValue: routeStub },
+        { provide: Router, useValue: routerStub },
+        { provide: GroupDataService, useValue: groupService },
+        { provide: DSONameService, useValue: dsoNameService }
+      ],
+      // schemas: [
+      //   NO_ERRORS_SCHEMA
+      // ]
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ResourcePolicyEntryComponent);
+    comp = fixture.componentInstance;
+    compAsAny = comp;
+  });
+
+  describe('target DSO is an EPerson', () => {
+    beforeEach(() => {
+      comp.entry = {
+        id: 'test',
+        policy: epersonRP,
+        checked: false,
+      };
+      comp.ngOnInit();
+    });
+
+    it('should have a valid epersonName$', () => {
+      expect(compAsAny.epersonName$).toBeObservable(cold('(n|)', { u: undefined, n: 'NAME' }));
+    });
+
+    it('should have an undefined groupName$', () => {
+      expect(compAsAny.groupName$).toBeObservable(cold('(u|)', { u: undefined, n: 'NAME' }));
+    });
+  });
+
+  describe('target DSO is a Group ', () => {
+    beforeEach(() => {
+      comp.entry = {
+        id: 'test',
+        policy: groupRP,
+        checked: false,
+      };
+      comp.ngOnInit();
+    });
+
+    it('should have a valid groupName$', () => {
+      expect(compAsAny.groupName$).toBeObservable(cold('(n|)', { u: undefined, n: 'NAME' }));
+    });
+
+    it('should have an undefined epersonName$', () => {
+      expect(compAsAny.epersonName$).toBeObservable(cold('(u|)', { u: undefined, n: 'NAME' }));
+    });
+  });
+
+  describe('', () => {
+    beforeEach(() => {
+      comp.entry = {
+        id: 'test',
+        policy: groupRP,
+        checked: false,
+      };
+      comp.ngOnInit();
+    });
+
+    it('should format date properly', () => {
+      expect(comp.formatDate('2020-04-14T12:00:00Z')).toBe('2020-04-14');
+    });
+
+    it('should redirect to ResourcePolicy edit page', () => {
+
+      comp.redirectToResourcePolicyEditPage();
+      expect(compAsAny.router.navigate).toHaveBeenCalled();
+    });
+
+    it('should redirect to Group edit page', () => {
+      compAsAny.groupService.findByHref.and.returnValue(observableOf(createSuccessfulRemoteDataObject(GroupMock)));
+
+      comp.redirectToGroupEditPage();
+      expect(compAsAny.router.navigate).toHaveBeenCalled();
+    });
+
+    it('should emit new state when checkbox is toggled', () => {
+      spyOn(comp.toggleCheckbox, 'emit');
+
+      const checkbox = fixture.debugElement.query(By.css('input[type="checkbox"]'));
+
+      comp.entry.checked = false;
+      checkbox.triggerEventHandler('ngModelChange', true);
+      expect(comp.toggleCheckbox.emit).toHaveBeenCalledWith(true);
+
+      comp.entry.checked = true;
+      checkbox.triggerEventHandler('ngModelChange', false);
+      expect(comp.toggleCheckbox.emit).toHaveBeenCalledWith(false);
+    });
+  });
+});
diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts b/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts
new file mode 100644
index 0000000000..904a79cbe6
--- /dev/null
+++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts
@@ -0,0 +1,103 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
+import { hasValue, isNotEmpty } from '../../empty.util';
+import { dateToString, stringToNgbDateStruct } from '../../date.util';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { getAllSucceededRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Group } from '../../../core/eperson/models/group.model';
+import { ACCESS_CONTROL_MODULE_PATH } from '../../../app-routing-paths';
+import { GROUP_EDIT_PATH } from '../../../access-control/access-control-routing-paths';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
+
+export interface ResourcePolicyCheckboxEntry {
+  id: string;
+  policy: ResourcePolicy;
+  checked: boolean;
+}
+
+@Component({
+  /* eslint-disable @angular-eslint/component-selector */
+  selector: 'tr[ds-resource-policy-entry]',
+  templateUrl: './resource-policy-entry.component.html',
+})
+export class ResourcePolicyEntryComponent implements OnInit {
+  @Input()
+  entry: ResourcePolicyCheckboxEntry;
+
+  @Output()
+  public toggleCheckbox: EventEmitter<boolean> = new EventEmitter();
+
+  epersonName$: Observable<string>;
+  groupName$: Observable<string>;
+
+  constructor(
+    protected dsoNameService: DSONameService,
+    protected groupService: GroupDataService,
+    protected route: ActivatedRoute,
+    protected router: Router,
+  ) {
+  }
+
+  public ngOnInit(): void {
+    this.epersonName$ = this.getName$(this.entry.policy.eperson);
+    this.groupName$ = this.getName$(this.entry.policy.group);
+  }
+
+  private getName$(dso$: Observable<RemoteData<DSpaceObject>>): Observable<string> {
+    return dso$.pipe(
+      getAllSucceededRemoteData(),
+      map((rd: RemoteData<DSpaceObject>) => {
+        if (hasValue(rd?.payload)) {
+          return this.dsoNameService.getName(rd.payload);
+        }
+        return undefined;
+      }),
+    );
+  }
+
+  /**
+   * Returns a date in simplified format (YYYY-MM-DD).
+   *
+   * @param date
+   * @return a string with formatted date
+   */
+  formatDate(date: string): string {
+    return isNotEmpty(date) ? dateToString(stringToNgbDateStruct(date)) : '';
+  }
+
+  /**
+   * Redirect to resource policy editing page
+   */
+  redirectToResourcePolicyEditPage(): void {
+    this.router.navigate([`./edit`], {
+      relativeTo: this.route,
+      queryParams: {
+        policyId: this.entry.policy.id,
+      },
+    });
+  }
+
+  /**
+   * Redirect to group edit page
+   */
+  redirectToGroupEditPage(): void {
+    this.groupService.findByHref(this.entry.policy._links.group.href, false).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      map((group: Group) => group.id),
+    ).subscribe((groupUUID) => {
+      this.router.navigate([ACCESS_CONTROL_MODULE_PATH, GROUP_EDIT_PATH, groupUUID]);
+    });
+  }
+}
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index d1fd9266b1..1db068aa1d 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -57,49 +57,10 @@
       </tr>
     </thead>
     <tbody *ngIf="(getResourcePolicies() | async)?.length > 0">
-      <tr *ngFor="let entry of (getResourcePolicies() | async); trackById">
-        <td class="text-center">
-          <div class="custom-control custom-checkbox">
-            <input type="checkbox"
-                   class="custom-control-input"
-                   [id]="entry.id"
-                   [ngModel]="entry.checked"
-                   (ngModelChange)="selectCheckbox(entry, $event)">
-            <label class="custom-control-label" [for]="entry.id"></label>
-          </div>
-        </td>
-        <th scope="row">
-          {{entry.id}}
-        </th>
-        <td>{{entry.policy.name}}</td>
-        <td>{{entry.policy.policyType}}</td>
-        <td>{{entry.policy.action}}</td>
-        <td *ngIf="(hasEPerson(entry.policy) | async)">
-          {{getEPersonName(entry.policy) | async}}
-        </td>
-        <td *ngIf="!(hasEPerson(entry.policy) | async)"></td>
-        <td *ngIf="(hasGroup(entry.policy) | async)">
-          {{getGroupName(entry.policy) | async}}
-        </td>
-        <td *ngIf="!(hasGroup(entry.policy) | async)"></td>
-        <td>{{formatDate(entry.policy.startDate)}}</td>
-        <td>{{formatDate(entry.policy.endDate)}}</td>
-        <td class="text-center">
-
-          <div class="btn-group edit-field">
-            <button class="btn btn-outline-primary btn-sm"
-                    [title]="'resource-policies.table.headers.edit.policy' | translate"
-                    (click)="redirectToResourcePolicyEditPage(entry.policy)">
-              <i class="fas fa-edit fa-fw"></i>
-            </button>
-            <button *ngIf="(hasGroup(entry.policy) | async)" class="btn btn-outline-primary btn-sm"
-                    [title]="'resource-policies.table.headers.edit.group' | translate"
-                    (click)="redirectToGroupEditPage(entry.policy)">
-              <i class="fas fa-users fa-fw"></i>
-            </button>
-          </div>
-        </td>
-      </tr>
+      <tr ds-resource-policy-entry *ngFor="let entry of (getResourcePolicies() | async)"
+          [entry]="entry"
+          (toggleCheckbox)="selectCheckbox(entry, $event)"
+      ></tr>
     </tbody>
   </table>
 </div>
diff --git a/src/app/shared/resource-policies/resource-policies.component.spec.ts b/src/app/shared/resource-policies/resource-policies.component.spec.ts
index fc60229ff4..156810c0f5 100644
--- a/src/app/shared/resource-policies/resource-policies.component.spec.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.spec.ts
@@ -33,6 +33,8 @@ import { PolicyType } from '../../core/resource-policy/models/policy-type.model'
 import { ActionType } from '../../core/resource-policy/models/action-type.model';
 import { EPersonMock } from '../testing/eperson.mock';
 import { GroupMock } from '../testing/group-mock';
+import { ResourcePolicyEntryComponent } from './entry/resource-policy-entry.component';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 
 describe('ResourcePoliciesComponent test suite', () => {
   let comp: ResourcePoliciesComponent;
@@ -188,6 +190,10 @@ describe('ResourcePoliciesComponent test suite', () => {
   const paginatedList = buildPaginatedList(pageInfo, array);
   const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
 
+  const dsoNameService = jasmine.createSpyObj('dsoNameMock', {
+    getName: 'NAME'
+  });
+
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
@@ -198,6 +204,7 @@ describe('ResourcePoliciesComponent test suite', () => {
       ],
       declarations: [
         ResourcePoliciesComponent,
+        ResourcePolicyEntryComponent,
         TestComponent
       ],
       providers: [
@@ -209,6 +216,7 @@ describe('ResourcePoliciesComponent test suite', () => {
         { provide: ResourcePolicyService, useValue: resourcePolicyService },
         { provide: RequestService, useValue: getMockRequestService() },
         { provide: Router, useValue: routerStub },
+        { provide: DSONameService, useValue: dsoNameService },
         ChangeDetectorRef,
         ResourcePoliciesComponent
       ], schemas: [
@@ -260,10 +268,10 @@ describe('ResourcePoliciesComponent test suite', () => {
     });
 
     it('should init component properly', () => {
-      spyOn(comp, 'initResourcePolicyLIst');
+      spyOn(comp, 'initResourcePolicyList');
       fixture.detectChanges();
       expect(compAsAny.isActive).toBeTruthy();
-      expect(comp.initResourcePolicyLIst).toHaveBeenCalled();
+      expect(comp.initResourcePolicyList).toHaveBeenCalled();
     });
 
     it('should init resource policies list properly', () => {
@@ -274,7 +282,7 @@ describe('ResourcePoliciesComponent test suite', () => {
       }));
 
       scheduler = getTestScheduler();
-      scheduler.schedule(() => comp.initResourcePolicyLIst());
+      scheduler.schedule(() => comp.initResourcePolicyList());
       scheduler.flush();
 
       expect(compAsAny.resourcePoliciesEntries$.value).toEqual(expected);
@@ -291,7 +299,7 @@ describe('ResourcePoliciesComponent test suite', () => {
       const initResourcePolicyEntries = getInitEntries();
       compAsAny.resourcePoliciesEntries$.next(initResourcePolicyEntries);
       resourcePolicyService.searchByResource.and.returnValue(observableOf({}));
-      spyOn(comp, 'initResourcePolicyLIst').and.callFake(() => ({}));
+      spyOn(comp, 'initResourcePolicyList').and.callFake(() => ({}));
       fixture.detectChanges();
     });
 
@@ -361,7 +369,7 @@ describe('ResourcePoliciesComponent test suite', () => {
         scheduler.flush();
 
         expect(notificationsServiceStub.success).toHaveBeenCalled();
-        expect(comp.initResourcePolicyLIst).toHaveBeenCalled();
+        expect(comp.initResourcePolicyList).toHaveBeenCalled();
       });
 
       it('should notify error when delete is not successful', () => {
@@ -372,7 +380,7 @@ describe('ResourcePoliciesComponent test suite', () => {
         scheduler.flush();
 
         expect(notificationsServiceStub.error).toHaveBeenCalled();
-        expect(comp.initResourcePolicyLIst).toHaveBeenCalled();
+        expect(comp.initResourcePolicyList).toHaveBeenCalled();
       });
     });
 
@@ -384,68 +392,6 @@ describe('ResourcePoliciesComponent test suite', () => {
 
     });
 
-    describe('hasEPerson', () => {
-      it('should true when policy is link to the eperson', () => {
-
-        expect(comp.hasEPerson(anotherResourcePolicy)).toBeObservable(cold('(ab|)', {
-          a: false,
-          b: true
-        }));
-
-      });
-
-      it('should false when policy is not link to the eperson', () => {
-
-        expect(comp.hasEPerson(resourcePolicy)).toBeObservable(cold('(aa|)', {
-          a: false
-        }));
-
-      });
-    });
-
-    describe('hasGroup', () => {
-      it('should true when policy is link to the group', () => {
-
-        expect(comp.hasGroup(resourcePolicy)).toBeObservable(cold('(ab|)', {
-          a: false,
-          b: true
-        }));
-
-      });
-
-      it('should false when policy is not link to the group', () => {
-
-        expect(comp.hasGroup(anotherResourcePolicy)).toBeObservable(cold('(aa|)', {
-          a: false
-        }));
-
-      });
-    });
-
-    describe('getEPersonName', () => {
-      it('should return the eperson name', () => {
-
-        expect(comp.getEPersonName(anotherResourcePolicy)).toBeObservable(cold('(ab|)', {
-          a: '',
-          b: 'User Test'
-        }));
-      });
-    });
-
-    describe('getGroupName', () => {
-      it('should return the group name', () => {
-
-        expect(comp.getGroupName(resourcePolicy)).toBeObservable(cold('(ab|)', {
-          a: '',
-          b: 'testgroupname'
-        }));
-      });
-    });
-
-    it('should format date properly', () => {
-      expect(comp.formatDate('2020-04-14T12:00:00Z')).toBe('2020-04-14');
-    });
-
     it('should select All Checkbox', () => {
       spyOn(comp, 'selectAllCheckbox').and.callThrough();
       const checkbox = fixture.debugElement.query(By.css('table > thead > tr:nth-child(2) input'));
@@ -469,19 +415,6 @@ describe('ResourcePoliciesComponent test suite', () => {
       comp.redirectToResourcePolicyCreatePage();
       expect(compAsAny.router.navigate).toHaveBeenCalled();
     });
-
-    it('should redirect to resource policy edit page', () => {
-
-      comp.redirectToResourcePolicyEditPage(resourcePolicy);
-      expect(compAsAny.router.navigate).toHaveBeenCalled();
-    });
-
-    it('should redirect to resource policy edit page', () => {
-      compAsAny.groupService.findByHref.and.returnValue(observableOf(createSuccessfulRemoteDataObject(GroupMock)));
-
-      comp.redirectToGroupEditPage(resourcePolicy);
-      expect(compAsAny.router.navigate).toHaveBeenCalled();
-    });
   });
 });
 
diff --git a/src/app/shared/resource-policies/resource-policies.component.ts b/src/app/shared/resource-policies/resource-policies.component.ts
index cf291977d6..7f38f046a1 100644
--- a/src/app/shared/resource-policies/resource-policies.component.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.ts
@@ -2,48 +2,25 @@ import { ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { BehaviorSubject, from as observableFrom, Observable, Subscription } from 'rxjs';
-import {
-  concatMap,
-  distinctUntilChanged,
-  filter,
-  map,
-  reduce,
-  scan,
-  startWith,
-  take
-} from 'rxjs/operators';
+import { concatMap, distinctUntilChanged, filter, map, reduce, scan, take } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 
 import { ResourcePolicyService } from '../../core/resource-policy/resource-policy.service';
-import {
-  getFirstSucceededRemoteDataPayload,
-  getFirstSucceededRemoteDataWithNotEmptyPayload,
-  getAllSucceededRemoteData
-} from '../../core/shared/operators';
+import { getAllSucceededRemoteData } from '../../core/shared/operators';
 import { ResourcePolicy } from '../../core/resource-policy/models/resource-policy.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { Group } from '../../core/eperson/models/group.model';
 import { GroupDataService } from '../../core/eperson/group-data.service';
 import { hasValue, isEmpty, isNotEmpty } from '../empty.util';
-import { EPerson } from '../../core/eperson/models/eperson.model';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { RequestService } from '../../core/data/request.service';
 import { NotificationsService } from '../notifications/notifications.service';
-import { dateToString, stringToNgbDateStruct } from '../date.util';
 import { followLink } from '../utils/follow-link-config.model';
-import { ACCESS_CONTROL_MODULE_PATH } from '../../app-routing-paths';
-import { GROUP_EDIT_PATH } from '../../access-control/access-control-routing-paths';
-
-interface ResourcePolicyCheckboxEntry {
-  id: string;
-  policy: ResourcePolicy;
-  checked: boolean;
-}
+import { ResourcePolicyCheckboxEntry } from './entry/resource-policy-entry.component';
 
 @Component({
   selector: 'ds-resource-policies',
   styleUrls: ['./resource-policies.component.scss'],
-  templateUrl: './resource-policies.component.html'
+  templateUrl: './resource-policies.component.html',
 })
 /**
  * Component that shows the policies for given resource
@@ -126,7 +103,7 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
    */
   ngOnInit(): void {
     this.isActive = true;
-    this.initResourcePolicyLIst();
+    this.initResourcePolicyList();
   }
 
   /**
@@ -168,48 +145,6 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
     );
   }
 
-  /**
-   * Returns a date in simplified format (YYYY-MM-DD).
-   *
-   * @param date
-   * @return a string with formatted date
-   */
-  formatDate(date: string): string {
-    return isNotEmpty(date) ? dateToString(stringToNgbDateStruct(date)) : '';
-  }
-
-  /**
-   * Return the ePerson's name which the given policy is linked to
-   *
-   * @param policy The resource policy
-   */
-  getEPersonName(policy: ResourcePolicy): Observable<string> {
-    // TODO to be reviewed when https://github.com/DSpace/dspace-angular/issues/644 will be resolved
-    // return this.ePersonService.findByHref(policy._links.eperson.href).pipe(
-    return policy.eperson.pipe(
-      filter(() => this.isActive),
-      getFirstSucceededRemoteDataWithNotEmptyPayload(),
-      map((eperson: EPerson) => this.dsoNameService.getName(eperson)),
-      startWith('')
-    );
-  }
-
-  /**
-   * Return the group's name which the given policy is linked to
-   *
-   * @param policy The resource policy
-   */
-  getGroupName(policy: ResourcePolicy): Observable<string> {
-    // TODO to be reviewed when https://github.com/DSpace/dspace-angular/issues/644 will be resolved
-    // return this.groupService.findByHref(policy._links.group.href).pipe(
-    return policy.group.pipe(
-      filter(() => this.isActive),
-      getFirstSucceededRemoteDataWithNotEmptyPayload(),
-      map((group: Group) => this.dsoNameService.getName(group)),
-      startWith('')
-    );
-  }
-
   /**
    * Return all resource's policies
    *
@@ -219,46 +154,14 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
     return this.resourcePoliciesEntries$.asObservable();
   }
 
-  /**
-   * Check whether the given policy is linked to a ePerson
-   *
-   * @param policy The resource policy
-   * @return an observable that emits true when the policy is linked to a ePerson, false otherwise
-   */
-  hasEPerson(policy): Observable<boolean> {
-    // TODO to be reviewed when https://github.com/DSpace/dspace-angular/issues/644 will be resolved
-    // return this.ePersonService.findByHref(policy._links.eperson.href).pipe(
-    return policy.eperson.pipe(
-      filter(() => this.isActive),
-      getFirstSucceededRemoteDataPayload(),
-      map((eperson: EPerson) => isNotEmpty(eperson)),
-      startWith(false)
-    );
-  }
-
-  /**
-   * Check whether the given policy is linked to a group
-   *
-   * @param policy The resource policy
-   * @return an observable that emits true when the policy is linked to a group, false otherwise
-   */
-  hasGroup(policy): Observable<boolean> {
-    // TODO to be reviewed when https://github.com/DSpace/dspace-angular/issues/644 will be resolved
-    // return this.groupService.findByHref(policy._links.group.href).pipe(
-    return policy.group.pipe(
-      filter(() => this.isActive),
-      getFirstSucceededRemoteDataPayload(),
-      map((group: Group) => isNotEmpty(group)),
-      startWith(false)
-    );
-  }
-
   /**
    * Initialize the resource's policies list
    */
-  initResourcePolicyLIst() {
-    this.subs.push(this.resourcePolicyService.searchByResource(this.resourceUUID, null, false, true,
-      followLink('eperson'), followLink('group')).pipe(
+  initResourcePolicyList() {
+    this.subs.push(this.resourcePolicyService.searchByResource(
+      this.resourceUUID, null, false, true,
+      followLink('eperson'), followLink('group')
+    ).pipe(
       filter(() => this.isActive),
       getAllSucceededRemoteData()
     ).subscribe((result) => {
@@ -295,37 +198,6 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
     });
   }
 
-  /**
-   * Redirect to resource policy editing page
-   *
-   * @param policy The resource policy
-   */
-  redirectToResourcePolicyEditPage(policy: ResourcePolicy): void {
-    this.router.navigate([`./edit`], {
-      relativeTo: this.route,
-      queryParams: {
-        policyId: policy.id
-      }
-    });
-  }
-
-  /**
-   * Redirect to group edit page
-   *
-   * @param policy The resource policy
-   */
-  redirectToGroupEditPage(policy: ResourcePolicy): void {
-    this.subs.push(
-      this.groupService.findByHref(policy._links.group.href, false).pipe(
-        filter(() => this.isActive),
-        getFirstSucceededRemoteDataPayload(),
-        map((group: Group) => group.id)
-      ).subscribe((groupUUID) => {
-        this.router.navigate([ACCESS_CONTROL_MODULE_PATH, GROUP_EDIT_PATH, groupUUID]);
-      })
-    );
-  }
-
   /**
    * Select/unselect all checkbox in the list
    */
diff --git a/src/app/shared/resource-policies/resource-policies.module.ts b/src/app/shared/resource-policies/resource-policies.module.ts
index 6eeaddce36..a7dc19b83e 100644
--- a/src/app/shared/resource-policies/resource-policies.module.ts
+++ b/src/app/shared/resource-policies/resource-policies.module.ts
@@ -15,9 +15,11 @@ import { GroupSearchBoxComponent } from './form/eperson-group-list/group-search-
 import { EpersonSearchBoxComponent } from './form/eperson-group-list/eperson-search-box/eperson-search-box.component';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { SharedModule } from '../shared.module';
+import { ResourcePolicyEntryComponent } from './entry/resource-policy-entry.component';
 
 const COMPONENTS = [
   ResourcePoliciesComponent,
+  ResourcePolicyEntryComponent,
   ResourcePolicyFormComponent,
   ResourcePolicyEditComponent,
   ResourcePolicyCreateComponent,

From 458a721c087e293026c11e44c503b92a5dd2e5b0 Mon Sep 17 00:00:00 2001
From: Nikunj Sharma <nikunj.sharma@4science.com>
Date: Fri, 2 Sep 2022 14:54:43 +0530
Subject: [PATCH 15/73] CST-6110 updated password messages

---
 .../profile-page-security-form.component.html |  2 +-
 .../profile-page-security-form.component.ts   |  4 ++--
 src/assets/i18n/en.json5                      | 20 +++++++++----------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
index 66c9d73be2..976ff88eda 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
@@ -9,4 +9,4 @@
 <div id="notLongEnough" class="container-fluid text-danger" *ngIf="formGroup.hasError('notLongEnough')">{{FORM_PREFIX + 'error.password-length' | translate}}</div>
 <div id="notSame" class="container-fluid text-danger" *ngIf="formGroup.hasError('notSame')">{{FORM_PREFIX + 'error.matching-passwords' | translate}}</div>
 <div id="emptyPassword" class="container-fluid text-danger" *ngIf="(formGroup.dirty || formGroup.touched) && formGroup.hasError('emptyPassword')">{{FORM_PREFIX + 'error.empty-password' | translate}}</div>
-<div data-test="robust-password-error" class="container-fluid text-danger" *ngIf="isRobustPasswordError">{{FORM_PREFIX + 'error.robust-password' | translate}}</div>
+<div data-test="robust-password-error" class="container-fluid text-danger" *ngIf="isRobustPasswordError">{{'password.error.robust-password' | translate}}</div>
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
index 1eacb9f1be..83548a09d7 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
@@ -129,13 +129,13 @@ export class ProfilePageSecurityFormComponent implements OnInit {
   }
 
   /**
-   * Check if the password is at least 6 characters long
+   * Check if the password is at least 8 characters long
    * @param group The FormGroup to validate
    */
   checkPasswordLength(group: FormGroup) {
     const pass = group.get('password').value;
 
-    return isEmpty(pass) || pass.length >= 6 ? null : {notLongEnough: true};
+    return isEmpty(pass) || pass.length >= 8 ? null : {notLongEnough: true};
   }
 
   /**
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 85f93f06a4..cee1fc5869 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1490,7 +1490,7 @@
 
   "forgot-password.form.head": "Forgot Password",
 
-  "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least eight characters long.",
 
   "forgot-password.form.card.security": "Security",
 
@@ -1506,7 +1506,7 @@
 
   "forgot-password.form.error.matching-passwords": "The passwords do not match.",
 
-  "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
+  "forgot-password.form.error.password-length": "The password should be at least 8 characters long.",
 
   "forgot-password.form.notification.error.title": "Error when trying to submit new password",
 
@@ -1516,7 +1516,7 @@
 
   "forgot-password.form.submit": "Submit password",
 
-  "forgot-password.form.error.robust-password": "Selected password is invalid, it should be at least 8 and at most 15 characters long and must contain at least one uppercase and one lowercase character and a number.",
+  "password.error.robust-password": "New password is invalid. Valid passwords must be between 8-15 characters long and must include a minimum of: one uppercase letter, one lowercase letter, one number, and one special character (!?$@#$%^&+=).",
 
 
   "form.add": "Add more",
@@ -3043,9 +3043,9 @@
 
   "profile.security.form.error.matching-passwords": "The passwords do not match.",
 
-  "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
+  "profile.security.form.error.password-length": "The password should be at least 8 characters long.",
 
-  "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least eight characters long.",
 
   "profile.security.form.label.password": "Password",
 
@@ -3057,11 +3057,11 @@
 
   "profile.security.form.notifications.error.title": "Error changing passwords",
 
-  "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 6 characters long.",
+  "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 8 characters long.",
 
   "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
 
-  "profile.security.form.error.robust-password": "Selected password is invalid, it should be at least 8 and at most 15 characters long and must contain at least one uppercase and one lowercase character and a number.",
+  "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
 
   "profile.title": "Update Profile",
 
@@ -3145,7 +3145,7 @@
 
   "register-page.create-profile.security.header": "Security",
 
-  "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least eight characters long.",
 
   "register-page.create-profile.security.label.password": "Password *",
 
@@ -3153,11 +3153,9 @@
 
   "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
 
-  "register-page.create-profile.security.error.robust-password": "Selected password is invalid, it should be at least 8 and at most 15 characters long and must contain at least one uppercase and one lowercase character and a number.",
-
   "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
 
-  "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.",
+  "register-page.create-profile.security.error.password-length": "The password should be at least 8 characters long.",
 
   "register-page.create-profile.submit": "Complete Registration",
 

From 236216b5560f1ef31b8030e9b761e8a375a25131 Mon Sep 17 00:00:00 2001
From: "Mark H. Wood" <mwood@IUPUI.Edu>
Date: Fri, 2 Sep 2022 16:20:51 -0400
Subject: [PATCH 16/73] Document that setting will be rounded to one of the
 settings options.

---
 src/config/browse-by-config.interface.ts | 2 ++
 src/config/default-app-config.ts         | 2 ++
 src/environments/environment.test.ts     | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/config/browse-by-config.interface.ts b/src/config/browse-by-config.interface.ts
index eadcdff1a9..c67d072731 100644
--- a/src/config/browse-by-config.interface.ts
+++ b/src/config/browse-by-config.interface.ts
@@ -25,6 +25,8 @@ export interface BrowseByConfig extends Config {
 
   /**
    * Number of entries in the viewport of a paginated browse-by list.
+   * Rounded to the nearest size in the list of selectable sizes on the settings
+   * menu.  See pageSizeOptions in 'pagination-component-options.model.ts'.
    */
    pageSize: number;
 }
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 9781857a4e..5f3ddddaf9 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -207,6 +207,8 @@ export class DefaultAppConfig implements AppConfig {
     // The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
     defaultLowerLimit: 1900,
     // The number of entries in a paginated browse results list.
+    // Rounded to the nearest size in the list of selectable sizes on the
+    // settings menu.  See pageSizeOptions in 'pagination-component-options.model.ts'.
     pageSize: 20
   };
 
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index bb124a837a..2465b39cb7 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -200,6 +200,8 @@ export const environment: BuildConfig = {
     // The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
     defaultLowerLimit: 1900,
     // The number of entries in a paginated browse results list.
+    // Rounded to the nearest size in the list of selectable sizes on the
+    // settings menu.  See pageSizeOptions in 'pagination-component-options.model.ts'.
     pageSize: 20,
   },
   item: {

From 56c8c8c370be4945d34a5e8c8aa98660b99bdefc Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Thu, 18 Aug 2022 12:53:19 -0700
Subject: [PATCH 17/73] Initial work on browse with thumbs.

---
 .../collection-page.component.ts              |   5 ++-
 .../collection-page.resolver.ts               |   2 +-
 src/app/community-page.tar.gz                 | Bin 0 -> 16872 bytes
 src/app/core/browse/browse.service.ts         |  17 ++++++++
 src/app/core/shared/browse-entry.model.ts     |   1 +
 ...-search-result-list-element.component.html |  41 +++++++++++-------
 6 files changed, 49 insertions(+), 17 deletions(-)
 create mode 100644 src/app/community-page.tar.gz

diff --git a/src/app/collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts
index 09471d4c6d..1f30824877 100644
--- a/src/app/collection-page/collection-page.component.ts
+++ b/src/app/collection-page/collection-page.component.ts
@@ -28,6 +28,7 @@ import { AuthorizationDataService } from '../core/data/feature-authorization/aut
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
 import { getCollectionPageRoute } from './collection-page-routing-paths';
 import { redirectOn4xx } from '../core/shared/authorized.operators';
+import { BROWSE_ITEM_LINKS_TO_FOLLOW } from '../core/browse/browse.service';
 
 @Component({
   selector: 'ds-collection-page',
@@ -74,6 +75,7 @@ export class CollectionPageComponent implements OnInit {
     this.paginationConfig.pageSize = 5;
     this.paginationConfig.currentPage = 1;
     this.sortConfig = new SortOptions('dc.date.accessioned', SortDirection.DESC);
+
   }
 
   ngOnInit(): void {
@@ -108,7 +110,8 @@ export class CollectionPageComponent implements OnInit {
               pagination: currentPagination,
               sort: currentSort,
               dsoTypes: [DSpaceObjectType.ITEM]
-            })).pipe(toDSpaceObjectListRD()) as Observable<RemoteData<PaginatedList<Item>>>;
+            }), null, true, true, ...BROWSE_ITEM_LINKS_TO_FOLLOW)
+            .pipe(toDSpaceObjectListRD()) as Observable<RemoteData<PaginatedList<Item>>>;
         }),
         startWith(undefined) // Make sure switching pages shows loading component
       )
diff --git a/src/app/collection-page/collection-page.resolver.ts b/src/app/collection-page/collection-page.resolver.ts
index d476a180d3..2f5b3ed37a 100644
--- a/src/app/collection-page/collection-page.resolver.ts
+++ b/src/app/collection-page/collection-page.resolver.ts
@@ -17,7 +17,7 @@ export const COLLECTION_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Collection>[] = [
   followLink('parentCommunity', {},
     followLink('parentCommunity')
   ),
-  followLink('logo')
+  followLink('logo'),
 ];
 
 /**
diff --git a/src/app/community-page.tar.gz b/src/app/community-page.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..33169aa5094ba1a326e2a50b3842f4b46000008d
GIT binary patch
literal 16872
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

literal 0
HcmV?d00001

diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
index 05e625d6c1..c34c32d9c2 100644
--- a/src/app/core/browse/browse.service.ts
+++ b/src/app/core/browse/browse.service.ts
@@ -21,6 +21,15 @@ import { URLCombiner } from '../url-combiner/url-combiner';
 import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
 import { BrowseDefinitionDataService } from './browse-definition-data.service';
 import { HrefOnlyDataService } from '../data/href-only-data.service';
+import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+
+const BROWSE_ENTRY_LINKS_TO_FOLLOW: FollowLinkConfig<BrowseEntry>[] = [
+  followLink('thumbnail')
+];
+
+export const BROWSE_ITEM_LINKS_TO_FOLLOW: FollowLinkConfig<Item>[] = [
+  followLink('thumbnail')
+];
 
 /**
  * The service handling all browse requests
@@ -96,6 +105,11 @@ export class BrowseService {
         return href;
       })
     );
+
+    if (options.metadataDefinition == 'title' || options.metadataDefinition == 'dateissued' ) {
+      return this.hrefOnlyDataService.findAllByHref<BrowseEntry>(href$, {}, null, null, ...BROWSE_ENTRY_LINKS_TO_FOLLOW);
+
+    }
     return this.hrefOnlyDataService.findAllByHref<BrowseEntry>(href$);
   }
 
@@ -141,6 +155,9 @@ export class BrowseService {
         return href;
       }),
     );
+    if (options.metadataDefinition == 'title' || options.metadataDefinition == 'dateissued' || hasValue(filterValue)) {
+      return this.hrefOnlyDataService.findAllByHref<Item>(href$, {}, null, null, ...BROWSE_ITEM_LINKS_TO_FOLLOW);
+    }
     return this.hrefOnlyDataService.findAllByHref<Item>(href$);
   }
 
diff --git a/src/app/core/shared/browse-entry.model.ts b/src/app/core/shared/browse-entry.model.ts
index df748ac61c..7556306235 100644
--- a/src/app/core/shared/browse-entry.model.ts
+++ b/src/app/core/shared/browse-entry.model.ts
@@ -51,6 +51,7 @@ export class BrowseEntry extends ListableObject implements TypedObject {
   _links: {
     self: HALLink;
     entries: HALLink;
+    thumbnail: HALLink;
   };
 
   /**
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index 645cace8dc..c13821a153 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -1,15 +1,24 @@
-<div class="d-flex">
-  <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-  <ds-access-status-badge [item]="dso" class="pl-1"></ds-access-status-badge>
-</div>
-
-<ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">
+<div class="row">
+  <div class="col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
-       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-       [innerHTML]="dsoTitle"></a>
-    <span *ngIf="linkType == linkTypes.None" class="lead item-list-title dont-break-out"
-          [innerHTML]="dsoTitle"></span>
-    <span class="text-muted">
+       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
+    <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+    </ds-thumbnail>
+    </a>
+  </div>
+  <div class="col-md-10">
+    <div class="d-flex">
+      <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+      <ds-access-status-badge [item]="dso" class="pl-1"></ds-access-status-badge>
+    </div>
+
+    <ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">
+      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
+         [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
+         [innerHTML]="dsoTitle"></a>
+      <span *ngIf="linkType == linkTypes.None" class="lead item-list-title dont-break-out"
+            [innerHTML]="dsoTitle"></span>
+      <span class="text-muted">
       <ds-truncatable-part [id]="dso.id" [minLines]="1">
         <ng-container *ngIf="dso.firstMetadataValue('dc.publisher') || dso.firstMetadataValue('dc.date.issued')">
           (<span *ngIf="dso.firstMetadataValue('dc.publisher')" class="item-list-publisher" [innerHTML]="firstMetadataValue('dc.publisher') + ', '"></span>
@@ -23,9 +32,11 @@
         </span>
       </ds-truncatable-part>
     </span>
-    <div *ngIf="dso.firstMetadataValue('dc.description.abstract')" class="item-list-abstract">
+      <div *ngIf="dso.firstMetadataValue('dc.description.abstract')" class="item-list-abstract">
         <ds-truncatable-part [id]="dso.id" [minLines]="3"><span
-                [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
+          [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
         </ds-truncatable-part>
-    </div>
-</ds-truncatable>
+      </div>
+    </ds-truncatable>
+  </div>
+</div>

From d01bfe2cb1c45890f67bee3a616532530b129f46 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Sun, 21 Aug 2022 09:06:27 -0700
Subject: [PATCH 18/73] Added global config for list thumbnails

---
 .../browse-by-date-page.component.ts          |  5 ++--
 .../browse-by-metadata-page.component.ts      | 28 ++++++++++++++-----
 .../browse-by-title-page.component.ts         |  8 ++++--
 .../browse-entry-search-options.model.ts      |  5 +++-
 src/app/core/browse/browse.service.ts         |  6 ++--
 ...-search-result-list-element.component.html |  4 +--
 ...em-search-result-list-element.component.ts |  7 +++++
 src/config/app-config.interface.ts            |  1 +
 src/config/default-app-config.ts              |  3 ++
 src/environments/environment.test.ts          |  1 +
 10 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
index 271828a38e..caa7891861 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
@@ -50,7 +50,8 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
   ngOnInit(): void {
     const sortConfig = new SortOptions('default', SortDirection.ASC);
     this.startsWithType = StartsWithType.date;
-    this.updatePage(new BrowseEntrySearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig));
+    this.updatePage(new BrowseEntrySearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, null,
+      null, this.embedThumbnail));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
@@ -63,7 +64,7 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
         const metadataKeys = params.browseDefinition ? params.browseDefinition.metadataKeys : this.defaultMetadataKeys;
         this.browseId = params.id || this.defaultBrowseId;
         this.startsWith = +params.startsWith || params.startsWith;
-        const searchOptions = browseParamsToOptions(params, currentPage, currentSort, this.browseId);
+        const searchOptions = browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.embedThumbnail);
         this.updatePageWithItems(searchOptions, this.value, undefined);
         this.updateParent(params.scope);
         this.updateStartsWithOptions(this.browseId, metadataKeys, params.scope);
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
index c685fe31a7..bd25a38b91 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -1,5 +1,5 @@
 import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { Component, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
@@ -17,6 +17,8 @@ import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
 import { BrowseByDataType, rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { map } from 'rxjs/operators';
+import { environment } from '../../../environments/environment';
+
 
 export const BBM_PAGINATION_ID = 'bbm';
 
@@ -111,16 +113,24 @@ export class BrowseByMetadataPageComponent implements OnInit {
    */
   startsWith: string;
 
+  /**
+   * Determines whether to request embedded thumbnail.
+   */
+  embedThumbnail: boolean;
+
   public constructor(protected route: ActivatedRoute,
                      protected browseService: BrowseService,
                      protected dsoService: DSpaceObjectDataService,
                      protected paginationService: PaginationService,
                      protected router: Router) {
+    this.embedThumbnail = environment.showItemThumbnails;
   }
 
   ngOnInit(): void {
+
     const sortConfig = new SortOptions('default', SortDirection.ASC);
-    this.updatePage(new BrowseEntrySearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig));
+    this.updatePage(new BrowseEntrySearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, null,
+      null, false));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
@@ -133,15 +143,16 @@ export class BrowseByMetadataPageComponent implements OnInit {
           this.authority = params.authority;
           this.value = +params.value || params.value || '';
           this.startsWith = +params.startsWith || params.startsWith;
-          const searchOptions = browseParamsToOptions(params, currentPage, currentSort, this.browseId);
           if (isNotEmpty(this.value)) {
-            this.updatePageWithItems(searchOptions, this.value, this.authority);
+            this.updatePageWithItems(
+              browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.embedThumbnail), this.value, this.authority);
           } else {
-            this.updatePage(searchOptions);
+            this.updatePage(browseParamsToOptions(params, currentPage, currentSort, this.browseId, false));
           }
           this.updateParent(params.scope);
         }));
     this.updateStartsWithTextOptions();
+
   }
 
   /**
@@ -234,16 +245,19 @@ export class BrowseByMetadataPageComponent implements OnInit {
  * @param paginationConfig  Pagination configuration
  * @param sortConfig        Sorting configuration
  * @param metadata          Optional metadata definition to fetch browse entries/items for
+ * @param embedThumbnails   Optional parameter for requesting thumbnail images
  */
 export function browseParamsToOptions(params: any,
                                       paginationConfig: PaginationComponentOptions,
                                       sortConfig: SortOptions,
-                                      metadata?: string): BrowseEntrySearchOptions {
+                                      metadata?: string,
+                                      embedThumbnails?: boolean): BrowseEntrySearchOptions {
   return new BrowseEntrySearchOptions(
     metadata,
     paginationConfig,
     sortConfig,
     +params.startsWith || params.startsWith,
-    params.scope
+    params.scope,
+    embedThumbnails
   );
 }
diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
index 6504a8700a..fbc3916400 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
@@ -30,13 +30,15 @@ export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
                      protected browseService: BrowseService,
                      protected dsoService: DSpaceObjectDataService,
                      protected paginationService: PaginationService,
-                     protected router: Router) {
+                     protected router: Router,
+                     ) {
     super(route, browseService, dsoService, paginationService, router);
   }
 
   ngOnInit(): void {
     const sortConfig = new SortOptions('dc.title', SortDirection.ASC);
-    this.updatePage(new BrowseEntrySearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig));
+    this.updatePage(new BrowseEntrySearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, null,
+      null, this.embedThumbnail));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
@@ -47,7 +49,7 @@ export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
       ).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
         this.startsWith = +params.startsWith || params.startsWith;
         this.browseId = params.id || this.defaultBrowseId;
-        this.updatePageWithItems(browseParamsToOptions(params, currentPage, currentSort, this.browseId), undefined, undefined);
+        this.updatePageWithItems(browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.embedThumbnail), undefined, undefined);
         this.updateParent(params.scope);
       }));
     this.updateStartsWithTextOptions();
diff --git a/src/app/core/browse/browse-entry-search-options.model.ts b/src/app/core/browse/browse-entry-search-options.model.ts
index 417bf7ce75..a4b04e0d57 100644
--- a/src/app/core/browse/browse-entry-search-options.model.ts
+++ b/src/app/core/browse/browse-entry-search-options.model.ts
@@ -6,13 +6,16 @@ import { SortOptions } from '../cache/models/sort-options.model';
  * - metadataDefinition:  The metadata definition to fetch entries or items for
  * - pagination:          Optional pagination options to use
  * - sort:                Optional sorting options to use
+ * - startsWith           An optional value to use to filter the browse results
  * - scope:               An optional scope to limit the results within a specific collection or community
+ * - embedThumbnail       An optional boolean to request thumbnail for items
  */
 export class BrowseEntrySearchOptions {
   constructor(public metadataDefinition: string,
               public pagination?: PaginationComponentOptions,
               public sort?: SortOptions,
               public startsWith?: string,
-              public scope?: string) {
+              public scope?: string,
+              public embedThumbnail?: boolean) {
   }
 }
diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
index c34c32d9c2..46524e4385 100644
--- a/src/app/core/browse/browse.service.ts
+++ b/src/app/core/browse/browse.service.ts
@@ -105,10 +105,8 @@ export class BrowseService {
         return href;
       })
     );
-
-    if (options.metadataDefinition == 'title' || options.metadataDefinition == 'dateissued' ) {
+    if (options.embedThumbnail) {
       return this.hrefOnlyDataService.findAllByHref<BrowseEntry>(href$, {}, null, null, ...BROWSE_ENTRY_LINKS_TO_FOLLOW);
-
     }
     return this.hrefOnlyDataService.findAllByHref<BrowseEntry>(href$);
   }
@@ -155,7 +153,7 @@ export class BrowseService {
         return href;
       }),
     );
-    if (options.metadataDefinition == 'title' || options.metadataDefinition == 'dateissued' || hasValue(filterValue)) {
+    if (options.embedThumbnail) {
       return this.hrefOnlyDataService.findAllByHref<Item>(href$, {}, null, null, ...BROWSE_ITEM_LINKS_TO_FOLLOW);
     }
     return this.hrefOnlyDataService.findAllByHref<Item>(href$);
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index c13821a153..fb0429a8b9 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -1,12 +1,12 @@
 <div class="row">
-  <div class="col-md-2">
+  <div *ngIf="showThumbnails" class="col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
        [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
     <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
     </ds-thumbnail>
     </a>
   </div>
-  <div class="col-md-10">
+  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
     <div class="d-flex">
       <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
       <ds-access-status-badge [item]="dso" class="pl-1"></ds-access-status-badge>
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index b5eb64869d..46c3efd126 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -5,6 +5,7 @@ import { ItemSearchResult } from '../../../../../object-collection/shared/item-s
 import { SearchResultListElementComponent } from '../../../search-result-list-element.component';
 import { Item } from '../../../../../../core/shared/item.model';
 import { getItemPageRoute } from '../../../../../../item-page/item-page-routing-paths';
+import { environment } from '../../../../../../../environments/environment';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement)
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement)
@@ -22,8 +23,14 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen
    */
   itemPageRoute: string;
 
+  /**
+   * Display thumbnails if required by configuration
+   */
+  showThumbnails: boolean;
+
   ngOnInit(): void {
     super.ngOnInit();
+    this.showThumbnails = environment.showItemThumbnails;
     this.itemPageRoute = getItemPageRoute(this.dso);
   }
 }
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index cd9ef103ae..515de9613f 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -31,6 +31,7 @@ interface AppConfig extends Config {
   defaultLanguage: string;
   languages: LangConfig[];
   browseBy: BrowseByConfig;
+  showItemThumbnails: boolean;
   item: ItemConfig;
   collection: CollectionPageConfig;
   themes: ThemeConfig[];
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index d2d0608a03..8c4731d3b2 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -208,6 +208,9 @@ export class DefaultAppConfig implements AppConfig {
     defaultLowerLimit: 1900
   };
 
+  // Whether to add item thumbnail images to browse and search result lists.
+  showItemThumbnails: false;
+
   // Item Config
   item: ItemConfig = {
     edit: {
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 4d466bd37b..edf986b88f 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -200,6 +200,7 @@ export const environment: BuildConfig = {
     // The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
     defaultLowerLimit: 1900,
   },
+  showItemThumbnails: false,
   item: {
     edit: {
       undoTimeout: 10000 // 10 seconds

From 37e79ddc695f21b69c069f75184e8ec7d899a1c6 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Sun, 21 Aug 2022 09:09:32 -0700
Subject: [PATCH 19/73] Updated example config.

---
 config/config.example.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/config.example.yml b/config/config.example.yml
index ae733e0be5..825a0f5bfa 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -169,6 +169,9 @@ browseBy:
   # The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
   defaultLowerLimit: 1900
 
+# If true, thumbnail images for items will be added to search and browse result lists.
+showItemThumbnails: false
+
 # Item Config
 item:
   edit:

From 2c6324505060bd5fb3aef3773ddc1eace4341e93 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Sun, 21 Aug 2022 13:03:41 -0700
Subject: [PATCH 20/73] Unused import.

---
 .../browse-by-metadata-page.component.ts                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
index bd25a38b91..bf7bf88a5e 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -1,5 +1,5 @@
 import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';

From 9e14985fc5125c54c0ba632f96869098966b7cfb Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Wed, 7 Sep 2022 10:47:04 -0700
Subject: [PATCH 21/73] Work on columns

---
 .../browse-by-title-page/browse-by-title-page.component.ts    | 3 +--
 .../item/item-search-result-list-element.component.html       | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
index fbc3916400..d0782b38e5 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
@@ -30,8 +30,7 @@ export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
                      protected browseService: BrowseService,
                      protected dsoService: DSpaceObjectDataService,
                      protected paginationService: PaginationService,
-                     protected router: Router,
-                     ) {
+                     protected router: Router) {
     super(route, browseService, dsoService, paginationService, router);
   }
 
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index fb0429a8b9..b3889e4f75 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -1,6 +1,6 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-md-2">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
+  <div class="col-md-2">
+    <a *ngIf="linkType != linkTypes.None && showThumbnails" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
        [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
     <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
     </ds-thumbnail>

From f8404c540e305b2a8afd32c13ff1db0ab248c007 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Thu, 8 Sep 2022 12:10:41 +0200
Subject: [PATCH 22/73] 94207: Extract 'wait for invalidation' pattern into a
 new method

---
 .../remote-data-build.service.spec.ts         |  95 ++++++++++-
 .../builders/remote-data-build.service.ts     |  45 +++++
 .../bitstream-format-data.service.spec.ts     |   3 +-
 src/app/core/data/data.service.spec.ts        |  78 +++------
 src/app/core/data/data.service.ts             |  30 +---
 .../core/eperson/group-data.service.spec.ts   |  21 +++
 src/app/core/eperson/group-data.service.ts    | 160 +++---------------
 .../resource-policy.service.spec.ts           |  41 ++---
 .../resource-policy.service.ts                |  30 +---
 .../mocks/remote-data-build.service.mock.ts   |   2 +
 10 files changed, 217 insertions(+), 288 deletions(-)

diff --git a/src/app/core/cache/builders/remote-data-build.service.spec.ts b/src/app/core/cache/builders/remote-data-build.service.spec.ts
index befeabdd90..d9b856bb77 100644
--- a/src/app/core/cache/builders/remote-data-build.service.spec.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.spec.ts
@@ -1,4 +1,4 @@
-import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { createFailedRemoteDataObject, createPendingRemoteDataObject, createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
 import { buildPaginatedList, PaginatedList } from '../../data/paginated-list.model';
 import { Item } from '../../shared/item.model';
 import { PageInfo } from '../../shared/page-info.model';
@@ -19,6 +19,8 @@ import { HALLink } from '../../shared/hal-link.model';
 import { RequestEntryState } from '../../data/request-entry-state.model';
 import { RequestEntry } from '../../data/request-entry.model';
 import { cold } from 'jasmine-marbles';
+import { TestScheduler } from 'rxjs/testing';
+import { fakeAsync, tick } from '@angular/core/testing';
 
 describe('RemoteDataBuildService', () => {
   let service: RemoteDataBuildService;
@@ -763,4 +765,95 @@ describe('RemoteDataBuildService', () => {
       });
     });
   });
+
+  describe('buildFromRequestUUIDAndAwait', () => {
+    let testScheduler;
+
+    let callback: jasmine.Spy;
+    let buildFromRequestUUIDSpy;
+
+    const BOOLEAN = { t: true, f: false };
+
+    const MOCK_PENDING_RD = createPendingRemoteDataObject();
+    const MOCK_SUCCEEDED_RD = createSuccessfulRemoteDataObject({});
+    const MOCK_FAILED_RD = createFailedRemoteDataObject('failed');
+
+    const RDs = {
+      p: MOCK_PENDING_RD,
+      s: MOCK_SUCCEEDED_RD,
+      f: MOCK_FAILED_RD,
+    };
+
+
+    beforeEach(() => {
+      testScheduler = new TestScheduler((actual, expected) => {
+        expect(actual).toEqual(expected);
+      });
+
+      callback = jasmine.createSpy('callback');
+      callback.and.returnValue(observableOf(undefined));
+      buildFromRequestUUIDSpy = spyOn(service, 'buildFromRequestUUID').and.callThrough();
+    });
+
+    it('should patch through href & followLinks to buildFromRequestUUID', () => {
+      buildFromRequestUUIDSpy.and.returnValue(observableOf(MOCK_SUCCEEDED_RD));
+      service.buildFromRequestUUIDAndAwait('some-href', callback, ...linksToFollow);
+      expect(buildFromRequestUUIDSpy).toHaveBeenCalledWith('some-href', ...linksToFollow);
+    });
+
+    it('should trigger the callback on successful RD', (done) => {
+      buildFromRequestUUIDSpy.and.returnValue(observableOf(MOCK_SUCCEEDED_RD));
+
+      service.buildFromRequestUUIDAndAwait('some-href', callback).subscribe(rd => {
+        expect(rd).toBe(MOCK_SUCCEEDED_RD);
+        expect(callback).toHaveBeenCalled();
+        done();
+      });
+    });
+
+    it('should trigger the callback on successful RD even if nothing subscribes to the returned Observable', fakeAsync(() => {
+      buildFromRequestUUIDSpy.and.returnValue(observableOf(MOCK_SUCCEEDED_RD));
+
+      service.buildFromRequestUUIDAndAwait('some-href', callback);
+      tick();
+
+      expect(callback).toHaveBeenCalled();
+    }));
+
+    it('should not trigger the callback on pending RD', (done) => {
+      buildFromRequestUUIDSpy.and.returnValue(observableOf(MOCK_PENDING_RD));
+
+      service.buildFromRequestUUIDAndAwait('some-href', callback).subscribe(rd => {
+        expect(rd).toBe(MOCK_PENDING_RD);
+        expect(callback).not.toHaveBeenCalled();
+        done();
+      });
+    });
+
+    it('should not trigger the callback on failed RD', (done) => {
+      buildFromRequestUUIDSpy.and.returnValue(observableOf(MOCK_FAILED_RD));
+
+      service.buildFromRequestUUIDAndAwait('some-href', callback).subscribe(rd => {
+        expect(rd).toBe(MOCK_FAILED_RD);
+        expect(callback).not.toHaveBeenCalled();
+        done();
+      });
+    });
+
+    it('should only emit after the callback is done', () => {
+      testScheduler.run(({ cold: tsCold, expectObservable }) => {
+        buildFromRequestUUIDSpy.and.returnValue(
+          tsCold('-p----s', RDs)
+        );
+        callback.and.returnValue(
+          tsCold('      --t', BOOLEAN)
+        );
+
+        const done$ = service.buildFromRequestUUIDAndAwait('some-href', callback);
+        expectObservable(done$).toBe(
+          '       -p------s', RDs       // resulting duration between pending & successful includes the callback
+        );
+      });
+    });
+  });
 });
diff --git a/src/app/core/cache/builders/remote-data-build.service.ts b/src/app/core/cache/builders/remote-data-build.service.ts
index 8ceab63e03..76529891d4 100644
--- a/src/app/core/cache/builders/remote-data-build.service.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import {
+  AsyncSubject,
   combineLatest as observableCombineLatest,
   Observable,
   of as observableOf,
@@ -24,6 +25,7 @@ import { hasSucceeded, isStale, RequestEntryState } from '../../data/request-ent
 import { getRequestFromRequestHref, getRequestFromRequestUUID } from '../../shared/request.operators';
 import { RequestEntry } from '../../data/request-entry.model';
 import { ResponseState } from '../../data/response-state.model';
+import { getFirstCompletedRemoteData } from '../../shared/operators';
 
 @Injectable()
 export class RemoteDataBuildService {
@@ -188,6 +190,49 @@ export class RemoteDataBuildService {
     return this.toRemoteDataObservable<T>(requestEntry$, payload$);
   }
 
+  /**
+   * Creates a {@link RemoteData} object for a rest request and its response
+   * and emits it only after the callback function is completed.
+   *
+   * @param requestUUID$    The UUID of the request we want to retrieve
+   * @param callback        A function that returns an Observable. It will only be called once the request has succeeded.
+   *                        Then, the response will only be emitted after this callback function has emitted.
+   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  buildFromRequestUUIDAndAwait<T>(requestUUID$: string | Observable<string>, callback: (rd?: RemoteData<T>) => Observable<unknown>, ...linksToFollow: FollowLinkConfig<any>[]): Observable<RemoteData<T>> {
+    const response$ = this.buildFromRequestUUID(requestUUID$, ...linksToFollow);
+
+    const callbackDone$ = new AsyncSubject<boolean>();
+    response$.pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((rd: RemoteData<any>) => {
+        if (rd.hasSucceeded) {
+          // if the request succeeded, execute the callback
+          return callback(rd);
+        } else {
+          // otherwise, emit right away so the subscription doesn't stick around
+          return [true];
+        }
+      }),
+    ).subscribe(() => {
+      callbackDone$.next(true);
+      callbackDone$.complete();
+    });
+
+    return response$.pipe(
+      switchMap((rd: RemoteData<any>) => {
+        if (rd.hasSucceeded) {
+          // if the request succeeded, wait for the callback to finish
+          return callbackDone$.pipe(
+            map(() => rd),
+          );
+        } else {
+          return [rd];
+        }
+      })
+    );
+  }
+
   /**
    * Creates a {@link RemoteData} object for a rest request and its response
    *
diff --git a/src/app/core/data/bitstream-format-data.service.spec.ts b/src/app/core/data/bitstream-format-data.service.spec.ts
index 30ef79ee6d..9dd176fd11 100644
--- a/src/app/core/data/bitstream-format-data.service.spec.ts
+++ b/src/app/core/data/bitstream-format-data.service.spec.ts
@@ -59,7 +59,8 @@ describe('BitstreamFormatDataService', () => {
   function initTestService(halService) {
     rd = createSuccessfulRemoteDataObject({});
     rdbService = jasmine.createSpyObj('rdbService', {
-      buildFromRequestUUID: observableOf(rd)
+      buildFromRequestUUID: observableOf(rd),
+      buildFromRequestUUIDAndAwait: observableOf(rd),
     });
 
     return new BitstreamFormatDataService(
diff --git a/src/app/core/data/data.service.spec.ts b/src/app/core/data/data.service.spec.ts
index dc661e12d7..b8c41dee9d 100644
--- a/src/app/core/data/data.service.spec.ts
+++ b/src/app/core/data/data.service.spec.ts
@@ -920,16 +920,16 @@ describe('DataService', () => {
     let MOCK_SUCCEEDED_RD;
     let MOCK_FAILED_RD;
 
-    let invalidateByHrefSpy: jasmine.Spy;
-    let buildFromRequestUUIDSpy: jasmine.Spy;
+    let buildFromRequestUUIDAndAwaitSpy: jasmine.Spy;
     let getIDHrefObsSpy: jasmine.Spy;
     let deleteByHrefSpy: jasmine.Spy;
+    let invalidateByHrefSpy: jasmine.Spy;
 
     beforeEach(() => {
-      invalidateByHrefSpy = spyOn(service, 'invalidateByHref').and.returnValue(observableOf(true));
-      buildFromRequestUUIDSpy = spyOn(rdbService, 'buildFromRequestUUID').and.callThrough();
+      buildFromRequestUUIDAndAwaitSpy = spyOn(rdbService, 'buildFromRequestUUIDAndAwait').and.callThrough();
       getIDHrefObsSpy = spyOn(service, 'getIDHrefObs').and.callThrough();
       deleteByHrefSpy = spyOn(service, 'deleteByHref').and.callThrough();
+      invalidateByHrefSpy = spyOn(service, 'invalidateByHref').and.returnValue(observableOf(true));
 
       MOCK_SUCCEEDED_RD = createSuccessfulRemoteDataObject({});
       MOCK_FAILED_RD = createFailedRemoteDataObject('something went wrong');
@@ -937,7 +937,7 @@ describe('DataService', () => {
 
     it('should retrieve href by ID and call deleteByHref', () => {
       getIDHrefObsSpy.and.returnValue(observableOf('some-href'));
-      buildFromRequestUUIDSpy.and.returnValue(createSuccessfulRemoteDataObject$({}));
+      buildFromRequestUUIDAndAwaitSpy.and.returnValue(createSuccessfulRemoteDataObject$({}));
 
       service.delete('some-id', ['a', 'b', 'c']).subscribe(rd => {
         expect(getIDHrefObsSpy).toHaveBeenCalledWith('some-id');
@@ -946,65 +946,27 @@ describe('DataService', () => {
     });
 
     describe('deleteByHref', () => {
-      it('should call invalidateByHref if the DELETE request succeeds', (done) => {
-        buildFromRequestUUIDSpy.and.returnValue(observableOf(MOCK_SUCCEEDED_RD));
-
-        service.deleteByHref('some-href').subscribe(rd => {
-          expect(rd).toBe(MOCK_SUCCEEDED_RD);
-          expect(invalidateByHrefSpy).toHaveBeenCalled();
-          done();
-        });
+      beforeEach(() => {
+        buildFromRequestUUIDAndAwaitSpy.and.returnValue(createSuccessfulRemoteDataObject$({}));
       });
 
-      it('should call invalidateByHref even if not subscribing to returned Observable', fakeAsync(() => {
-        buildFromRequestUUIDSpy.and.returnValue(observableOf(MOCK_SUCCEEDED_RD));
+      it('should send a DELETE request', () => {
+        service.deleteByHref('https://somewhere.org/something/123', ['things', 'stuff']);
 
-        service.deleteByHref('some-href');
-        tick();
-
-        expect(invalidateByHrefSpy).toHaveBeenCalled();
-      }));
-
-      it('should not call invalidateByHref if the DELETE request fails', (done) => {
-        buildFromRequestUUIDSpy.and.returnValue(observableOf(MOCK_FAILED_RD));
-
-        service.deleteByHref('some-href').subscribe(rd => {
-          expect(rd).toBe(MOCK_FAILED_RD);
-          expect(invalidateByHrefSpy).not.toHaveBeenCalled();
-          done();
-        });
+        expect(requestService.send).toHaveBeenCalledWith(jasmine.objectContaining({
+          method: 'DELETE',
+          href: 'https://somewhere.org/something/123?copyVirtualMetadata=things&copyVirtualMetadata=stuff'
+        }));
       });
 
-      it('should wait for invalidateByHref before emitting', () => {
-        testScheduler.run(({ cold, expectObservable }) => {
-          buildFromRequestUUIDSpy.and.returnValue(
-            cold('(r|)', { r: MOCK_SUCCEEDED_RD})      // RD emits right away
-          );
-          invalidateByHrefSpy.and.returnValue(
-            cold('----(t|)', BOOLEAN)                  // but we pretend that setting requests to stale takes longer
-          );
+      it('should retrieve response via buildFromRequestUUIDAndAwait & invalidate within the callback', () => {
+        service.deleteByHref('https://somewhere.org/something/123');
 
-          const done$ = service.deleteByHref('some-href');
-          expectObservable(done$).toBe(
-            '----(r|)', { r: MOCK_SUCCEEDED_RD}        // ...and expect the returned Observable to wait until that's done
-          );
-        });
-      });
-
-      it('should wait for the DELETE request to resolve before emitting', () => {
-        testScheduler.run(({ cold, expectObservable }) => {
-          buildFromRequestUUIDSpy.and.returnValue(
-            cold('----(r|)', { r: MOCK_SUCCEEDED_RD})   // the request takes a while
-          );
-          invalidateByHrefSpy.and.returnValue(
-            cold('(t|)', BOOLEAN)                       // but we pretend that setting to stale happens sooner
-          );                                            // e.g.: maybe already stale before this call?
-
-          const done$ = service.deleteByHref('some-href');
-          expectObservable(done$).toBe(
-            '----(r|)', { r: MOCK_SUCCEEDED_RD}         // ...and expect the returned Observable to wait for the request
-          );
-        });
+        expect(buildFromRequestUUIDAndAwaitSpy).toHaveBeenCalled();
+        expect(buildFromRequestUUIDAndAwaitSpy.calls.argsFor(0)[0]).toBe(requestService.generateRequestId());
+        const callback = buildFromRequestUUIDAndAwaitSpy.calls.argsFor(0)[1];
+        callback();
+        expect(invalidateByHrefSpy).toHaveBeenCalledWith('https://somewhere.org/something/123');
       });
     });
   });
diff --git a/src/app/core/data/data.service.ts b/src/app/core/data/data.service.ts
index 695b2e5fea..279791d326 100644
--- a/src/app/core/data/data.service.ts
+++ b/src/app/core/data/data.service.ts
@@ -649,35 +649,7 @@ export abstract class DataService<T extends CacheableObject> implements UpdateDa
     }
     this.requestService.send(request);
 
-    const response$ = this.rdbService.buildFromRequestUUID(requestId);
-
-    const invalidated$ = new AsyncSubject<boolean>();
-    response$.pipe(
-      getFirstCompletedRemoteData(),
-      switchMap((rd: RemoteData<NoContent>) => {
-        if (rd.hasSucceeded) {
-          return this.invalidateByHref(href);
-        } else {
-          return [true];
-        }
-      })
-    ).subscribe(() => {
-      invalidated$.next(true);
-      invalidated$.complete();
-    });
-
-    return response$.pipe(
-      switchMap((rd: RemoteData<NoContent>) => {
-        if (rd.hasSucceeded) {
-          return invalidated$.pipe(
-            filter((invalidated: boolean) => invalidated),
-            map(() => rd)
-          );
-        } else {
-          return [rd];
-        }
-      })
-    );
+    return this.rdbService.buildFromRequestUUIDAndAwait(requestId, () => this.invalidateByHref(href));
   }
 
   /**
diff --git a/src/app/core/eperson/group-data.service.spec.ts b/src/app/core/eperson/group-data.service.spec.ts
index 01c8632afa..c1b9e59d5b 100644
--- a/src/app/core/eperson/group-data.service.spec.ts
+++ b/src/app/core/eperson/group-data.service.spec.ts
@@ -95,6 +95,7 @@ describe('GroupDataService', () => {
     store = new Store<CoreState>(undefined, undefined, undefined);
     service = initTestService();
     spyOn(store, 'dispatch');
+    spyOn(rdbService, 'buildFromRequestUUIDAndAwait').and.callThrough();
   });
 
   describe('searchGroups', () => {
@@ -136,6 +137,11 @@ describe('GroupDataService', () => {
       expect(requestService.send).toHaveBeenCalledWith(expected);
     });
     it('should invalidate the previous requests of the parent group', () => {
+      expect(rdbService.buildFromRequestUUIDAndAwait).toHaveBeenCalled();
+      expect(rdbService.buildFromRequestUUIDAndAwait.calls.argsFor(0)[0]).toBe(requestService.generateRequestId());
+      const callback = rdbService.buildFromRequestUUIDAndAwait.calls.argsFor(0)[1];
+      callback();
+
       expect(objectCache.getByHref).toHaveBeenCalledWith(GroupMock._links.self.href);
       expect(requestService.setStaleByUUID).toHaveBeenCalledTimes(2);
       expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request1');
@@ -156,6 +162,11 @@ describe('GroupDataService', () => {
       expect(requestService.send).toHaveBeenCalledWith(expected);
     });
     it('should invalidate the previous requests of the parent group\'', () => {
+      expect(rdbService.buildFromRequestUUIDAndAwait).toHaveBeenCalled();
+      expect(rdbService.buildFromRequestUUIDAndAwait.calls.argsFor(0)[0]).toBe(requestService.generateRequestId());
+      const callback = rdbService.buildFromRequestUUIDAndAwait.calls.argsFor(0)[1];
+      callback();
+
       expect(objectCache.getByHref).toHaveBeenCalledWith(GroupMock._links.self.href);
       expect(requestService.setStaleByUUID).toHaveBeenCalledTimes(2);
       expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request1');
@@ -180,6 +191,11 @@ describe('GroupDataService', () => {
       expect(requestService.send).toHaveBeenCalledWith(expected);
     });
     it('should invalidate the previous requests of the EPerson and the group', () => {
+      expect(rdbService.buildFromRequestUUIDAndAwait).toHaveBeenCalled();
+      expect(rdbService.buildFromRequestUUIDAndAwait.calls.argsFor(0)[0]).toBe(requestService.generateRequestId());
+      const callback = rdbService.buildFromRequestUUIDAndAwait.calls.argsFor(0)[1];
+      callback();
+
       expect(objectCache.getByHref).toHaveBeenCalledWith(EPersonMock2._links.self.href);
       expect(objectCache.getByHref).toHaveBeenCalledWith(GroupMock._links.self.href);
       expect(requestService.setStaleByUUID).toHaveBeenCalledTimes(4);
@@ -201,6 +217,11 @@ describe('GroupDataService', () => {
       expect(requestService.send).toHaveBeenCalledWith(expected);
     });
     it('should invalidate the previous requests of the EPerson and the group', () => {
+      expect(rdbService.buildFromRequestUUIDAndAwait).toHaveBeenCalled();
+      expect(rdbService.buildFromRequestUUIDAndAwait.calls.argsFor(0)[0]).toBe(requestService.generateRequestId());
+      const callback = rdbService.buildFromRequestUUIDAndAwait.calls.argsFor(0)[1];
+      callback();
+
       expect(objectCache.getByHref).toHaveBeenCalledWith(EPersonMock._links.self.href);
       expect(objectCache.getByHref).toHaveBeenCalledWith(GroupMock._links.self.href);
       expect(requestService.setStaleByUUID).toHaveBeenCalledTimes(4);
diff --git a/src/app/core/eperson/group-data.service.ts b/src/app/core/eperson/group-data.service.ts
index a994170281..df1f5bcb09 100644
--- a/src/app/core/eperson/group-data.service.ts
+++ b/src/app/core/eperson/group-data.service.ts
@@ -124,40 +124,10 @@ export class GroupDataService extends DataService<Group> {
     const postRequest = new PostRequest(requestId, activeGroup.self + '/' + this.subgroupsEndpoint, subgroup.self, options);
     this.requestService.send(postRequest);
 
-    const response$ = this.rdbService.buildFromRequestUUID(requestId);
-
-    const invalidated$ = new AsyncSubject<boolean>();
-    response$.pipe(
-      getFirstCompletedRemoteData(),
-      switchMap((rd: RemoteData<Group>) => {
-        if (rd.hasSucceeded) {
-          return observableZip(
-            this.invalidateByHref(activeGroup._links.self.href),
-            this.requestService.setStaleByHrefSubstring(activeGroup._links.subgroups.href).pipe(take(1)),
-          ).pipe(
-            map((arr: boolean[]) => arr.every((b: boolean) => b === true))
-          );
-        } else {
-          return [true];
-        }
-      })
-    ).subscribe(() => {
-      invalidated$.next(true);
-      invalidated$.complete();
-    });
-
-    return response$.pipe(
-      switchMap((rd: RemoteData<Group>) => {
-        if (rd.hasSucceeded) {
-          return invalidated$.pipe(
-            filter((invalidated: boolean) => invalidated),
-            map(() => rd)
-          );
-        } else {
-          return [rd];
-        }
-      })
-    );
+    return this.rdbService.buildFromRequestUUIDAndAwait(requestId, () => observableZip(
+      this.invalidateByHref(activeGroup._links.self.href),
+      this.requestService.setStaleByHrefSubstring(activeGroup._links.subgroups.href).pipe(take(1)),
+    ));
   }
 
   /**
@@ -172,40 +142,10 @@ export class GroupDataService extends DataService<Group> {
     const deleteRequest = new DeleteRequest(requestId, activeGroup.self + '/' + this.subgroupsEndpoint + '/' + subgroup.id);
     this.requestService.send(deleteRequest);
 
-    const response$ = this.rdbService.buildFromRequestUUID(requestId);
-
-    const invalidated$ = new AsyncSubject<boolean>();
-    response$.pipe(
-      getFirstCompletedRemoteData(),
-      switchMap((rd: RemoteData<NoContent>) => {
-        if (rd.hasSucceeded) {
-          return observableZip(
-            this.invalidateByHref(activeGroup._links.self.href),
-            this.requestService.setStaleByHrefSubstring(activeGroup._links.subgroups.href).pipe(take(1)),
-          ).pipe(
-            map((arr: boolean[]) => arr.every((b: boolean) => b === true))
-          );
-        } else {
-          return [true];
-        }
-      })
-    ).subscribe(() => {
-      invalidated$.next(true);
-      invalidated$.complete();
-    });
-
-    return response$.pipe(
-      switchMap((rd: RemoteData<NoContent>) => {
-        if (rd.hasSucceeded) {
-          return invalidated$.pipe(
-            filter((invalidated: boolean) => invalidated),
-            map(() => rd)
-          );
-        } else {
-          return [rd];
-        }
-      })
-    );
+    return this.rdbService.buildFromRequestUUIDAndAwait(requestId, () => observableZip(
+      this.invalidateByHref(activeGroup._links.self.href),
+      this.requestService.setStaleByHrefSubstring(activeGroup._links.subgroups.href).pipe(take(1)),
+    ));
   }
 
   /**
@@ -223,42 +163,12 @@ export class GroupDataService extends DataService<Group> {
     const postRequest = new PostRequest(requestId, activeGroup.self + '/' + this.ePersonsEndpoint, ePerson.self, options);
     this.requestService.send(postRequest);
 
-    const response$ = this.rdbService.buildFromRequestUUID(requestId);
-
-    const invalidated$ = new AsyncSubject<boolean>();
-    response$.pipe(
-      getFirstCompletedRemoteData(),
-      switchMap((rd: RemoteData<NoContent>) => {
-        if (rd.hasSucceeded) {
-          return observableZip(
-            this.invalidateByHref(ePerson._links.self.href),
-            this.invalidateByHref(activeGroup._links.self.href),
-            this.requestService.setStaleByHrefSubstring(ePerson._links.groups.href).pipe(take(1)),
-            this.requestService.setStaleByHrefSubstring(activeGroup._links.epersons.href).pipe(take(1)),
-          ).pipe(
-            map((arr: boolean[]) => arr.every((b: boolean) => b === true))
-          );
-        } else {
-          return [true];
-        }
-      })
-    ).subscribe(() => {
-      invalidated$.next(true);
-      invalidated$.complete();
-    });
-
-    return response$.pipe(
-      switchMap((rd: RemoteData<Group>) => {
-        if (rd.hasSucceeded) {
-          return invalidated$.pipe(
-            filter((invalidated: boolean) => invalidated),
-            map(() => rd)
-          );
-        } else {
-          return [rd];
-        }
-      })
-    );
+    return this.rdbService.buildFromRequestUUIDAndAwait(requestId, () => observableZip(
+      this.invalidateByHref(ePerson._links.self.href),
+      this.invalidateByHref(activeGroup._links.self.href),
+      this.requestService.setStaleByHrefSubstring(ePerson._links.groups.href).pipe(take(1)),
+      this.requestService.setStaleByHrefSubstring(activeGroup._links.epersons.href).pipe(take(1)),
+    ));
   }
 
   /**
@@ -272,42 +182,12 @@ export class GroupDataService extends DataService<Group> {
     const deleteRequest = new DeleteRequest(requestId, activeGroup.self + '/' + this.ePersonsEndpoint + '/' + ePerson.id);
     this.requestService.send(deleteRequest);
 
-    const response$ = this.rdbService.buildFromRequestUUID(requestId);
-
-    const invalidated$ = new AsyncSubject<boolean>();
-    response$.pipe(
-      getFirstCompletedRemoteData(),
-      switchMap((rd: RemoteData<NoContent>) => {
-        if (rd.hasSucceeded) {
-          return observableZip(
-            this.invalidateByHref(ePerson._links.self.href),
-            this.invalidateByHref(activeGroup._links.self.href),
-            this.requestService.setStaleByHrefSubstring(ePerson._links.groups.href).pipe(take(1)),
-            this.requestService.setStaleByHrefSubstring(activeGroup._links.epersons.href).pipe(take(1)),
-          ).pipe(
-            map((arr: boolean[]) => arr.every((b: boolean) => b === true))
-          );
-        } else {
-          return [true];
-        }
-      })
-    ).subscribe(() => {
-      invalidated$.next(true);
-      invalidated$.complete();
-    });
-
-    return response$.pipe(
-      switchMap((rd: RemoteData<NoContent>) => {
-        if (rd.hasSucceeded) {
-          return invalidated$.pipe(
-            filter((invalidated: boolean) => invalidated),
-            map(() => rd)
-          );
-        } else {
-          return [rd];
-        }
-      })
-    );
+    return this.rdbService.buildFromRequestUUIDAndAwait(requestId, () => observableZip(
+      this.invalidateByHref(ePerson._links.self.href),
+      this.invalidateByHref(activeGroup._links.self.href),
+      this.requestService.setStaleByHrefSubstring(ePerson._links.groups.href).pipe(take(1)),
+      this.requestService.setStaleByHrefSubstring(activeGroup._links.epersons.href).pipe(take(1)),
+    ));
   }
 
   /**
diff --git a/src/app/core/resource-policy/resource-policy.service.spec.ts b/src/app/core/resource-policy/resource-policy.service.spec.ts
index e4d3358d55..357a9ec659 100644
--- a/src/app/core/resource-policy/resource-policy.service.spec.ts
+++ b/src/app/core/resource-policy/resource-policy.service.spec.ts
@@ -123,6 +123,9 @@ describe('ResourcePolicyService', () => {
       }),
       buildFromRequestUUID: hot('a|', {
         a: resourcePolicyRD
+      }),
+      buildFromRequestUUIDAndAwait: hot('a|', {
+        a: resourcePolicyRD
       })
     });
     ePersonService = jasmine.createSpyObj('ePersonService', {
@@ -346,6 +349,8 @@ describe('ResourcePolicyService', () => {
   });
 
   describe('updateTarget', () => {
+    let buildFromRequestUUIDAndAwaitSpy;
+
     beforeEach(() => {
       scheduler.schedule(() => service.create(resourcePolicy, resourceUUID, epersonUUID));
     });
@@ -362,41 +367,17 @@ describe('ResourcePolicyService', () => {
       }));
     });
 
-    it('should send a PUT request to update the Group', () => {
-      service.updateTarget(resourcePolicyId, requestURL, groupUUID, 'group');
-      scheduler.flush();
-
-      expect(requestService.send).toHaveBeenCalledWith(jasmine.objectContaining({
-        method: RestRequestMethod.PUT,
-        uuid: requestUUID,
-        href: `${resourcePolicy._links.self.href}/group`,
-        body: 'https://rest.api/rest/api/eperson/groups/' + groupUUID,
-      }));
-    });
-
-    it('should invalidate the ResourcePolicy if the PUT request succeeds', () => {
+    it('should invalidate the ResourcePolicy', () => {
       service.updateTarget(resourcePolicyId, requestURL, epersonUUID, 'eperson');
       scheduler.flush();
 
+      expect(rdbService.buildFromRequestUUIDAndAwait).toHaveBeenCalled();
+      expect((rdbService.buildFromRequestUUIDAndAwait as jasmine.Spy).calls.argsFor(0)[0]).toBe(requestService.generateRequestId());
+      const callback = (rdbService.buildFromRequestUUIDAndAwait as jasmine.Spy).calls.argsFor(0)[1];
+      callback();
+
       expect((service as any).dataService.invalidateByHref).toHaveBeenCalledWith(resourcePolicy._links.self.href);
     });
-
-    it('should only emit when invalidation is complete', () => {
-      const RD = {
-        p: createPendingRemoteDataObject(),
-        s: createSuccessfulRemoteDataObject({}),
-      };
-      const response$ = cold('(s|)', RD);
-      const invalidate$ = cold('--(d|)', { d: true });
-
-      (rdbService.buildFromRequestUUID as any).and.returnValue(response$);
-      ((service as any).dataService.invalidateByHref).and.returnValue(invalidate$);
-
-      const out$ = service.updateTarget(resourcePolicyId, requestURL, groupUUID, 'group');
-      scheduler.flush();
-
-      expect(out$).toBeObservable(cold('--(s|)', RD));
-    });
   });
 
 });
diff --git a/src/app/core/resource-policy/resource-policy.service.ts b/src/app/core/resource-policy/resource-policy.service.ts
index 0178c460f1..615a9470d9 100644
--- a/src/app/core/resource-policy/resource-policy.service.ts
+++ b/src/app/core/resource-policy/resource-policy.service.ts
@@ -263,35 +263,7 @@ export class ResourcePolicyService {
       this.requestService.send(request);
     });
 
-    const response$ = this.rdbService.buildFromRequestUUID(requestId);
-
-    const invalidated$ = new AsyncSubject<boolean>();
-    response$.pipe(
-      getFirstCompletedRemoteData(),
-      switchMap((rd: RemoteData<any>) => {
-        if (rd.hasSucceeded) {
-          return this.dataService.invalidateByHref(resourcePolicyHref);
-        } else {
-          return [undefined];
-        }
-      }),
-    ).subscribe(() => {
-      invalidated$.next(true);
-      invalidated$.complete();
-    });
-
-    return response$.pipe(
-      switchMap((rd: RemoteData<NoContent>) => {
-        if (rd.hasSucceeded) {
-          return invalidated$.pipe(
-            filter((invalidated: boolean) => invalidated),
-            map(() => rd)
-          );
-        } else {
-          return [rd];
-        }
-      })
-    );
+    return this.rdbService.buildFromRequestUUIDAndAwait(requestId, () => this.dataService.invalidateByHref(resourcePolicyHref));
   }
 
 }
diff --git a/src/app/shared/mocks/remote-data-build.service.mock.ts b/src/app/shared/mocks/remote-data-build.service.mock.ts
index 7b96c5a67a..a0fc74a753 100644
--- a/src/app/shared/mocks/remote-data-build.service.mock.ts
+++ b/src/app/shared/mocks/remote-data-build.service.mock.ts
@@ -29,6 +29,7 @@ export function getMockRemoteDataBuildService(toRemoteDataObservable$?: Observab
       }
     },
     buildFromRequestUUID: (id: string) => createSuccessfulRemoteDataObject$({}),
+    buildFromRequestUUIDAndAwait: (id: string, callback: (rd?: RemoteData<any>) => Observable<any>) => createSuccessfulRemoteDataObject$({}),
     buildFromHref: (href: string) => createSuccessfulRemoteDataObject$({})
   } as RemoteDataBuildService;
 
@@ -66,6 +67,7 @@ export function getMockRemoteDataBuildServiceHrefMap(toRemoteDataObservable$?: O
       );
     },
     buildFromRequestUUID: (id: string) => createSuccessfulRemoteDataObject$({}),
+    buildFromRequestUUIDAndAwait: (id: string, callback: (rd?: RemoteData<any>) => Observable<any>) => createSuccessfulRemoteDataObject$({}),
     buildFromHref: (href: string) => createSuccessfulRemoteDataObject$({})
   } as RemoteDataBuildService;
 

From 8622e4c0599e1a9cf28fc249635fbfce4d90b339 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Thu, 8 Sep 2022 13:07:30 +0200
Subject: [PATCH 23/73] Fix LGTM alerts

---
 .../group-form/members-list/members-list.component.ts         | 1 -
 src/app/core/data/data.service.ts                             | 2 +-
 src/app/core/eperson/group-data.service.ts                    | 4 ++--
 src/app/core/resource-policy/resource-policy.service.spec.ts  | 4 +---
 src/app/core/resource-policy/resource-policy.service.ts       | 4 ++--
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
index d777c2ca52..ad5d84544b 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -25,7 +25,6 @@ import { NotificationsService } from '../../../../shared/notifications/notificat
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 import {EpersonDtoModel} from '../../../../core/eperson/models/eperson-dto.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { isNotEmpty } from '../../../../shared/empty.util';
 
 /**
  * Keys to keep track of specific subscriptions
diff --git a/src/app/core/data/data.service.ts b/src/app/core/data/data.service.ts
index 279791d326..c17fccb198 100644
--- a/src/app/core/data/data.service.ts
+++ b/src/app/core/data/data.service.ts
@@ -27,7 +27,7 @@ import { ObjectCacheService } from '../cache/object-cache.service';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
+import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { ChangeAnalyzer } from './change-analyzer';
 import { PaginatedList } from './paginated-list.model';
diff --git a/src/app/core/eperson/group-data.service.ts b/src/app/core/eperson/group-data.service.ts
index df1f5bcb09..ea57297298 100644
--- a/src/app/core/eperson/group-data.service.ts
+++ b/src/app/core/eperson/group-data.service.ts
@@ -2,8 +2,8 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 
 import { createSelector, select, Store } from '@ngrx/store';
-import { Observable, AsyncSubject, zip as observableZip } from 'rxjs';
-import { filter, map, take, switchMap } from 'rxjs/operators';
+import { Observable, zip as observableZip } from 'rxjs';
+import { filter, map, take } from 'rxjs/operators';
 import {
   GroupRegistryCancelGroupAction,
   GroupRegistryEditGroupAction
diff --git a/src/app/core/resource-policy/resource-policy.service.spec.ts b/src/app/core/resource-policy/resource-policy.service.spec.ts
index 357a9ec659..1038fffc35 100644
--- a/src/app/core/resource-policy/resource-policy.service.spec.ts
+++ b/src/app/core/resource-policy/resource-policy.service.spec.ts
@@ -15,7 +15,7 @@ import { ActionType } from './models/action-type.model';
 import { RequestParam } from '../cache/models/request-param.model';
 import { PageInfo } from '../shared/page-info.model';
 import { buildPaginatedList } from '../data/paginated-list.model';
-import { createPendingRemoteDataObject, createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { RestResponse } from '../cache/response.models';
 import { RequestEntry } from '../data/request-entry.model';
 import { FindListOptions } from '../data/find-list-options.model';
@@ -349,8 +349,6 @@ describe('ResourcePolicyService', () => {
   });
 
   describe('updateTarget', () => {
-    let buildFromRequestUUIDAndAwaitSpy;
-
     beforeEach(() => {
       scheduler.schedule(() => service.create(resourcePolicy, resourceUUID, epersonUUID));
     });
diff --git a/src/app/core/resource-policy/resource-policy.service.ts b/src/app/core/resource-policy/resource-policy.service.ts
index 615a9470d9..f980def704 100644
--- a/src/app/core/resource-policy/resource-policy.service.ts
+++ b/src/app/core/resource-policy/resource-policy.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 
 import { Store } from '@ngrx/store';
-import { AsyncSubject, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { dataService } from '../cache/builders/build-decorators';
 
@@ -23,7 +23,7 @@ import { PaginatedList } from '../data/paginated-list.model';
 import { ActionType } from './models/action-type.model';
 import { RequestParam } from '../cache/models/request-param.model';
 import { isNotEmpty } from '../../shared/empty.util';
-import { filter, first, map, switchMap } from 'rxjs/operators';
+import { first, map } from 'rxjs/operators';
 import { NoContent } from '../shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 import { CoreState } from '../core-state.model';

From 24189c4ce0c0403c98ed7ea1e2a43034097c3056 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 8 Sep 2022 14:53:22 +0200
Subject: [PATCH 24/73] 94310: Track search with service method instead of
 tracking component

---
 .../core/shared/search/search.service.spec.ts |  3 ++
 src/app/core/shared/search/search.service.ts  | 37 ++++++++++++++++++-
 .../search-page/search-page.component.html    |  3 +-
 src/app/shared/search/search.component.ts     | 14 ++++++-
 4 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/src/app/core/shared/search/search.service.spec.ts b/src/app/core/shared/search/search.service.spec.ts
index f9b768655e..1b5717ab4b 100644
--- a/src/app/core/shared/search/search.service.spec.ts
+++ b/src/app/core/shared/search/search.service.spec.ts
@@ -25,6 +25,7 @@ import { SearchObjects } from '../../../shared/search/models/search-objects.mode
 import { PaginationService } from '../../pagination/pagination.service';
 import { SearchConfigurationService } from './search-configuration.service';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { Angulartics2 } from 'angulartics2';
 
 @Component({ template: '' })
 class DummyComponent {
@@ -57,6 +58,7 @@ describe('SearchService', () => {
           { provide: DSpaceObjectDataService, useValue: {} },
           { provide: PaginationService, useValue: {} },
           { provide: SearchConfigurationService, useValue: searchConfigService },
+          { provide: Angulartics2, useValue: {} },
           SearchService
         ],
       });
@@ -124,6 +126,7 @@ describe('SearchService', () => {
           { provide: DSpaceObjectDataService, useValue: {} },
           { provide: PaginationService, useValue: paginationService },
           { provide: SearchConfigurationService, useValue: searchConfigService },
+          { provide: Angulartics2, useValue: {} },
           SearchService
         ],
       });
diff --git a/src/app/core/shared/search/search.service.ts b/src/app/core/shared/search/search.service.ts
index f70416594d..47ece4f289 100644
--- a/src/app/core/shared/search/search.service.ts
+++ b/src/app/core/shared/search/search.service.ts
@@ -43,6 +43,7 @@ import { ObjectCacheService } from '../../cache/object-cache.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { HttpClient } from '@angular/common/http';
 import { DSOChangeAnalyzer } from '../../data/dso-change-analyzer.service';
+import { Angulartics2 } from 'angulartics2';
 
 /* tslint:disable:max-classes-per-file */
 /**
@@ -124,7 +125,8 @@ export class SearchService implements OnDestroy {
               private communityService: CommunityDataService,
               private dspaceObjectService: DSpaceObjectDataService,
               private paginationService: PaginationService,
-              private searchConfigurationService: SearchConfigurationService
+              private searchConfigurationService: SearchConfigurationService,
+              private angulartics2: Angulartics2,
   ) {
     this.searchDataService = new DataServiceImpl(
       undefined,
@@ -134,7 +136,7 @@ export class SearchService implements OnDestroy {
       undefined,
       undefined,
       undefined,
-      undefined
+      undefined,
     );
   }
 
@@ -442,6 +444,37 @@ export class SearchService implements OnDestroy {
     return this.rdb.buildFromHref(href$);
   }
 
+  /**
+   * Send search event to rest api using angularitics
+   * @param config              Paginated search options used
+   * @param searchQueryResponse The response objects of the performed search
+   */
+  trackSearch(config: PaginatedSearchOptions, searchQueryResponse: SearchObjects<DSpaceObject>) {
+    const filters: { filter: string, operator: string, value: string, label: string; }[] = [];
+    const appliedFilters = searchQueryResponse.appliedFilters || [];
+    for (let i = 0, filtersLength = appliedFilters.length; i < filtersLength; i++) {
+      const appliedFilter = appliedFilters[i];
+      filters.push(appliedFilter);
+    }
+    this.angulartics2.eventTrack.next({
+      action: 'search',
+      properties: {
+        searchOptions: config,
+        page: {
+          size: config.pagination.size, // same as searchQueryResponse.page.elementsPerPage
+          totalElements: searchQueryResponse.pageInfo.totalElements,
+          totalPages: searchQueryResponse.pageInfo.totalPages,
+          number: config.pagination.currentPage, // same as searchQueryResponse.page.currentPage
+        },
+        sort: {
+          by: config.sort.field,
+          order: config.sort.direction
+        },
+        filters: filters,
+      },
+    });
+  }
+
   /**
    * @returns {string} The base path to the search page
    */
diff --git a/src/app/search-page/search-page.component.html b/src/app/search-page/search-page.component.html
index 5143d22809..2b2d4fab33 100644
--- a/src/app/search-page/search-page.component.html
+++ b/src/app/search-page/search-page.component.html
@@ -1,2 +1 @@
-<ds-search></ds-search>
-<ds-search-tracker></ds-search-tracker>
+<ds-search [trackStatistics]="true"></ds-search>
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index c017a5065b..cc242992b2 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -134,6 +134,11 @@ export class SearchComponent implements OnInit {
    */
   @Input() viewModeList: ViewMode[];
 
+  /**
+   * Whether or not to track search statistics by sending updates to the rest api
+   */
+  @Input() trackStatistics = false;
+
   /**
    * The current configuration used during the search
    */
@@ -353,8 +358,13 @@ export class SearchComponent implements OnInit {
       followLink<Item>('thumbnail', { isOptional: true })
     ).pipe(getFirstCompletedRemoteData())
       .subscribe((results: RemoteData<SearchObjects<DSpaceObject>>) => {
-        if (results.hasSucceeded && results.payload?.page?.length > 0) {
-          this.resultFound.emit(results.payload);
+        if (results.hasSucceeded) {
+          if (this.trackStatistics) {
+            this.service.trackSearch(searchOptions, results.payload);
+          }
+          if (results.payload?.page?.length > 0) {
+            this.resultFound.emit(results.payload);
+          }
         }
         this.resultsRD$.next(results);
       });

From 580986adae27c26f4963caeb24ccb1bfd88e717b Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Fri, 9 Sep 2022 10:14:43 -0700
Subject: [PATCH 25/73] Updates to thumbnail and placeholder fonts

---
 ...-search-result-list-element.component.html | 33 ++++++++----
 ...ue-search-result-list-element.component.ts | 12 +++++
 ...-search-result-list-element.component.html | 33 ++++++++----
 ...me-search-result-list-element.component.ts | 12 +++++
 ...-search-result-list-element.component.html | 29 +++++++----
 ...al-search-result-list-element.component.ts | 12 +++++
 ...-search-result-list-element.component.html | 34 +++++++++----
 ...it-search-result-list-element.component.ts | 12 +++++
 ...-search-result-list-element.component.html | 33 ++++++++----
 ...on-search-result-list-element.component.ts | 11 ++++
 ...-search-result-list-element.component.html | 50 ++++++++++++-------
 ...ct-search-result-list-element.component.ts | 12 +++++
 .../object-collection.component.html          |  2 +-
 .../object-collection.component.scss          |  5 ++
 .../object-collection.component.ts            | 34 ++++++++++++-
 ...-search-result-list-element.component.html | 13 +++--
 ...on-search-result-list-element.component.ts | 15 +++++-
 ...-search-result-list-element.component.html | 13 +++--
 ...ty-search-result-list-element.component.ts | 10 ++++
 ...-search-result-list-element.component.html |  4 +-
 .../pagination/pagination.component.scss      |  2 +-
 src/app/thumbnail/thumbnail.component.html    |  2 +-
 src/app/thumbnail/thumbnail.component.ts      |  2 +
 src/styles/_global-styles.scss                | 19 +++++++
 24 files changed, 319 insertions(+), 85 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index 6d88c9761b..9b47a7fb7a 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -1,12 +1,23 @@
-<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-<ds-truncatable [id]="dso.id">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
-            [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-            [innerHTML]="dsoTitle"></a>
-    <span *ngIf="linkType == linkTypes.None"
-          class="lead item-list-title dont-break-out"
-          [innerHTML]="dsoTitle"></span>
-    <span class="text-muted">
+<div class="row">
+  <div *ngIf="showThumbnails" class="col-md-2">
+    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
+       rel="noopener noreferrer"
+       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
+      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+      </ds-thumbnail>
+    </a>
+  </div>
+  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+    <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+    <ds-truncatable [id]="dso.id">
+      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
+         rel="noopener noreferrer"
+         [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
+         [innerHTML]="dsoTitle"></a>
+      <span *ngIf="linkType == linkTypes.None"
+            class="lead item-list-title dont-break-out"
+            [innerHTML]="dsoTitle"></span>
+      <span class="text-muted">
     <ds-truncatable-part [id]="dso.id" [minLines]="1">
             <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
                   class="item-list-journal-issues">
@@ -22,4 +33,6 @@
             </span>
         </ds-truncatable-part>
   </span>
-</ds-truncatable>
+    </ds-truncatable>
+  </div>
+</div>
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
index dcb54b8d39..01f8c73ffc 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+import { environment } from '../../../../../../environments/environment';
 
 @listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement)
 @Component({
@@ -13,4 +14,15 @@ import { ItemSearchResultListElementComponent } from '../../../../../shared/obje
  * The component for displaying a list element for an item search result of the type Journal Issue
  */
 export class JournalIssueSearchResultListElementComponent extends ItemSearchResultListElementComponent {
+
+  /**
+   * Display thumbnails if required by configuration
+   */
+  showThumbnails: boolean;
+
+  ngOnInit(): void {
+    super.ngOnInit();
+    this.showThumbnails = environment.showItemThumbnails;
+  }
+
 }
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
index b7cb645e31..04991cb6f0 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
@@ -1,12 +1,23 @@
-<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-<ds-truncatable [id]="dso.id">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
-            [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-            [innerHTML]="dsoTitle"></a>
-    <span *ngIf="linkType == linkTypes.None"
-          class="lead item-list-title dont-break-out"
-          [innerHTML]="dsoTitle"></span>
-    <span class="text-muted">
+<div class="row">
+  <div *ngIf="showThumbnails" class="col-md-2">
+    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
+       rel="noopener noreferrer"
+       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
+      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+      </ds-thumbnail>
+    </a>
+  </div>
+  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+    <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+    <ds-truncatable [id]="dso.id">
+      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
+         rel="noopener noreferrer"
+         [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
+         [innerHTML]="dsoTitle"></a>
+      <span *ngIf="linkType == linkTypes.None"
+            class="lead item-list-title dont-break-out"
+            [innerHTML]="dsoTitle"></span>
+      <span class="text-muted">
     <ds-truncatable-part [id]="dso.id" [minLines]="1">
             <span *ngIf="dso.allMetadata(['journal.title']).length > 0"
                   class="item-list-journal-volumes">
@@ -22,4 +33,6 @@
             </span>
         </ds-truncatable-part>
   </span>
-</ds-truncatable>
+    </ds-truncatable>
+  </div>
+</div>
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
index 7cba2ef591..c88a5dccfe 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+import { environment } from '../../../../../../environments/environment';
 
 @listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement)
 @Component({
@@ -13,4 +14,15 @@ import { ItemSearchResultListElementComponent } from '../../../../../shared/obje
  * The component for displaying a list element for an item search result of the type Journal Volume
  */
 export class JournalVolumeSearchResultListElementComponent extends ItemSearchResultListElementComponent {
+
+  /**
+   * Display thumbnails if required by configuration
+   */
+  showThumbnails: boolean;
+
+  ngOnInit(): void {
+    super.ngOnInit();
+    this.showThumbnails = environment.showItemThumbnails;
+  }
+
 }
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
index 988fb2d4b5..58ad5ab364 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
@@ -1,12 +1,21 @@
-<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-<ds-truncatable [id]="dso.id">
+<div class="row">
+  <div *ngIf="showThumbnails" class="col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
-            [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-            [innerHTML]="dsoTitle"></a>
-    <span *ngIf="linkType == linkTypes.None"
-          class="lead item-list-title dont-break-out"
-          [innerHTML]="dsoTitle"></span>
-    <span class="text-muted">
+       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
+      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+      </ds-thumbnail>
+    </a>
+  </div>
+  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+    <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+    <ds-truncatable [id]="dso.id">
+      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
+         [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
+         [innerHTML]="dsoTitle"></a>
+      <span *ngIf="linkType == linkTypes.None"
+            class="lead item-list-title dont-break-out"
+            [innerHTML]="dsoTitle"></span>
+      <span class="text-muted">
     <ds-truncatable-part [id]="dso.id" [minLines]="1">
             <span *ngIf="dso.allMetadata(['creativeworkseries.issn']).length > 0"
                   class="item-list-journals">
@@ -16,4 +25,6 @@
             </span>
         </ds-truncatable-part>
   </span>
-</ds-truncatable>
+    </ds-truncatable>
+  </div>
+</div>
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
index 85460b47e4..dc3a592ee0 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+import { environment } from '../../../../../../environments/environment';
 
 @listableObjectComponent('JournalSearchResult', ViewMode.ListElement)
 @Component({
@@ -13,4 +14,15 @@ import { ItemSearchResultListElementComponent } from '../../../../../shared/obje
  * The component for displaying a list element for an item search result of the type Journal
  */
 export class JournalSearchResultListElementComponent extends ItemSearchResultListElementComponent {
+
+  /**
+   * Display thumbnails if required by configuration
+   */
+  showThumbnails: boolean;
+
+  ngOnInit(): void {
+    super.ngOnInit();
+    this.showThumbnails = environment.showItemThumbnails;
+  }
+
 }
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
index 40f837bcd1..fd33b688c0 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
@@ -1,17 +1,29 @@
-<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-<ds-truncatable [id]="dso.id">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
-       [routerLink]="[itemPageRoute]" class="lead"
-       [innerHTML]="firstMetadataValue('organization.legalName')"></a>
-    <span *ngIf="linkType == linkTypes.None"
-          class="lead"
-          [innerHTML]="firstMetadataValue('organization.legalName')"></span>
-    <span class="text-muted">
+<div class="row">
+  <div *ngIf="showThumbnails" class="col-md-2">
+    <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+                  [defaultImage]="'assets/images/orgunit-placeholder.svg'"
+                  [alt]="'thumbnail.orgunit.alt'"
+                  [placeholder]="'thumbnail.orgunit.placeholder'">
+    </ds-thumbnail>
+  </div>
+  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+    <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+    <ds-truncatable [id]="dso.id">
+      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
+         rel="noopener noreferrer"
+         [routerLink]="[itemPageRoute]" class="lead"
+         [innerHTML]="firstMetadataValue('organization.legalName')"></a>
+      <span *ngIf="linkType == linkTypes.None"
+            class="lead"
+            [innerHTML]="firstMetadataValue('organization.legalName')"></span>
+      <span class="text-muted">
       <span *ngIf="dso.allMetadata(['dc.description']).length > 0"
             class="item-list-org-unit-description">
             <ds-truncatable-part [id]="dso.id" [minLines]="3"><span
-                  [innerHTML]="firstMetadataValue('dc.description')"></span>
+              [innerHTML]="firstMetadataValue('dc.description')"></span>
             </ds-truncatable-part>
       </span>
   </span>
-</ds-truncatable>
+    </ds-truncatable>
+  </div>
+</div>
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
index 2165b7d94d..8aa536baff 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+import { environment } from '../../../../../../environments/environment';
 
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement)
 @Component({
@@ -13,4 +14,15 @@ import { ItemSearchResultListElementComponent } from '../../../../../shared/obje
  * The component for displaying a list element for an item search result of the type Organisation Unit
  */
 export class OrgUnitSearchResultListElementComponent extends ItemSearchResultListElementComponent {
+
+  /**
+   * Display thumbnail if required by configuration
+   */
+  showThumbnails: boolean;
+
+  ngOnInit(): void {
+    super.ngOnInit();
+    this.showThumbnails = environment.showItemThumbnails;
+  }
+
 }
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
index 6d9cfe10c4..00446a5a78 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
@@ -1,12 +1,22 @@
-<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-<ds-truncatable [id]="dso.id">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
-       [routerLink]="[itemPageRoute]" class="lead"
-       [innerHTML]="name"></a>
-    <span *ngIf="linkType == linkTypes.None"
-          class="lead"
-          [innerHTML]="name"></span>
-    <span class="text-muted">
+<div class="row">
+  <div *ngIf="showThumbnails" class="col-md-2">
+    <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+                  [defaultImage]="'assets/images/person-placeholder.svg'"
+                  [alt]="'thumbnail.person.alt'"
+                  [placeholder]="'thumbnail.person.placeholder'">
+    </ds-thumbnail>
+  </div>
+  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+    <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+    <ds-truncatable [id]="dso.id">
+      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
+         rel="noopener noreferrer"
+         [routerLink]="[itemPageRoute]" class="lead"
+         [innerHTML]="name"></a>
+      <span *ngIf="linkType == linkTypes.None"
+            class="lead"
+            [innerHTML]="name"></span>
+      <span class="text-muted">
     <ds-truncatable-part [id]="dso.id" [minLines]="1">
             <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
                   class="item-list-job-title">
@@ -16,4 +26,7 @@
             </span>
         </ds-truncatable-part>
   </span>
-</ds-truncatable>
+    </ds-truncatable>
+  </div>
+</div>
+
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
index 3b222ce27c..28383ba72b 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
@@ -8,6 +8,7 @@ import {
 } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { environment } from '../../../../../../environments/environment';
 
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement)
 @Component({
@@ -24,6 +25,16 @@ export class PersonSearchResultListElementComponent extends ItemSearchResultList
     super(truncatableService, dsoNameService);
   }
 
+  /**
+   * Display thumbnail if required by configuration
+   */
+  showThumbnails: boolean;
+
+  ngOnInit(): void {
+    super.ngOnInit();
+    this.showThumbnails = environment.showItemThumbnails;
+  }
+
   /**
    * Return the person name
    */
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
index d711ad7c18..80bbc14bf0 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
@@ -1,19 +1,31 @@
-<ds-truncatable [id]="dso.id">
-    <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
-       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-       [innerHTML]="dsoTitle"></a>
-    <span *ngIf="linkType == linkTypes.None"
-          class="lead item-list-title dont-break-out"
-          [innerHTML]="dsoTitle"></span>
-    <!--<span class="text-muted">-->
-    <!--<ds-truncatable-part [id]="dso.id" [minLines]="1">-->
-    <!--<span *ngIf="dso.allMetadata(['project.identifier.status']).length > 0"-->
-    <!--class="item-list-status">-->
-    <!--<span *ngFor="let value of allMetadataValues(['project.identifier.status']); let last=last;">-->
-    <!--<span [innerHTML]="value"><span [innerHTML]="value"></span></span>-->
-    <!--</span>-->
-    <!--</span>-->
-    <!--</ds-truncatable-part>-->
-    <!--</span>-->
-</ds-truncatable>
+<div class="row">
+  <div *ngIf="showThumbnails" class="col-md-2">
+    <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+                  [defaultImage]="'assets/images/project-placeholder.svg'"
+                  [alt]="'thumbnail.project.alt'"
+                  [placeholder]="'thumbnail.project.placeholder'">
+    </ds-thumbnail>
+  </div>
+  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+    <ds-truncatable [id]="dso.id">
+      <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
+         rel="noopener noreferrer"
+         [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
+         [innerHTML]="dsoTitle"></a>
+      <span *ngIf="linkType == linkTypes.None"
+            class="lead item-list-title dont-break-out"
+            [innerHTML]="dsoTitle"></span>
+      <!--<span class="text-muted">-->
+      <!--<ds-truncatable-part [id]="dso.id" [minLines]="1">-->
+      <!--<span *ngIf="dso.allMetadata(['project.identifier.status']).length > 0"-->
+      <!--class="item-list-status">-->
+      <!--<span *ngFor="let value of allMetadataValues(['project.identifier.status']); let last=last;">-->
+      <!--<span [innerHTML]="value"><span [innerHTML]="value"></span></span>-->
+      <!--</span>-->
+      <!--</span>-->
+      <!--</ds-truncatable-part>-->
+      <!--</span>-->
+    </ds-truncatable>
+  </div>
+</div>
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
index 6ad8c0fcaa..b0b727a8bf 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+import { environment } from '../../../../../../environments/environment';
 
 @listableObjectComponent('ProjectSearchResult', ViewMode.ListElement)
 @Component({
@@ -13,4 +14,15 @@ import { ItemSearchResultListElementComponent } from '../../../../../shared/obje
  * The component for displaying a list element for an item search result of the type Project
  */
 export class ProjectSearchResultListElementComponent extends ItemSearchResultListElementComponent {
+
+  /**
+   * Display thumbnail if required by configuration
+   */
+  showThumbnails: boolean;
+
+  ngOnInit(): void {
+    super.ngOnInit();
+    this.showThumbnails = environment.showItemThumbnails;
+  }
+
 }
diff --git a/src/app/shared/object-collection/object-collection.component.html b/src/app/shared/object-collection/object-collection.component.html
index 999ae9a120..2b0df677d6 100644
--- a/src/app/shared/object-collection/object-collection.component.html
+++ b/src/app/shared/object-collection/object-collection.component.html
@@ -1,4 +1,4 @@
-<ds-object-list [config]="config"
+<ds-object-list [ngClass]="placeholderFontClass" #objectList [config]="config"
                 [sortConfig]="sortConfig"
                 [objects]="objects"
                 [hasBorder]="hasBorder"
diff --git a/src/app/shared/object-collection/object-collection.component.scss b/src/app/shared/object-collection/object-collection.component.scss
index e69de29bb2..4a0c9cbe02 100644
--- a/src/app/shared/object-collection/object-collection.component.scss
+++ b/src/app/shared/object-collection/object-collection.component.scss
@@ -0,0 +1,5 @@
+:host {
+  display:block;
+}
+
+
diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts
index f2706f1a4c..80518442f5 100644
--- a/src/app/shared/object-collection/object-collection.component.ts
+++ b/src/app/shared/object-collection/object-collection.component.ts
@@ -1,4 +1,11 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component, ElementRef,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { Observable } from 'rxjs';
@@ -147,6 +154,12 @@ export class ObjectCollectionComponent implements OnInit {
    */
   viewModeEnum = ViewMode;
 
+  /**
+   * Placeholder class (defined in global-styles)
+   */
+  placeholderFontClass: string;
+
+
   ngOnInit(): void {
     this.currentMode$ = this.route
       .queryParams
@@ -154,6 +167,7 @@ export class ObjectCollectionComponent implements OnInit {
         map((params) => isEmpty(params?.view) ? ViewMode.ListElement : params.view),
         distinctUntilChanged()
       );
+    this.setPlaceHolderFontSize();
   }
 
   /**
@@ -167,7 +181,8 @@ export class ObjectCollectionComponent implements OnInit {
   constructor(
     private cdRef: ChangeDetectorRef,
     private route: ActivatedRoute,
-    private router: Router) {
+    private router: Router,
+    private elementRef: ElementRef) {
   }
 
   /**
@@ -221,4 +236,19 @@ export class ObjectCollectionComponent implements OnInit {
       this.next.emit(true);
   }
 
+  /**
+   * Sets the class to be used for the "no thumbnail"
+   * placeholder font size.
+   */
+  setPlaceHolderFontSize() {
+    const width = this.elementRef.nativeElement.offsetWidth;
+    if (width < 750) {
+      this.placeholderFontClass = "thumb-font-1";
+    } else if (width < 1000) {
+      this.placeholderFontClass = "thumb-font-2";
+    } else {
+      this.placeholderFontClass = "thumb-font-3";
+    }
+  }
+
 }
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
index c98003cd1d..55c377b749 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
@@ -1,4 +1,9 @@
-<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-<a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/collections/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
-<span *ngIf="linkType == linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
-<div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
+<div class="row">
+  <div *ngIf="showThumbnails" class="offset-md-2"></div>
+  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+    <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/collections/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
+    <span *ngIf="linkType == linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
+    <div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
+  </div>
+</div>
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
index 9e09068ddf..cf955308ed 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
@@ -4,6 +4,7 @@ import { Collection } from '../../../../core/shared/collection.model';
 import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { environment } from '../../../../../environments/environment';
 
 @Component({
   selector: 'ds-collection-search-result-list-element',
@@ -14,4 +15,16 @@ import { listableObjectComponent } from '../../../object-collection/shared/lista
  * Component representing a collection search result in list view
  */
 @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement)
-export class CollectionSearchResultListElementComponent extends SearchResultListElementComponent<CollectionSearchResult, Collection> {}
+export class CollectionSearchResultListElementComponent extends SearchResultListElementComponent<CollectionSearchResult, Collection> {
+
+  /**
+   * Display thumbnails if required by configuration
+   */
+  showThumbnails: boolean;
+
+  ngOnInit(): void {
+    super.ngOnInit();
+    this.showThumbnails = environment.showItemThumbnails;
+  }
+
+}
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
index e0f0319ffc..ba5d5ebc23 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
@@ -1,4 +1,9 @@
-<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-<a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"  [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
-<span *ngIf="linkType == linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
-<div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
+<div class="row">
+  <div *ngIf="showThumbnails" class="offset-md-2"></div>
+  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+    <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"  [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
+    <span *ngIf="linkType == linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
+    <div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
+  </div>
+</div>
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
index b2fd695b39..e7613fdeae 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
@@ -4,6 +4,7 @@ import { Community } from '../../../../core/shared/community.model';
 import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { environment } from '../../../../../environments/environment';
 
 @Component({
   selector: 'ds-community-search-result-list-element',
@@ -15,5 +16,14 @@ import { listableObjectComponent } from '../../../object-collection/shared/lista
  */
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement)
 export class CommunitySearchResultListElementComponent extends SearchResultListElementComponent<CommunitySearchResult, Community> {
+  /**
+   * Display thumbnails if required by configuration
+   */
+  showThumbnails: boolean;
 
+
+  ngOnInit(): void {
+    super.ngOnInit();
+    this.showThumbnails = environment.showItemThumbnails;
+  }
 }
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index b3889e4f75..fb0429a8b9 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -1,6 +1,6 @@
 <div class="row">
-  <div class="col-md-2">
-    <a *ngIf="linkType != linkTypes.None && showThumbnails" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
+  <div *ngIf="showThumbnails" class="col-md-2">
+    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
        [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
     <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
     </ds-thumbnail>
diff --git a/src/app/shared/pagination/pagination.component.scss b/src/app/shared/pagination/pagination.component.scss
index 755d916faa..dac826dc6d 100644
--- a/src/app/shared/pagination/pagination.component.scss
+++ b/src/app/shared/pagination/pagination.component.scss
@@ -5,4 +5,4 @@
     .dropdown-item {
         padding-left: 20px;
     }
-}
\ No newline at end of file
+}
diff --git a/src/app/thumbnail/thumbnail.component.html b/src/app/thumbnail/thumbnail.component.html
index aedfd95c5a..e73ad77ce5 100644
--- a/src/app/thumbnail/thumbnail.component.html
+++ b/src/app/thumbnail/thumbnail.component.html
@@ -7,7 +7,7 @@
          [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()">
     <div *ngIf="src === null" class="thumbnail-content outer">
       <div class="inner">
-        <div class="thumbnail-placeholder w-100 h-100 p-3 lead">{{ placeholder | translate }}</div>
+        <div class="thumbnail-placeholder w-100 h-100 lead">{{ placeholder | translate }}</div>
       </div>
     </div>
   </ng-template>
diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts
index 3e122cde78..b47beb22d4 100644
--- a/src/app/thumbnail/thumbnail.component.ts
+++ b/src/app/thumbnail/thumbnail.component.ts
@@ -14,6 +14,7 @@ import { RemoteData } from '../core/data/remote-data';
   templateUrl: './thumbnail.component.html',
 })
 export class ThumbnailComponent implements OnChanges {
+
   /**
    * The thumbnail Bitstream
    */
@@ -90,4 +91,5 @@ export class ThumbnailComponent implements OnChanges {
       this.src = null;
     }
   }
+
 }
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index 89d1d76e9a..b9a9e2f8e4 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -138,3 +138,22 @@ ds-dynamic-form-control-container.d-none {
 .btn-dark {
   background-color: var(--ds-admin-sidebar-bg);
 }
+/* The font sizes used in "no thumbnail" placeholder */
+.thumb-font-1 {
+  .thumbnail-placeholder {
+    font-size: 0.7rem !important;
+    visibility: inherit;
+  }
+}
+.thumb-font-2 {
+  .thumbnail-placeholder {
+    font-size: 0.9rem !important;
+    visibility: inherit;
+  }
+}
+.thumb-font-3 {
+  .thumbnail-placeholder {
+    font-size: 1.25rem !important;
+    visibility: inherit;
+  }
+}

From ccb4c0794c8215d8384581ee5b9cdf0a9f55e7d0 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Fri, 9 Sep 2022 10:34:17 -0700
Subject: [PATCH 26/73] Updated configuration.

---
 config/config.example.yml                                  | 5 ++---
 .../browse-by-metadata-page.component.ts                   | 2 +-
 .../journal-issue-search-result-list-element.component.ts  | 2 +-
 .../journal-volume-search-result-list-element.component.ts | 2 +-
 .../journal-search-result-list-element.component.ts        | 2 +-
 .../org-unit-search-result-list-element.component.ts       | 2 +-
 .../person/person-search-result-list-element.component.ts  | 2 +-
 .../project-search-result-list-element.component.ts        | 2 +-
 .../collection-search-result-list-element.component.ts     | 2 +-
 .../community-search-result-list-element.component.ts      | 2 +-
 .../item/item-search-result-list-element.component.ts      | 2 +-
 src/config/app-config.interface.ts                         | 1 -
 src/config/browse-by-config.interface.ts                   | 5 +++++
 src/config/default-app-config.ts                           | 7 +++----
 src/environments/environment.test.ts                       | 4 +++-
 15 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 825a0f5bfa..50da56a475 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -168,9 +168,8 @@ browseBy:
   fiveYearLimit: 30
   # The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
   defaultLowerLimit: 1900
-
-# If true, thumbnail images for items will be added to search and browse result lists.
-showItemThumbnails: false
+  # If true, thumbnail images for items will be added to search and browse result lists.
+  showItemThumbnails: true
 
 # Item Config
 item:
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
index bf7bf88a5e..0bcd6115a6 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -123,7 +123,7 @@ export class BrowseByMetadataPageComponent implements OnInit {
                      protected dsoService: DSpaceObjectDataService,
                      protected paginationService: PaginationService,
                      protected router: Router) {
-    this.embedThumbnail = environment.showItemThumbnails;
+    this.embedThumbnail = environment.browseBy.showItemThumbnails;
   }
 
   ngOnInit(): void {
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
index 01f8c73ffc..bff374f064 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
@@ -22,7 +22,7 @@ export class JournalIssueSearchResultListElementComponent extends ItemSearchResu
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = environment.showItemThumbnails;
+    this.showThumbnails = environment.browseBy.showItemThumbnails;
   }
 
 }
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
index c88a5dccfe..46ab0ac20c 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
@@ -22,7 +22,7 @@ export class JournalVolumeSearchResultListElementComponent extends ItemSearchRes
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = environment.showItemThumbnails;
+    this.showThumbnails = environment.browseBy.showItemThumbnails;
   }
 
 }
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
index dc3a592ee0..073e22b177 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
@@ -22,7 +22,7 @@ export class JournalSearchResultListElementComponent extends ItemSearchResultLis
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = environment.showItemThumbnails;
+    this.showThumbnails = environment.browseBy.showItemThumbnails;
   }
 
 }
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
index 8aa536baff..ade0534d8d 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
@@ -22,7 +22,7 @@ export class OrgUnitSearchResultListElementComponent extends ItemSearchResultLis
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = environment.showItemThumbnails;
+    this.showThumbnails = environment.browseBy.showItemThumbnails;
   }
 
 }
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
index 28383ba72b..32ab1e6695 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
@@ -32,7 +32,7 @@ export class PersonSearchResultListElementComponent extends ItemSearchResultList
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = environment.showItemThumbnails;
+    this.showThumbnails = environment.browseBy.showItemThumbnails;
   }
 
   /**
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
index b0b727a8bf..ff88570c1d 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
@@ -22,7 +22,7 @@ export class ProjectSearchResultListElementComponent extends ItemSearchResultLis
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = environment.showItemThumbnails;
+    this.showThumbnails = environment.browseBy.showItemThumbnails;
   }
 
 }
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
index cf955308ed..fdc6c4dfdc 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
@@ -24,7 +24,7 @@ export class CollectionSearchResultListElementComponent extends SearchResultList
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = environment.showItemThumbnails;
+    this.showThumbnails = environment.browseBy.showItemThumbnails;
   }
 
 }
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
index e7613fdeae..32ea14aa43 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
@@ -24,6 +24,6 @@ export class CommunitySearchResultListElementComponent extends SearchResultListE
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = environment.showItemThumbnails;
+    this.showThumbnails = environment.browseBy.showItemThumbnails;
   }
 }
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index 46c3efd126..4d2ea05e6c 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -30,7 +30,7 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = environment.showItemThumbnails;
+    this.showThumbnails = environment.browseBy.showItemThumbnails;
     this.itemPageRoute = getItemPageRoute(this.dso);
   }
 }
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index 515de9613f..cd9ef103ae 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -31,7 +31,6 @@ interface AppConfig extends Config {
   defaultLanguage: string;
   languages: LangConfig[];
   browseBy: BrowseByConfig;
-  showItemThumbnails: boolean;
   item: ItemConfig;
   collection: CollectionPageConfig;
   themes: ThemeConfig[];
diff --git a/src/config/browse-by-config.interface.ts b/src/config/browse-by-config.interface.ts
index 6adba66b92..3ce12f3c50 100644
--- a/src/config/browse-by-config.interface.ts
+++ b/src/config/browse-by-config.interface.ts
@@ -18,4 +18,9 @@ export interface BrowseByConfig extends Config {
    * The absolute lowest year to display in the dropdown when no lowest date can be found for all items
    */
   defaultLowerLimit: number;
+
+  /**
+   *  If true, thumbnail images for items will be added to search and browse result lists.
+   */
+  showItemThumbnails: boolean;
 }
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 8c4731d3b2..356094c9bf 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -205,12 +205,11 @@ export class DefaultAppConfig implements AppConfig {
     // Limit for years to display using jumps of five years (current year - fiveYearLimit)
     fiveYearLimit: 30,
     // The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
-    defaultLowerLimit: 1900
+    defaultLowerLimit: 1900,
+    // Whether to add item thumbnail images to browse and search result lists.
+    showItemThumbnails: true
   };
 
-  // Whether to add item thumbnail images to browse and search result lists.
-  showItemThumbnails: false;
-
   // Item Config
   item: ItemConfig = {
     edit: {
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index edf986b88f..44b4af5380 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -199,8 +199,10 @@ export const environment: BuildConfig = {
     fiveYearLimit: 30,
     // The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
     defaultLowerLimit: 1900,
+    // Whether to add item thumbnail images to browse and search result lists.
+    showItemThumbnails: true
   },
-  showItemThumbnails: false,
+
   item: {
     edit: {
       undoTimeout: 10000 // 10 seconds

From 9218c0545f4444cdfd76f5465d360e1a1cc74f9e Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Fri, 9 Sep 2022 13:44:25 -0700
Subject: [PATCH 27/73] Added specs.

---
 .../browse-by-metadata-page.component.spec.ts |  9 +++-
 ...arch-result-list-element.component.spec.ts | 54 +++++++++++++++++++
 ...arch-result-list-element.component.spec.ts | 52 ++++++++++++++++++
 ...arch-result-list-element.component.spec.ts | 53 ++++++++++++++++++
 ...arch-result-list-element.component.spec.ts | 53 ++++++++++++++++++
 ...arch-result-list-element.component.spec.ts | 53 ++++++++++++++++++
 ...arch-result-list-element.component.spec.ts | 54 +++++++++++++++++++
 .../object-collection.component.spec.ts       |  4 ++
 .../object-collection.component.ts            |  6 +--
 ...arch-result-list-element.component.spec.ts | 53 ++++++++++++++++++
 10 files changed, 387 insertions(+), 4 deletions(-)

diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
index 60d2fa549b..623537484b 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
@@ -25,6 +25,7 @@ import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.util
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import { environment } from '../../../environments/environment';
 
 describe('BrowseByMetadataPageComponent', () => {
   let comp: BrowseByMetadataPageComponent;
@@ -104,6 +105,7 @@ describe('BrowseByMetadataPageComponent', () => {
   }));
 
   beforeEach(() => {
+    environment.browseBy.showItemThumbnails = true;
     fixture = TestBed.createComponent(BrowseByMetadataPageComponent);
     comp = fixture.componentInstance;
     fixture.detectChanges();
@@ -118,6 +120,10 @@ describe('BrowseByMetadataPageComponent', () => {
     expect(comp.items$).toBeUndefined();
   });
 
+  it('should set embed thumbnail property to true', () => {
+    expect(comp.embedThumbnail).toBeTrue();
+  });
+
   describe('when a value is provided', () => {
     beforeEach(() => {
       const paramsWithValue = {
@@ -152,7 +158,7 @@ describe('BrowseByMetadataPageComponent', () => {
         field: 'fake-field',
       };
 
-      result = browseParamsToOptions(paramsScope, paginationOptions, sortOptions, 'author');
+      result = browseParamsToOptions(paramsScope, paginationOptions, sortOptions, 'author', comp.embedThumbnail);
     });
 
     it('should return BrowseEntrySearchOptions with the correct properties', () => {
@@ -163,6 +169,7 @@ describe('BrowseByMetadataPageComponent', () => {
       expect(result.sort.direction).toEqual(SortDirection.ASC);
       expect(result.sort.field).toEqual('fake-field');
       expect(result.scope).toEqual('fake-scope');
+      expect(result.embedThumbnail).toBeTrue();
     });
   });
 });
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
index b47a767be2..34aa1b43aa 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
@@ -9,6 +9,7 @@ import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { environment } from '../../../../../../environments/environment';
 
 let journalIssueListElementComponent: JournalIssueSearchResultListElementComponent;
 let fixture: ComponentFixture<JournalIssueSearchResultListElementComponent>;
@@ -73,11 +74,28 @@ describe('JournalIssueSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
+    environment.browseBy.showItemThumbnails = true;
     fixture = TestBed.createComponent(JournalIssueSearchResultListElementComponent);
     journalIssueListElementComponent = fixture.componentInstance;
 
   }));
 
+  describe('with environment.browseBy.showItemThumbnails set to true', () => {
+    beforeEach(() => {
+      journalIssueListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+    it('should set showThumbnails to true', () => {
+      expect(journalIssueListElementComponent.showThumbnails).toBeTrue();
+    });
+
+    it('should add thumbnail element', () => {
+      const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
+      expect(thumbnailElement).toBeTruthy();
+    });
+  });
+
+
   describe('When the item has a journal identifier', () => {
     beforeEach(() => {
       journalIssueListElementComponent.object = mockItemWithMetadata;
@@ -126,3 +144,39 @@ describe('JournalIssueSearchResultListElementComponent', () => {
     });
   });
 });
+
+describe('JournalIssueSearchResultListElementComponent', () => {
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [JournalIssueSearchResultListElementComponent, TruncatePipe],
+      providers: [
+        {provide: TruncatableService, useValue: {}},
+        {provide: DSONameService, useClass: DSONameServiceMock}
+      ],
+
+      schemas: [NO_ERRORS_SCHEMA]
+    }).overrideComponent(JournalIssueSearchResultListElementComponent, {
+      set: {changeDetection: ChangeDetectionStrategy.Default}
+    }).compileComponents();
+  }));
+
+  beforeEach(waitForAsync(() => {
+    environment.browseBy.showItemThumbnails = false;
+    fixture = TestBed.createComponent(JournalIssueSearchResultListElementComponent);
+    journalIssueListElementComponent = fixture.componentInstance;
+  }));
+
+  describe('with environment.browseBy.showItemThumbnails set to false', () => {
+    beforeEach(() => {
+
+      journalIssueListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+
+    it('should not add thumbnail element', () => {
+      const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
+      expect(thumbnailElement).toBeFalsy();
+    });
+  });
+});
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
index d03bc29d6b..2b66a39294 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
@@ -9,6 +9,7 @@ import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { environment } from '../../../../../../environments/environment';
 
 let journalVolumeListElementComponent: JournalVolumeSearchResultListElementComponent;
 let fixture: ComponentFixture<JournalVolumeSearchResultListElementComponent>;
@@ -72,11 +73,27 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
+    environment.browseBy.showItemThumbnails = true;
     fixture = TestBed.createComponent(JournalVolumeSearchResultListElementComponent);
     journalVolumeListElementComponent = fixture.componentInstance;
 
   }));
 
+  describe('with environment.browseBy.showItemThumbnails set to true', () => {
+    beforeEach(() => {
+      journalVolumeListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+    it('should set showThumbnails to true', () => {
+      expect(journalVolumeListElementComponent.showThumbnails).toBeTrue();
+    });
+
+    it('should add thumbnail element', () => {
+      const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
+      expect(thumbnailElement).toBeTruthy();
+    });
+  });
+
   describe('When the item has a journal title', () => {
     beforeEach(() => {
       journalVolumeListElementComponent.object = mockItemWithMetadata;
@@ -125,3 +142,38 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
     });
   });
 });
+
+describe('JournalVolumeSearchResultListElementComponent', () => {
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [JournalVolumeSearchResultListElementComponent, TruncatePipe],
+      providers: [
+        {provide: TruncatableService, useValue: {}},
+        {provide: DSONameService, useClass: DSONameServiceMock}
+      ],
+
+      schemas: [NO_ERRORS_SCHEMA]
+    }).overrideComponent(JournalVolumeSearchResultListElementComponent, {
+      set: {changeDetection: ChangeDetectionStrategy.Default}
+    }).compileComponents();
+  }));
+
+  beforeEach(waitForAsync(() => {
+    environment.browseBy.showItemThumbnails = false;
+    fixture = TestBed.createComponent(JournalVolumeSearchResultListElementComponent);
+    journalVolumeListElementComponent = fixture.componentInstance;
+  }));
+
+  describe('with environment.browseBy.showItemThumbnails set to false', () => {
+    beforeEach(() => {
+      journalVolumeListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+
+    it('should not add thumbnail element', () => {
+      const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
+      expect(thumbnailElement).toBeFalsy();
+    });
+  });
+});
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
index 9aca414ec6..ab3fd95bb8 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
@@ -9,6 +9,7 @@ import { TruncatableService } from '../../../../../shared/truncatable/truncatabl
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { environment } from '../../../../../../environments/environment';
 
 let journalListElementComponent: JournalSearchResultListElementComponent;
 let fixture: ComponentFixture<JournalSearchResultListElementComponent>;
@@ -68,11 +69,27 @@ describe('JournalSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
+    environment.browseBy.showItemThumbnails = true;
     fixture = TestBed.createComponent(JournalSearchResultListElementComponent);
     journalListElementComponent = fixture.componentInstance;
 
   }));
 
+  describe('with environment.browseBy.showItemThumbnails set to true', () => {
+    beforeEach(() => {
+      journalListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+    it('should set showThumbnails to true', () => {
+      expect(journalListElementComponent.showThumbnails).toBeTrue();
+    });
+
+    it('should add thumbnail element', () => {
+      const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
+      expect(thumbnailElement).toBeTruthy();
+    });
+  });
+
   describe('When the item has an issn', () => {
     beforeEach(() => {
       journalListElementComponent.object = mockItemWithMetadata;
@@ -97,3 +114,39 @@ describe('JournalSearchResultListElementComponent', () => {
     });
   });
 });
+
+describe('JournalSearchResultListElementComponent', () => {
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [JournalSearchResultListElementComponent, TruncatePipe],
+      providers: [
+        {provide: TruncatableService, useValue: {}},
+        {provide: DSONameService, useClass: DSONameServiceMock}
+      ],
+
+      schemas: [NO_ERRORS_SCHEMA]
+    }).overrideComponent(JournalSearchResultListElementComponent, {
+      set: {changeDetection: ChangeDetectionStrategy.Default}
+    }).compileComponents();
+  }));
+
+  beforeEach(waitForAsync(() => {
+    environment.browseBy.showItemThumbnails = false;
+    fixture = TestBed.createComponent(JournalSearchResultListElementComponent);
+    journalListElementComponent = fixture.componentInstance;
+  }));
+
+  describe('with environment.browseBy.showItemThumbnails set to false', () => {
+    beforeEach(() => {
+
+      journalListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+
+    it('should not add thumbnail element', () => {
+      const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
+      expect(thumbnailElement).toBeFalsy();
+    });
+  });
+});
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
index d116b2ade7..96b2e9b6cd 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
@@ -9,6 +9,7 @@ import { TruncatableService } from '../../../../../shared/truncatable/truncatabl
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { environment } from '../../../../../../environments/environment';
 
 let orgUnitListElementComponent: OrgUnitSearchResultListElementComponent;
 let fixture: ComponentFixture<OrgUnitSearchResultListElementComponent>;
@@ -66,11 +67,27 @@ describe('OrgUnitSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
+    environment.browseBy.showItemThumbnails = true;
     fixture = TestBed.createComponent(OrgUnitSearchResultListElementComponent);
     orgUnitListElementComponent = fixture.componentInstance;
 
   }));
 
+  describe('with environment.browseBy.showItemThumbnails set to true', () => {
+    beforeEach(() => {
+      orgUnitListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+    it('should set showThumbnails to true', () => {
+      expect(orgUnitListElementComponent.showThumbnails).toBeTrue();
+    });
+
+    it('should add thumbnail element', () => {
+      const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
+      expect(thumbnailElement).toBeTruthy();
+    });
+  });
+
   describe('When the item has an org unit description', () => {
     beforeEach(() => {
       orgUnitListElementComponent.object = mockItemWithMetadata;
@@ -95,3 +112,39 @@ describe('OrgUnitSearchResultListElementComponent', () => {
     });
   });
 });
+
+describe('OrgUnitSearchResultListElementComponent', () => {
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [OrgUnitSearchResultListElementComponent, TruncatePipe],
+      providers: [
+        {provide: TruncatableService, useValue: {}},
+        {provide: DSONameService, useClass: DSONameServiceMock}
+      ],
+
+      schemas: [NO_ERRORS_SCHEMA]
+    }).overrideComponent(OrgUnitSearchResultListElementComponent, {
+      set: {changeDetection: ChangeDetectionStrategy.Default}
+    }).compileComponents();
+  }));
+
+  beforeEach(waitForAsync(() => {
+    environment.browseBy.showItemThumbnails = false;
+    fixture = TestBed.createComponent(OrgUnitSearchResultListElementComponent);
+    orgUnitListElementComponent = fixture.componentInstance;
+  }));
+
+  describe('with environment.browseBy.showItemThumbnails set to false', () => {
+    beforeEach(() => {
+
+      orgUnitListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+
+    it('should not add thumbnail element', () => {
+      const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
+      expect(thumbnailElement).toBeFalsy();
+    });
+  });
+});
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
index 2acb02da7d..bcddd84962 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
@@ -9,6 +9,7 @@ import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { environment } from '../../../../../../environments/environment';
 
 let personListElementComponent: PersonSearchResultListElementComponent;
 let fixture: ComponentFixture<PersonSearchResultListElementComponent>;
@@ -66,11 +67,27 @@ describe('PersonSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
+    environment.browseBy.showItemThumbnails = true;
     fixture = TestBed.createComponent(PersonSearchResultListElementComponent);
     personListElementComponent = fixture.componentInstance;
 
   }));
 
+  describe('with environment.browseBy.showItemThumbnails set to true', () => {
+    beforeEach(() => {
+      personListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+    it('should set showThumbnails to true', () => {
+      expect(personListElementComponent.showThumbnails).toBeTrue();
+    });
+
+    it('should add thumbnail element', () => {
+      const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
+      expect(thumbnailElement).toBeTruthy();
+    });
+  });
+
   describe('When the item has a job title', () => {
     beforeEach(() => {
       personListElementComponent.object = mockItemWithMetadata;
@@ -95,3 +112,39 @@ describe('PersonSearchResultListElementComponent', () => {
     });
   });
 });
+
+describe('PersonSearchResultListElementComponent', () => {
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [PersonSearchResultListElementComponent, TruncatePipe],
+      providers: [
+        {provide: TruncatableService, useValue: {}},
+        {provide: DSONameService, useClass: DSONameServiceMock}
+      ],
+
+      schemas: [NO_ERRORS_SCHEMA]
+    }).overrideComponent(PersonSearchResultListElementComponent, {
+      set: {changeDetection: ChangeDetectionStrategy.Default}
+    }).compileComponents();
+  }));
+
+  beforeEach(waitForAsync(() => {
+    environment.browseBy.showItemThumbnails = false;
+    fixture = TestBed.createComponent(PersonSearchResultListElementComponent);
+    personListElementComponent = fixture.componentInstance;
+  }));
+
+  describe('with environment.browseBy.showItemThumbnails set to false', () => {
+    beforeEach(() => {
+
+      personListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+
+    it('should not add thumbnail element', () => {
+      const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
+      expect(thumbnailElement).toBeFalsy();
+    });
+  });
+});
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
index 8b27a86f6d..7d0c0d8b10 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
@@ -8,6 +8,8 @@ import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { environment } from '../../../../../../environments/environment';
+import { By } from '@angular/platform-browser';
 
 let projectListElementComponent: ProjectSearchResultListElementComponent;
 let fixture: ComponentFixture<ProjectSearchResultListElementComponent>;
@@ -66,11 +68,27 @@ describe('ProjectSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
+    environment.browseBy.showItemThumbnails = true;
     fixture = TestBed.createComponent(ProjectSearchResultListElementComponent);
     projectListElementComponent = fixture.componentInstance;
 
   }));
 
+  describe('with environment.browseBy.showItemThumbnails set to true', () => {
+    beforeEach(() => {
+      projectListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+    it('should set showThumbnails to true', () => {
+      expect(projectListElementComponent.showThumbnails).toBeTrue();
+    });
+
+    it('should add thumbnail element', () => {
+      const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
+      expect(thumbnailElement).toBeTruthy();
+    });
+  });
+
   // describe('When the item has a status', () => {
   //   beforeEach(() => {
   //     projectListElementComponent.item = mockItemWithMetadata;
@@ -95,3 +113,39 @@ describe('ProjectSearchResultListElementComponent', () => {
   //   });
   // });
 });
+
+describe('ProjectSearchResultListElementComponent', () => {
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ProjectSearchResultListElementComponent, TruncatePipe],
+      providers: [
+        {provide: TruncatableService, useValue: {}},
+        {provide: DSONameService, useClass: DSONameServiceMock}
+      ],
+
+      schemas: [NO_ERRORS_SCHEMA]
+    }).overrideComponent(ProjectSearchResultListElementComponent, {
+      set: {changeDetection: ChangeDetectionStrategy.Default}
+    }).compileComponents();
+  }));
+
+  beforeEach(waitForAsync(() => {
+    environment.browseBy.showItemThumbnails = false;
+    fixture = TestBed.createComponent(ProjectSearchResultListElementComponent);
+    projectListElementComponent = fixture.componentInstance;
+  }));
+
+  describe('with environment.browseBy.showItemThumbnails set to false', () => {
+    beforeEach(() => {
+
+      projectListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+
+    it('should not add thumbnail element', () => {
+      const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
+      expect(thumbnailElement).toBeFalsy();
+    });
+  });
+});
diff --git a/src/app/shared/object-collection/object-collection.component.spec.ts b/src/app/shared/object-collection/object-collection.component.spec.ts
index 703fb42554..c28df74aa7 100644
--- a/src/app/shared/object-collection/object-collection.component.spec.ts
+++ b/src/app/shared/object-collection/object-collection.component.spec.ts
@@ -48,5 +48,9 @@ describe('ObjectCollectionComponent', () => {
     expect(fixture.debugElement.query(By.css('ds-object-list'))).toBeDefined();
     expect(fixture.debugElement.query(By.css('ds-object-grid'))).toBeNull();
   });
+  it('should set fallback placeholder font size during test', () => {
+    objectCollectionComponent.currentMode$ = observableOf(ViewMode.ListElement);
+    expect(fixture.debugElement.query(By.css('thumb-font-3'))).toBeDefined();
 
+  });
 });
diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts
index 80518442f5..3720d4196f 100644
--- a/src/app/shared/object-collection/object-collection.component.ts
+++ b/src/app/shared/object-collection/object-collection.component.ts
@@ -243,11 +243,11 @@ export class ObjectCollectionComponent implements OnInit {
   setPlaceHolderFontSize() {
     const width = this.elementRef.nativeElement.offsetWidth;
     if (width < 750) {
-      this.placeholderFontClass = "thumb-font-1";
+      this.placeholderFontClass = 'thumb-font-1';
     } else if (width < 1000) {
-      this.placeholderFontClass = "thumb-font-2";
+      this.placeholderFontClass = 'thumb-font-2';
     } else {
-      this.placeholderFontClass = "thumb-font-3";
+      this.placeholderFontClass = 'thumb-font-3';
     }
   }
 
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
index d32ac8058d..9ff600b1c5 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
@@ -9,6 +9,7 @@ import { TruncatableService } from '../../../../../truncatable/truncatable.servi
 import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
 import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock, UNDEFINED_NAME } from '../../../../../mocks/dso-name.service.mock';
+import { environment } from '../../../../../../../environments/environment';
 
 let publicationListElementComponent: ItemSearchResultListElementComponent;
 let fixture: ComponentFixture<ItemSearchResultListElementComponent>;
@@ -76,11 +77,27 @@ describe('ItemListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
+    environment.browseBy.showItemThumbnails = true;
     fixture = TestBed.createComponent(ItemSearchResultListElementComponent);
     publicationListElementComponent = fixture.componentInstance;
 
   }));
 
+  describe('with environment.browseBy.showItemThumbnails set to true', () => {
+    beforeEach(() => {
+      publicationListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+    it('should set showThumbnails to true', () => {
+      expect(publicationListElementComponent.showThumbnails).toBeTrue();
+    });
+
+    it('should add thumbnail element', () => {
+      const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
+      expect(thumbnailElement).toBeTruthy();
+    });
+  });
+
   describe('When the item has an author', () => {
     beforeEach(() => {
       publicationListElementComponent.object = mockItemWithMetadata;
@@ -189,3 +206,39 @@ describe('ItemListElementComponent', () => {
     });
   });
 });
+
+describe('ItemListElementComponent', () => {
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ItemSearchResultListElementComponent, TruncatePipe],
+      providers: [
+        {provide: TruncatableService, useValue: {}},
+        {provide: DSONameService, useClass: DSONameServiceMock}
+      ],
+
+      schemas: [NO_ERRORS_SCHEMA]
+    }).overrideComponent(ItemSearchResultListElementComponent, {
+      set: {changeDetection: ChangeDetectionStrategy.Default}
+    }).compileComponents();
+  }));
+
+  beforeEach(waitForAsync(() => {
+    environment.browseBy.showItemThumbnails = false;
+    fixture = TestBed.createComponent(ItemSearchResultListElementComponent);
+    publicationListElementComponent = fixture.componentInstance;
+  }));
+
+  describe('with environment.browseBy.showItemThumbnails set to false', () => {
+    beforeEach(() => {
+
+      publicationListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+
+    it('should not add thumbnail element', () => {
+      const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
+      expect(thumbnailElement).toBeFalsy();
+    });
+  });
+});

From aad0085d617a35a2251c059afeb47b30d9f340be Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Fri, 9 Sep 2022 14:20:50 -0700
Subject: [PATCH 28/73] Fixed wayward css class.

---
 .../item/item-search-result-list-element.component.html       | 2 +-
 .../item/item-search-result-list-element.component.spec.ts    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index fb0429a8b9..de268df7ce 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -1,7 +1,7 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
-       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
+       [routerLink]="[itemPageRoute]" class="lead dont-break-out">
     <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
     </ds-thumbnail>
     </a>
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
index 9ff600b1c5..6be3f8b39c 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
@@ -61,7 +61,7 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(new ItemSearchRe
 });
 
 
-describe('ItemListElementComponent', () => {
+describe('ItemSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [ItemSearchResultListElementComponent, TruncatePipe],
@@ -207,7 +207,7 @@ describe('ItemListElementComponent', () => {
   });
 });
 
-describe('ItemListElementComponent', () => {
+describe('ItemSearchResultListElementComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({

From 8ff9f81247d2427a9955481b562ac7997c7a75df Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Fri, 9 Sep 2022 14:28:52 -0700
Subject: [PATCH 29/73] Minor comment update to configs.

---
 config/config.example.yml                | 2 +-
 src/config/browse-by-config.interface.ts | 2 +-
 src/config/default-app-config.ts         | 2 +-
 src/environments/environment.test.ts     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 50da56a475..37d8a97a68 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -168,7 +168,7 @@ browseBy:
   fiveYearLimit: 30
   # The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
   defaultLowerLimit: 1900
-  # If true, thumbnail images for items will be added to search and browse result lists.
+  # If true, thumbnail images for items will be added to BOTH search and browse result lists.
   showItemThumbnails: true
 
 # Item Config
diff --git a/src/config/browse-by-config.interface.ts b/src/config/browse-by-config.interface.ts
index 3ce12f3c50..86f4d7ea9f 100644
--- a/src/config/browse-by-config.interface.ts
+++ b/src/config/browse-by-config.interface.ts
@@ -20,7 +20,7 @@ export interface BrowseByConfig extends Config {
   defaultLowerLimit: number;
 
   /**
-   *  If true, thumbnail images for items will be added to search and browse result lists.
+   *  If true, thumbnail images for items will be added to BOTH search and browse result lists.
    */
   showItemThumbnails: boolean;
 }
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 356094c9bf..b80b0aa73a 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -206,7 +206,7 @@ export class DefaultAppConfig implements AppConfig {
     fiveYearLimit: 30,
     // The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
     defaultLowerLimit: 1900,
-    // Whether to add item thumbnail images to browse and search result lists.
+    // Whether to add item thumbnail images to BOTH browse and search result lists.
     showItemThumbnails: true
   };
 
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 44b4af5380..6cbe55cea0 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -199,7 +199,7 @@ export const environment: BuildConfig = {
     fiveYearLimit: 30,
     // The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
     defaultLowerLimit: 1900,
-    // Whether to add item thumbnail images to browse and search result lists.
+    // Whether to add item thumbnail images to BOTH browse and search result lists.
     showItemThumbnails: true
   },
 

From 06a68ece9d194260cbe534bae54990c915701c10 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Fri, 9 Sep 2022 14:53:56 -0700
Subject: [PATCH 30/73] Added anchors for entity-type thumbs.

---
 ...-unit-search-result-list-element.component.html | 14 +++++++++-----
 ...erson-search-result-list-element.component.html | 14 +++++++++-----
 ...oject-search-result-list-element.component.html | 14 +++++++++-----
 .../item-search-result-list-element.component.html |  2 +-
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
index fd33b688c0..4d40b3450a 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
@@ -1,10 +1,14 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-md-2">
-    <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                  [defaultImage]="'assets/images/orgunit-placeholder.svg'"
-                  [alt]="'thumbnail.orgunit.alt'"
-                  [placeholder]="'thumbnail.orgunit.placeholder'">
-    </ds-thumbnail>
+    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
+       rel="noopener noreferrer"
+       [routerLink]="[itemPageRoute]" class="dont-break-out">
+      <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+                    [defaultImage]="'assets/images/orgunit-placeholder.svg'"
+                    [alt]="'thumbnail.orgunit.alt'"
+                    [placeholder]="'thumbnail.orgunit.placeholder'">
+      </ds-thumbnail>
+    </a>
   </div>
   <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
     <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
index 00446a5a78..55aec9854d 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
@@ -1,10 +1,14 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-md-2">
-    <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                  [defaultImage]="'assets/images/person-placeholder.svg'"
-                  [alt]="'thumbnail.person.alt'"
-                  [placeholder]="'thumbnail.person.placeholder'">
-    </ds-thumbnail>
+    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
+       rel="noopener noreferrer"
+       [routerLink]="[itemPageRoute]" class="dont-break-out">
+      <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+                    [defaultImage]="'assets/images/person-placeholder.svg'"
+                    [alt]="'thumbnail.person.alt'"
+                    [placeholder]="'thumbnail.person.placeholder'">
+      </ds-thumbnail>
+    </a>
   </div>
   <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
     <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
index 80bbc14bf0..b63841eccb 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
@@ -1,10 +1,14 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-md-2">
-    <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                  [defaultImage]="'assets/images/project-placeholder.svg'"
-                  [alt]="'thumbnail.project.alt'"
-                  [placeholder]="'thumbnail.project.placeholder'">
-    </ds-thumbnail>
+    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
+       rel="noopener noreferrer"
+       [routerLink]="[itemPageRoute]" class="dont-break-out">
+      <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+                    [defaultImage]="'assets/images/project-placeholder.svg'"
+                    [alt]="'thumbnail.project.alt'"
+                    [placeholder]="'thumbnail.project.placeholder'">
+      </ds-thumbnail>
+    </a>
   </div>
   <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
     <ds-truncatable [id]="dso.id">
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index de268df7ce..c2dbb4b3df 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -1,7 +1,7 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
-       [routerLink]="[itemPageRoute]" class="lead dont-break-out">
+       [routerLink]="[itemPageRoute]" class="dont-break-out">
     <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
     </ds-thumbnail>
     </a>

From b692fa5924e01fa9b52f38f8f96e62afddd45117 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Sun, 11 Sep 2022 13:27:20 -0700
Subject: [PATCH 31/73] Added thumbs to mydspace and enviroment component
 injection.

---
 ...arch-result-list-element.component.spec.ts |  5 +-
 ...arch-result-list-element.component.spec.ts |  5 +-
 ...arch-result-list-element.component.spec.ts |  5 +-
 ...in-workflow-list-element.component.spec.ts |  5 +-
 ...t-admin-workflow-list-element.component.ts |  8 ++--
 ...arch-result-list-element.component.spec.ts |  7 ++-
 ...ue-search-result-list-element.component.ts |  3 +-
 ...arch-result-list-element.component.spec.ts |  5 +-
 ...me-search-result-list-element.component.ts |  3 +-
 ...arch-result-list-element.component.spec.ts |  5 +-
 ...al-search-result-list-element.component.ts |  3 +-
 ...arch-result-list-element.component.spec.ts |  7 ++-
 ...it-search-result-list-element.component.ts |  3 +-
 ...arch-result-list-element.component.spec.ts |  7 ++-
 ...on-search-result-list-element.component.ts | 11 +++--
 ...arch-result-list-element.component.spec.ts |  8 +++-
 ...ct-search-result-list-element.component.ts |  3 +-
 ...-list-submission-element.component.spec.ts |  5 +-
 ...esult-list-submission-element.component.ts | 14 ++++--
 ...ult-list-submission-element.component.html | 22 +++++++--
 ...-list-submission-element.component.spec.ts |  3 ++
 ...esult-list-submission-element.component.ts | 14 ++++--
 ...arch-result-list-element.component.spec.ts |  5 +-
 ...ed-search-result-list-element.component.ts |  8 ++--
 ...arch-result-list-element.component.spec.ts |  5 +-
 ...ed-search-result-list-element.component.ts |  8 ++--
 ...arch-result-list-element.component.spec.ts |  5 +-
 ...ed-search-result-list-element.component.ts |  8 ++--
 .../item-list-preview.component.html          | 46 ++++++++++++-------
 .../item-list-preview.component.spec.ts       |  6 ++-
 .../item-list-preview.component.ts            | 18 +++++++-
 .../themed-item-list-preview.component.ts     |  1 +
 ...ult-list-element-submission.component.html |  7 ++-
 ...-list-element-submission.component.spec.ts |  5 +-
 ...esult-list-element-submission.component.ts |  6 +++
 ...arch-result-list-element.component.spec.ts |  5 +-
 ...ol-search-result-list-element.component.ts |  8 ++--
 ...-search-result-list-element.component.html |  8 +++-
 ...arch-result-list-element.component.spec.ts |  5 +-
 ...em-search-result-list-element.component.ts | 14 ++++--
 ...-search-result-list-element.component.html |  6 ++-
 ...arch-result-list-element.component.spec.ts |  5 +-
 ...em-search-result-list-element.component.ts | 14 ++++--
 ...arch-result-list-element.component.spec.ts |  5 +-
 ...on-search-result-list-element.component.ts |  3 +-
 ...arch-result-list-element.component.spec.ts |  5 +-
 ...ty-search-result-list-element.component.ts |  3 +-
 ...arch-result-list-element.component.spec.ts |  7 ++-
 ...em-search-result-list-element.component.ts |  3 +-
 .../search-result-list-element.component.ts   |  7 ++-
 .../sidebar-search-list-element.component.ts  |  5 +-
 src/styles/_global-styles.scss                |  5 ++
 52 files changed, 282 insertions(+), 105 deletions(-)

diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
index b394caef56..8937847ff5 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
@@ -13,6 +13,8 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment';
 
 describe('CollectionAdminSearchResultListElementComponent', () => {
   let component: CollectionAdminSearchResultListElementComponent;
@@ -36,7 +38,8 @@ describe('CollectionAdminSearchResultListElementComponent', () => {
       ],
       declarations: [CollectionAdminSearchResultListElementComponent],
       providers: [{ provide: TruncatableService, useValue: {} },
-        { provide: DSONameService, useClass: DSONameServiceMock }],
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }],
       schemas: [NO_ERRORS_SCHEMA]
     })
       .compileComponents();
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
index 155d7f7509..110d77b1e5 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
@@ -13,6 +13,8 @@ import { Community } from '../../../../../core/shared/community.model';
 import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment';
 
 describe('CommunityAdminSearchResultListElementComponent', () => {
   let component: CommunityAdminSearchResultListElementComponent;
@@ -36,7 +38,8 @@ describe('CommunityAdminSearchResultListElementComponent', () => {
       ],
       declarations: [CommunityAdminSearchResultListElementComponent],
       providers: [{ provide: TruncatableService, useValue: {} },
-        { provide: DSONameService, useClass: DSONameServiceMock }],
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }],
       schemas: [NO_ERRORS_SCHEMA]
     })
       .compileComponents();
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
index 3774a07757..667e8edea9 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
@@ -10,6 +10,8 @@ import { ItemAdminSearchResultListElementComponent } from './item-admin-search-r
 import { Item } from '../../../../../core/shared/item.model';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment';
 
 describe('ItemAdminSearchResultListElementComponent', () => {
   let component: ItemAdminSearchResultListElementComponent;
@@ -33,7 +35,8 @@ describe('ItemAdminSearchResultListElementComponent', () => {
       ],
       declarations: [ItemAdminSearchResultListElementComponent],
       providers: [{ provide: TruncatableService, useValue: {} },
-        { provide: DSONameService, useClass: DSONameServiceMock }],
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }],
       schemas: [NO_ERRORS_SCHEMA]
     })
       .compileComponents();
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts
index a792a606e9..a489cb0e57 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts
@@ -18,6 +18,8 @@ import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-
 import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment';
 
 describe('WorkflowItemAdminWorkflowListElementComponent', () => {
   let component: WorkflowItemSearchResultAdminWorkflowListElementComponent;
@@ -51,7 +53,8 @@ describe('WorkflowItemAdminWorkflowListElementComponent', () => {
         providers: [
           { provide: TruncatableService, useValue: mockTruncatableService },
           { provide: LinkService, useValue: linkService },
-          { provide: DSONameService, useClass: DSONameServiceMock }
+          { provide: DSONameService, useClass: DSONameServiceMock },
+          { provide: APP_CONFIG, useValue: environment }
         ],
         schemas: [NO_ERRORS_SCHEMA]
       })
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts
index 3dd17faf25..3bc75de415 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { Context } from '../../../../../core/shared/context.model';
@@ -13,6 +13,7 @@ import { SearchResultListElementComponent } from '../../../../../shared/object-l
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
 
 @listableObjectComponent(WorkflowItemSearchResult, ViewMode.ListElement, Context.AdminWorkflowSearch)
 @Component({
@@ -32,9 +33,10 @@ export class WorkflowItemSearchResultAdminWorkflowListElementComponent extends S
 
   constructor(private linkService: LinkService,
               protected truncatableService: TruncatableService,
-              protected dsoNameService: DSONameService
+              protected dsoNameService: DSONameService,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig
   ) {
-    super(truncatableService, dsoNameService);
+    super(truncatableService, dsoNameService, appConfig);
   }
 
   /**
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
index 34aa1b43aa..c56db015a6 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
@@ -10,6 +10,7 @@ import { TruncatableService } from '../../../../../shared/truncatable/truncatabl
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
 import { environment } from '../../../../../../environments/environment';
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 
 let journalIssueListElementComponent: JournalIssueSearchResultListElementComponent;
 let fixture: ComponentFixture<JournalIssueSearchResultListElementComponent>;
@@ -64,7 +65,8 @@ describe('JournalIssueSearchResultListElementComponent', () => {
       declarations: [JournalIssueSearchResultListElementComponent, TruncatePipe],
       providers: [
         { provide: TruncatableService, useValue: {} },
-        { provide: DSONameService, useClass: DSONameServiceMock }
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -152,7 +154,8 @@ describe('JournalIssueSearchResultListElementComponent', () => {
       declarations: [JournalIssueSearchResultListElementComponent, TruncatePipe],
       providers: [
         {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock}
+        {provide: DSONameService, useClass: DSONameServiceMock},
+        { provide: APP_CONFIG, useValue: environment }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
index bff374f064..ce017a5712 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
@@ -2,7 +2,6 @@ import { Component } from '@angular/core';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
-import { environment } from '../../../../../../environments/environment';
 
 @listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement)
 @Component({
@@ -22,7 +21,7 @@ export class JournalIssueSearchResultListElementComponent extends ItemSearchResu
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = environment.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
   }
 
 }
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
index 2b66a39294..8277ec946d 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
@@ -10,6 +10,7 @@ import { TruncatableService } from '../../../../../shared/truncatable/truncatabl
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
 import { environment } from '../../../../../../environments/environment';
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 
 let journalVolumeListElementComponent: JournalVolumeSearchResultListElementComponent;
 let fixture: ComponentFixture<JournalVolumeSearchResultListElementComponent>;
@@ -64,6 +65,7 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -150,7 +152,8 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
       declarations: [JournalVolumeSearchResultListElementComponent, TruncatePipe],
       providers: [
         {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock}
+        {provide: DSONameService, useClass: DSONameServiceMock},
+        { provide: APP_CONFIG, useValue: environment }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
index 46ab0ac20c..fa01a54fa4 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
@@ -2,7 +2,6 @@ import { Component } from '@angular/core';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
-import { environment } from '../../../../../../environments/environment';
 
 @listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement)
 @Component({
@@ -22,7 +21,7 @@ export class JournalVolumeSearchResultListElementComponent extends ItemSearchRes
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = environment.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
   }
 
 }
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
index ab3fd95bb8..45dcc1e15a 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
@@ -10,6 +10,7 @@ import { ItemSearchResult } from '../../../../../shared/object-collection/shared
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
 import { environment } from '../../../../../../environments/environment';
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 
 let journalListElementComponent: JournalSearchResultListElementComponent;
 let fixture: ComponentFixture<JournalSearchResultListElementComponent>;
@@ -60,6 +61,7 @@ describe('JournalSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -122,7 +124,8 @@ describe('JournalSearchResultListElementComponent', () => {
       declarations: [JournalSearchResultListElementComponent, TruncatePipe],
       providers: [
         {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock}
+        {provide: DSONameService, useClass: DSONameServiceMock},
+        { provide: APP_CONFIG, useValue: environment }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
index 073e22b177..0c94e084c7 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
@@ -2,7 +2,6 @@ import { Component } from '@angular/core';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
-import { environment } from '../../../../../../environments/environment';
 
 @listableObjectComponent('JournalSearchResult', ViewMode.ListElement)
 @Component({
@@ -22,7 +21,7 @@ export class JournalSearchResultListElementComponent extends ItemSearchResultLis
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = environment.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
   }
 
 }
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
index 96b2e9b6cd..1cd46832b2 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
@@ -10,6 +10,7 @@ import { ItemSearchResult } from '../../../../../shared/object-collection/shared
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
 import { environment } from '../../../../../../environments/environment';
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 
 let orgUnitListElementComponent: OrgUnitSearchResultListElementComponent;
 let fixture: ComponentFixture<OrgUnitSearchResultListElementComponent>;
@@ -57,7 +58,8 @@ describe('OrgUnitSearchResultListElementComponent', () => {
       declarations: [ OrgUnitSearchResultListElementComponent , TruncatePipe],
       providers: [
         { provide: TruncatableService, useValue: {} },
-        { provide: DSONameService, useClass: DSONameServiceMock }
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }
       ],
 
       schemas: [ NO_ERRORS_SCHEMA ]
@@ -120,7 +122,8 @@ describe('OrgUnitSearchResultListElementComponent', () => {
       declarations: [OrgUnitSearchResultListElementComponent, TruncatePipe],
       providers: [
         {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock}
+        {provide: DSONameService, useClass: DSONameServiceMock},
+        { provide: APP_CONFIG, useValue: environment }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
index ade0534d8d..e3d6ab171b 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
@@ -2,7 +2,6 @@ import { Component } from '@angular/core';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
-import { environment } from '../../../../../../environments/environment';
 
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement)
 @Component({
@@ -22,7 +21,7 @@ export class OrgUnitSearchResultListElementComponent extends ItemSearchResultLis
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = environment.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
   }
 
 }
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
index bcddd84962..3092430065 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
@@ -10,6 +10,7 @@ import { TruncatableService } from '../../../../../shared/truncatable/truncatabl
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
 import { environment } from '../../../../../../environments/environment';
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 
 let personListElementComponent: PersonSearchResultListElementComponent;
 let fixture: ComponentFixture<PersonSearchResultListElementComponent>;
@@ -57,7 +58,8 @@ describe('PersonSearchResultListElementComponent', () => {
       declarations: [PersonSearchResultListElementComponent, TruncatePipe],
       providers: [
         { provide: TruncatableService, useValue: {} },
-        { provide: DSONameService, useClass: DSONameServiceMock }
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -120,7 +122,8 @@ describe('PersonSearchResultListElementComponent', () => {
       declarations: [PersonSearchResultListElementComponent, TruncatePipe],
       providers: [
         {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock}
+        {provide: DSONameService, useClass: DSONameServiceMock},
+        { provide: APP_CONFIG, useValue: environment }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
index 32ab1e6695..f87e08e40a 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, Inject } from '@angular/core';
 import {
   listableObjectComponent
 } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
@@ -9,6 +9,7 @@ import {
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { environment } from '../../../../../../environments/environment';
+import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
 
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement)
 @Component({
@@ -21,8 +22,10 @@ import { environment } from '../../../../../../environments/environment';
  */
 export class PersonSearchResultListElementComponent extends ItemSearchResultListElementComponent {
 
-  public constructor(protected truncatableService: TruncatableService, protected dsoNameService: DSONameService) {
-    super(truncatableService, dsoNameService);
+  public constructor(protected truncatableService: TruncatableService,
+                     protected dsoNameService: DSONameService,
+                     @Inject(APP_CONFIG) protected appConfig: AppConfig ) {
+    super(truncatableService, dsoNameService, appConfig);
   }
 
   /**
@@ -32,7 +35,7 @@ export class PersonSearchResultListElementComponent extends ItemSearchResultList
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = environment.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
   }
 
   /**
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
index 7d0c0d8b10..4274db08f5 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
@@ -10,6 +10,7 @@ import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
 import { environment } from '../../../../../../environments/environment';
 import { By } from '@angular/platform-browser';
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 
 let projectListElementComponent: ProjectSearchResultListElementComponent;
 let fixture: ComponentFixture<ProjectSearchResultListElementComponent>;
@@ -58,7 +59,8 @@ describe('ProjectSearchResultListElementComponent', () => {
       declarations: [ProjectSearchResultListElementComponent, TruncatePipe],
       providers: [
         { provide: TruncatableService, useValue: {} },
-        { provide: DSONameService, useClass: DSONameServiceMock }
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -121,7 +123,9 @@ describe('ProjectSearchResultListElementComponent', () => {
       declarations: [ProjectSearchResultListElementComponent, TruncatePipe],
       providers: [
         {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock}
+        {provide: DSONameService, useClass: DSONameServiceMock},
+        { provide: APP_CONFIG, useValue: environment }
+
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
index ff88570c1d..e5d4c04c75 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
@@ -2,7 +2,6 @@ import { Component } from '@angular/core';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
-import { environment } from '../../../../../../environments/environment';
 
 @listableObjectComponent('ProjectSearchResult', ViewMode.ListElement)
 @Component({
@@ -22,7 +21,7 @@ export class ProjectSearchResultListElementComponent extends ItemSearchResultLis
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = environment.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
   }
 
 }
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts
index 13a307e18f..e884edbbb9 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts
@@ -29,6 +29,8 @@ import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { OrgUnitSearchResultListSubmissionElementComponent } from './org-unit-search-result-list-submission-element.component';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment';
 
 let personListElementComponent: OrgUnitSearchResultListSubmissionElementComponent;
 let fixture: ComponentFixture<OrgUnitSearchResultListSubmissionElementComponent>;
@@ -117,7 +119,8 @@ describe('OrgUnitSearchResultListSubmissionElementComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
-        { provide: DSONameService, useClass: DSONameServiceMock }
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
index 17c764d480..e550e9fc8a 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
 import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
@@ -17,6 +17,7 @@ import { ItemDataService } from '../../../../../core/data/item-data.service';
 import { SelectableListService } from '../../../../../shared/object-list/selectable-list/selectable-list.service';
 import { NameVariantModalComponent } from '../../name-variant-modal/name-variant-modal.component';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
 
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.EntitySearchModal)
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.EntitySearchModalWithNameVariants)
@@ -35,6 +36,11 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
   alternativeField = 'dc.title.alternative';
   useNameVariants = false;
 
+  /**
+   * Display thumbnail if required by configuration
+   */
+  showThumbnails: boolean;
+
   constructor(protected truncatableService: TruncatableService,
               private relationshipService: RelationshipService,
               private notificationsService: NotificationsService,
@@ -43,9 +49,10 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
               private itemDataService: ItemDataService,
               private bitstreamDataService: BitstreamDataService,
               private selectableListService: SelectableListService,
-              protected dsoNameService: DSONameService
+              protected dsoNameService: DSONameService,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig
   ) {
-    super(truncatableService, dsoNameService);
+    super(truncatableService, dsoNameService, appConfig);
   }
 
   ngOnInit() {
@@ -65,6 +72,7 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
           }
         );
     }
+    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
   }
 
   select(value) {
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
index 9fe9898c2b..6f9773678a 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
@@ -1,6 +1,20 @@
-<div class="d-flex">
-    <div class="flex-grow-1">
-        <ds-person-input-suggestions [suggestions]="allSuggestions" [(ngModel)]="selectedName" (clickSuggestion)="select($event)" (submitSuggestion)="selectCustom($event)"></ds-person-input-suggestions>
+<div class="row">
+  <div *ngIf="showThumbnails" class="col-md-2">
+    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
+       rel="noopener noreferrer" class="dont-break-out">
+      <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+                    [defaultImage]="'assets/images/person-placeholder.svg'"
+                    [alt]="'thumbnail.person.alt'"
+                    [placeholder]="'thumbnail.person.placeholder'">
+      </ds-thumbnail>
+    </a>
+  </div>
+  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+    <div class="d-flex">
+      <div class="flex-grow-1">
+        <ds-person-input-suggestions [suggestions]="allSuggestions" [(ngModel)]="selectedName"
+                                     (clickSuggestion)="select($event)"
+                                     (submitSuggestion)="selectCustom($event)"></ds-person-input-suggestions>
         <span class="text-muted">
         <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
               class="item-list-job-title">
@@ -9,5 +23,7 @@
                 </span>
         </span>
     </span>
+      </div>
     </div>
+  </div>
 </div>
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
index 2c42217a29..6c83ec919c 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
@@ -27,6 +27,8 @@ import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { PersonSearchResultListSubmissionElementComponent } from './person-search-result-list-submission-element.component';
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment';
 
 let personListElementComponent: PersonSearchResultListSubmissionElementComponent;
 let fixture: ComponentFixture<PersonSearchResultListSubmissionElementComponent>;
@@ -109,6 +111,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
+        { provide: APP_CONFIG, useValue: environment }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
index 13de40e015..5ff1d31741 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
 import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
@@ -17,6 +17,7 @@ import { MetadataValue } from '../../../../../core/shared/metadata.models';
 import { ItemDataService } from '../../../../../core/data/item-data.service';
 import { SelectableListService } from '../../../../../shared/object-list/selectable-list/selectable-list.service';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
 
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.EntitySearchModalWithNameVariants)
 @Component({
@@ -33,6 +34,11 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu
   selectedName: string;
   alternativeField = 'dc.title.alternative';
 
+  /**
+   * Display thumbnail if required by configuration
+   */
+  showThumbnails: boolean;
+
   constructor(protected truncatableService: TruncatableService,
               private relationshipService: RelationshipService,
               private notificationsService: NotificationsService,
@@ -41,9 +47,10 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu
               private itemDataService: ItemDataService,
               private bitstreamDataService: BitstreamDataService,
               private selectableListService: SelectableListService,
-              protected dsoNameService: DSONameService
+              protected dsoNameService: DSONameService,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig
   ) {
-    super(truncatableService, dsoNameService);
+    super(truncatableService, dsoNameService, appConfig);
   }
 
   ngOnInit() {
@@ -58,6 +65,7 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu
         this.selectedName = nameVariant || defaultValue;
         }
       );
+    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
   }
 
   select(value) {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts
index c2b106c76a..742d71c59e 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts
@@ -17,6 +17,8 @@ import { ClaimedApprovedTaskSearchResult } from '../../../../object-collection/s
 import { ClaimedApprovedSearchResultListElementComponent } from './claimed-approved-search-result-list-element.component';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment';
 
 let component: ClaimedApprovedSearchResultListElementComponent;
 let fixture: ComponentFixture<ClaimedApprovedSearchResultListElementComponent>;
@@ -67,7 +69,8 @@ describe('ClaimedApprovedSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: LinkService, useValue: linkService },
-        { provide: DSONameService, useClass: DSONameServiceMock }
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(ClaimedApprovedSearchResultListElementComponent, {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
index eaf407d787..5dda0e44ea 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, Inject } from '@angular/core';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { ClaimedApprovedTaskSearchResult } from '../../../../object-collection/shared/claimed-approved-task-search-result.model';
 import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
@@ -13,6 +13,7 @@ import { SearchResultListElementComponent } from '../../../search-result-list-el
 import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model';
 import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
 
 /**
  * This component renders claimed task approved object for the search result in the list view.
@@ -43,9 +44,10 @@ export class ClaimedApprovedSearchResultListElementComponent extends SearchResul
   public constructor(
     protected linkService: LinkService,
     protected truncatableService: TruncatableService,
-    protected dsoNameService: DSONameService
+    protected dsoNameService: DSONameService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig
   ) {
-    super(truncatableService, dsoNameService);
+    super(truncatableService, dsoNameService, appConfig);
   }
 
   /**
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declided-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declided-search-result-list-element.component.spec.ts
index 15b5a5345d..16ed3d7f41 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declided-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declided-search-result-list-element.component.spec.ts
@@ -17,6 +17,8 @@ import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { MyDspaceItemStatusType } from '../../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment';
 
 let component: ClaimedDeclinedSearchResultListElementComponent;
 let fixture: ComponentFixture<ClaimedDeclinedSearchResultListElementComponent>;
@@ -67,7 +69,8 @@ describe('ClaimedDeclinedSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: LinkService, useValue: linkService },
-        { provide: DSONameService, useClass: DSONameServiceMock }
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(ClaimedDeclinedSearchResultListElementComponent, {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
index 0b9a925dbf..90f523a7fb 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, Inject } from '@angular/core';
 
 import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
 import { ClaimedDeclinedTaskSearchResult } from '../../../../object-collection/shared/claimed-declined-task-search-result.model';
@@ -14,6 +14,7 @@ import { SearchResultListElementComponent } from '../../../search-result-list-el
 import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model';
 import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
 
 /**
  * This component renders claimed task declined object for the search result in the list view.
@@ -44,9 +45,10 @@ export class ClaimedDeclinedSearchResultListElementComponent extends SearchResul
   public constructor(
     protected linkService: LinkService,
     protected truncatableService: TruncatableService,
-    protected dsoNameService: DSONameService
+    protected dsoNameService: DSONameService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig
   ) {
-    super(truncatableService, dsoNameService);
+    super(truncatableService, dsoNameService, appConfig);
   }
 
   /**
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts
index 7896061a73..24cacb79a9 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts
@@ -18,6 +18,8 @@ import { getMockLinkService } from '../../../mocks/link-service.mock';
 import { By } from '@angular/platform-browser';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment';
 
 let component: ClaimedSearchResultListElementComponent;
 let fixture: ComponentFixture<ClaimedSearchResultListElementComponent>;
@@ -68,7 +70,8 @@ describe('ClaimedSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: LinkService, useValue: linkService },
-        { provide: DSONameService, useClass: DSONameServiceMock }
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(ClaimedSearchResultListElementComponent, {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
index 2cf8f9a231..27e5831c39 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, Inject } from '@angular/core';
 
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
@@ -13,6 +13,7 @@ import { followLink } from '../../../utils/follow-link-config.model';
 import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
 
 @Component({
   selector: 'ds-claimed-search-result-list-element',
@@ -40,9 +41,10 @@ export class ClaimedSearchResultListElementComponent extends SearchResultListEle
   public constructor(
     protected linkService: LinkService,
     protected truncatableService: TruncatableService,
-    protected dsoNameService: DSONameService
+    protected dsoNameService: DSONameService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig
   ) {
-    super(truncatableService, dsoNameService);
+    super(truncatableService, dsoNameService, appConfig);
   }
 
   /**
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 78181dc65a..cfc75a3c82 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
@@ -1,23 +1,33 @@
-<div *ngIf="item" @fadeInOut>
-  <ng-container *ngIf="status">
-    <ds-mydspace-item-status [status]="status"></ds-mydspace-item-status>
-  </ng-container>
-  <div class="d-flex">
-    <ds-type-badge [object]="item"></ds-type-badge>
-    <ds-access-status-badge [item]="item" class="pl-1"></ds-access-status-badge>
+<div class="row">
+  <div *ngIf="showThumbnails" class="col-md-2">
+    <ds-thumbnail [thumbnail]="item?.thumbnail | async" [limitWidth]="true">
+    </ds-thumbnail>
   </div>
-  <ds-truncatable [id]="item.id">
-    <h3 [innerHTML]="item.firstMetadataValue('dc.title') || ('mydspace.results.no-title' | translate)" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h3>
-    <div>
+  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+    <div *ngIf="item" @fadeInOut>
+      <ng-container *ngIf="status">
+        <ds-mydspace-item-status [status]="status"></ds-mydspace-item-status>
+      </ng-container>
+      <div class="d-flex">
+        <ds-type-badge [object]="item"></ds-type-badge>
+        <ds-access-status-badge [item]="item" class="pl-1"></ds-access-status-badge>
+      </div>
+      <ds-truncatable [id]="item.id">
+        <h3 [innerHTML]="item.firstMetadataValue('dc.title') || ('mydspace.results.no-title' | translate)"
+            [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h3>
+        <div>
       <span class="text-muted">
         <ds-truncatable-part [id]="item.id" [minLines]="1">
           (<span *ngIf="item.hasMetadata('dc.publisher')" class="item-list-publisher"
                  [innerHTML]="item.firstMetadataValue('dc.publisher') + ', '"></span>
-          <span class="item-list-date" [innerHTML]="item.firstMetadataValue('dc.date.issued') || ('mydspace.results.no-date' | translate)"></span>)
+          <span class="item-list-date"
+                [innerHTML]="item.firstMetadataValue('dc.date.issued') || ('mydspace.results.no-date' | translate)"></span>)
           <span *ngIf="item.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);"
                 class="item-list-authors">
-              <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
+                *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>
@@ -26,12 +36,14 @@
           </ds-truncatable-part>
       </span>
 
-      <ds-truncatable-part [id]="item.id" [minLines]="1" class="item-list-abstract">
+          <ds-truncatable-part [id]="item.id" [minLines]="1" class="item-list-abstract">
         <span [ngClass]="{'text-muted': !item.firstMetadataValue('dc.description.abstract')}"
               [innerHTML]="(item.firstMetadataValue('dc.description.abstract')) || ('mydspace.results.no-abstract' | translate)"></span>
-      </ds-truncatable-part>
+          </ds-truncatable-part>
 
+        </div>
+      </ds-truncatable>
+      <ds-item-submitter *ngIf="showSubmitter" [object]="object.indexableObject"></ds-item-submitter>
     </div>
-  </ds-truncatable>
-  <ds-item-submitter *ngIf="showSubmitter" [object]="object.indexableObject"></ds-item-submitter>
+  </div>
 </div>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
index 023b51a8dd..468092820a 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
@@ -10,6 +10,8 @@ import { ItemListPreviewComponent } from './item-list-preview.component';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment';
 
 let component: ItemListPreviewComponent;
 let fixture: ComponentFixture<ItemListPreviewComponent>;
@@ -80,8 +82,8 @@ describe('ItemListPreviewComponent', () => {
       ],
       declarations: [ItemListPreviewComponent, TruncatePipe],
       providers: [
-        { provide: 'objectElementProvider', useValue: { mockItemWithAuthorAndDate } }
-
+        { provide: 'objectElementProvider', useValue: { mockItemWithAuthorAndDate }},
+        { provide: APP_CONFIG, useValue: environment }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
index 34b2d979c1..08415db308 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
@@ -1,9 +1,10 @@
-import { Component, Input } from '@angular/core';
+import { Component, Inject, Input, OnInit } from '@angular/core';
 
 import { Item } from '../../../../core/shared/item.model';
 import { fadeInOut } from '../../../animations/fade';
 import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 import { SearchResult } from '../../../search/models/search-result.model';
+import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
 
 /**
  * This component show metadata for the given item object in the list view.
@@ -14,7 +15,7 @@ import { SearchResult } from '../../../search/models/search-result.model';
   templateUrl: 'item-list-preview.component.html',
   animations: [fadeInOut]
 })
-export class ItemListPreviewComponent {
+export class ItemListPreviewComponent implements OnInit{
 
   /**
    * The item to display
@@ -35,4 +36,17 @@ export class ItemListPreviewComponent {
    * A boolean representing if to show submitter information
    */
   @Input() showSubmitter = false;
+
+
+  /**
+   * Display thumbnails if required by configuration
+   */
+  showThumbnails: boolean;
+
+  constructor(@Inject(APP_CONFIG) protected appConfig: AppConfig) {
+  }
+
+  ngOnInit(): void {
+    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
+  }
 }
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts
index 982a04207f..3fe825d236 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts
@@ -24,6 +24,7 @@ export class ThemedItemListPreviewComponent extends ThemedComponent<ItemListPrev
 
   @Input() showSubmitter = false;
 
+
   protected getComponentName(): string {
     return 'ItemListPreviewComponent';
   }
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html
index 6c012dd641..64579682cb 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html
@@ -2,4 +2,9 @@
                       [object]="object"
                       [status]="status"></ds-themed-item-list-preview>
 
-<ds-item-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-item-actions>
+<div class="row">
+  <div [ngClass]="showThumbnails ? 'offset-md-2 pl-3' : ''">
+    <ds-item-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-item-actions>
+  </div>
+</div>
+
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts
index d1871d0996..1dc221f2ed 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts
@@ -12,6 +12,8 @@ import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { By } from '@angular/platform-browser';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment';
 
 let component: ItemSearchResultListElementSubmissionComponent;
 let fixture: ComponentFixture<ItemSearchResultListElementSubmissionComponent>;
@@ -56,7 +58,8 @@ describe('ItemMyDSpaceResultListElementComponent', () => {
       declarations: [ItemSearchResultListElementSubmissionComponent],
       providers: [
         { provide: TruncatableService, useValue: {} },
-        { provide: DSONameService, useClass: DSONameServiceMock }
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(ItemSearchResultListElementSubmissionComponent, {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts
index 3ef45d1c47..d81a68de74 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts
@@ -25,7 +25,13 @@ export class ItemSearchResultListElementSubmissionComponent extends SearchResult
    */
   public status = MyDspaceItemStatusType.ARCHIVED;
 
+  /**
+   * Display thumbnails if required by configuration
+   */
+  showThumbnails: boolean;
+
   ngOnInit() {
     super.ngOnInit();
+    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
   }
 }
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
index 18db9abd67..3eb37efb3f 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
@@ -18,6 +18,8 @@ import { getMockLinkService } from '../../../mocks/link-service.mock';
 import { By } from '@angular/platform-browser';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment';
 
 let component: PoolSearchResultListElementComponent;
 let fixture: ComponentFixture<PoolSearchResultListElementComponent>;
@@ -68,7 +70,8 @@ describe('PoolSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: LinkService, useValue: linkService },
-        { provide: DSONameService, useClass: DSONameServiceMock }
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(PoolSearchResultListElementComponent, {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
index e9d64db572..7278aca688 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
 
 import { Observable } from 'rxjs';
 
@@ -14,6 +14,7 @@ import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { followLink } from '../../../utils/follow-link-config.model';
 import { LinkService } from '../../../../core/cache/builders/link.service';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
 
 /**
  * This component renders pool task object for the search result in the list view.
@@ -50,9 +51,10 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
   constructor(
     protected linkService: LinkService,
     protected truncatableService: TruncatableService,
-    protected dsoNameService: DSONameService
+    protected dsoNameService: DSONameService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig
   ) {
-    super(truncatableService, dsoNameService);
+    super(truncatableService, dsoNameService, appConfig);
   }
 
   /**
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 4a5f330f46..aceb235eaa 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
@@ -3,9 +3,13 @@
     [item]="item$ | async"
     [object]="object"
     [status]="status"></ds-themed-item-list-preview>
-
-  <ds-workflowitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workflowitem-actions>
+  <div class="row">
+    <div [ngClass]="showThumbnails ? 'offset-md-2 pl-3' : ''">
+      <ds-workflowitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workflowitem-actions>
+    </div>
+  </div>
 </ng-container>
+
 <ds-themed-loading
   *ngIf="!(item$ | async)"
   [showMessage]="false"></ds-themed-loading>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
index 61337b0cb3..c8573c628b 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
@@ -18,6 +18,8 @@ import { WorkflowItemSearchResultListElementComponent } from './workflow-item-se
 import { By } from '@angular/platform-browser';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment';
 
 let component: WorkflowItemSearchResultListElementComponent;
 let fixture: ComponentFixture<WorkflowItemSearchResultListElementComponent>;
@@ -69,7 +71,8 @@ describe('WorkflowItemSearchResultListElementComponent', () => {
         { provide: TruncatableService, useValue: {} },
         { provide: ItemDataService, useValue: {} },
         { provide: LinkService, useValue: linkService },
-        { provide: DSONameService, useClass: DSONameServiceMock }
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(WorkflowItemSearchResultListElementComponent, {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
index 836a3ee268..b6e641acd5 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, Inject } from '@angular/core';
 
 import { Observable } from 'rxjs';
 import { find, map } from 'rxjs/operators';
@@ -16,6 +16,7 @@ import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { followLink } from '../../../utils/follow-link-config.model';
 import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
 
 /**
  * This component renders workflowitem object for the search result in the list view.
@@ -39,12 +40,18 @@ export class WorkflowItemSearchResultListElementComponent extends SearchResultLi
    */
   public status = MyDspaceItemStatusType.WORKFLOW;
 
+  /**
+   * Display thumbnails if required by configuration
+   */
+  showThumbnails: boolean;
+
   constructor(
     protected truncatableService: TruncatableService,
     protected linkService: LinkService,
-    protected dsoNameService: DSONameService
+    protected dsoNameService: DSONameService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig
   ) {
-    super(truncatableService, dsoNameService);
+    super(truncatableService, dsoNameService, appConfig);
   }
 
   /**
@@ -54,6 +61,7 @@ export class WorkflowItemSearchResultListElementComponent extends SearchResultLi
     super.ngOnInit();
     this.linkService.resolveLink(this.dso, followLink('item'));
     this.initItem(this.dso.item as Observable<RemoteData<Item>> );
+    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
   }
 
   /**
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 07e8aaa75d..6cdd6bd226 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
@@ -4,7 +4,11 @@
     [object]="object"
     [status]="status"></ds-themed-item-list-preview>
 
-  <ds-workspaceitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workspaceitem-actions>
+  <div class="row">
+    <div [ngClass]="showThumbnails ? 'offset-md-2 pl-3' : ''">
+      <ds-workspaceitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workspaceitem-actions>
+    </div>
+  </div>
 </ng-container>
 <ds-themed-loading
   *ngIf="!(item$ | async)"
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
index 87f5fd3733..1a20a06d61 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
@@ -18,6 +18,8 @@ import { WorkspaceItemSearchResultListElementComponent } from './workspace-item-
 import { By } from '@angular/platform-browser';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment';
 
 let component: WorkspaceItemSearchResultListElementComponent;
 let fixture: ComponentFixture<WorkspaceItemSearchResultListElementComponent>;
@@ -68,7 +70,8 @@ describe('WorkspaceItemSearchResultListElementComponent', () => {
         { provide: TruncatableService, useValue: {} },
         { provide: ItemDataService, useValue: {} },
         { provide: LinkService, useValue: linkService },
-        { provide: DSONameService, useClass: DSONameServiceMock }
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(WorkspaceItemSearchResultListElementComponent, {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
index 5edfc1929e..c52dc08085 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, Inject } from '@angular/core';
 
 import { Observable } from 'rxjs';
 import { find, map } from 'rxjs/operators';
@@ -16,6 +16,7 @@ import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { followLink } from '../../../utils/follow-link-config.model';
 import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
 
 /**
  * This component renders workspaceitem object for the search result in the list view.
@@ -39,12 +40,18 @@ export class WorkspaceItemSearchResultListElementComponent extends SearchResultL
    */
   status = MyDspaceItemStatusType.WORKSPACE;
 
+  /**
+   * Display thumbnails if required by configuration
+   */
+  showThumbnails: boolean;
+
   constructor(
     protected truncatableService: TruncatableService,
     protected linkService: LinkService,
-    protected dsoNameService: DSONameService
+    protected dsoNameService: DSONameService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig
   ) {
-    super(truncatableService, dsoNameService);
+    super(truncatableService, dsoNameService, appConfig);
   }
 
   /**
@@ -54,6 +61,7 @@ export class WorkspaceItemSearchResultListElementComponent extends SearchResultL
     super.ngOnInit();
     this.linkService.resolveLink(this.dso, followLink('item'));
     this.initItem(this.dso.item as Observable<RemoteData<Item>>);
+    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
   }
 
   /**
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
index bdfe825c82..3a62682be1 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
@@ -9,6 +9,8 @@ import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment';
 
 let collectionSearchResultListElementComponent: CollectionSearchResultListElementComponent;
 let fixture: ComponentFixture<CollectionSearchResultListElementComponent>;
@@ -49,7 +51,8 @@ describe('CollectionSearchResultListElementComponent', () => {
       declarations: [CollectionSearchResultListElementComponent, TruncatePipe],
       providers: [
         { provide: TruncatableService, useValue: truncatableServiceStub },
-        { provide: DSONameService, useClass: DSONameServiceMock }
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(CollectionSearchResultListElementComponent, {
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
index fdc6c4dfdc..e7f695001f 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
@@ -4,7 +4,6 @@ import { Collection } from '../../../../core/shared/collection.model';
 import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { environment } from '../../../../../environments/environment';
 
 @Component({
   selector: 'ds-collection-search-result-list-element',
@@ -24,7 +23,7 @@ export class CollectionSearchResultListElementComponent extends SearchResultList
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = environment.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
   }
 
 }
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
index 529594671c..bcaf03987a 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
@@ -9,6 +9,8 @@ import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment';
 
 let communitySearchResultListElementComponent: CommunitySearchResultListElementComponent;
 let fixture: ComponentFixture<CommunitySearchResultListElementComponent>;
@@ -49,7 +51,8 @@ describe('CommunitySearchResultListElementComponent', () => {
       declarations: [CommunitySearchResultListElementComponent, TruncatePipe],
       providers: [
         { provide: TruncatableService, useValue: truncatableServiceStub },
-        { provide: DSONameService, useClass: DSONameServiceMock }
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
index 32ea14aa43..e12a94f0ea 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
@@ -4,7 +4,6 @@ import { Community } from '../../../../core/shared/community.model';
 import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { environment } from '../../../../../environments/environment';
 
 @Component({
   selector: 'ds-community-search-result-list-element',
@@ -24,6 +23,6 @@ export class CommunitySearchResultListElementComponent extends SearchResultListE
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = environment.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
   }
 }
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
index 6be3f8b39c..33fb914b3c 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
@@ -10,6 +10,7 @@ import { ItemSearchResult } from '../../../../../object-collection/shared/item-s
 import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock, UNDEFINED_NAME } from '../../../../../mocks/dso-name.service.mock';
 import { environment } from '../../../../../../../environments/environment';
+import { APP_CONFIG } from '../../../../../../../config/app-config.interface';
 
 let publicationListElementComponent: ItemSearchResultListElementComponent;
 let fixture: ComponentFixture<ItemSearchResultListElementComponent>;
@@ -67,7 +68,8 @@ describe('ItemSearchResultListElementComponent', () => {
       declarations: [ItemSearchResultListElementComponent, TruncatePipe],
       providers: [
         { provide: TruncatableService, useValue: {} },
-        { provide: DSONameService, useClass: DSONameServiceMock }
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -214,7 +216,8 @@ describe('ItemSearchResultListElementComponent', () => {
       declarations: [ItemSearchResultListElementComponent, TruncatePipe],
       providers: [
         {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock}
+        {provide: DSONameService, useClass: DSONameServiceMock},
+        { provide: APP_CONFIG, useValue: environment }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index 4d2ea05e6c..bce78bd67f 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -5,7 +5,6 @@ import { ItemSearchResult } from '../../../../../object-collection/shared/item-s
 import { SearchResultListElementComponent } from '../../../search-result-list-element.component';
 import { Item } from '../../../../../../core/shared/item.model';
 import { getItemPageRoute } from '../../../../../../item-page/item-page-routing-paths';
-import { environment } from '../../../../../../../environments/environment';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement)
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement)
@@ -30,7 +29,7 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = environment.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
     this.itemPageRoute = getItemPageRoute(this.dso);
   }
 }
diff --git a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
index b85fb0a39f..72120a6b68 100644
--- a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 
 import { SearchResult } from '../../search/models/search-result.model';
@@ -8,6 +8,7 @@ import { AbstractListableElementComponent } from '../../object-collection/shared
 import { TruncatableService } from '../../truncatable/truncatable.service';
 import { Metadata } from '../../../core/shared/metadata.utils';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
 
 @Component({
   selector: 'ds-search-result-list-element',
@@ -20,7 +21,9 @@ export class SearchResultListElementComponent<T extends SearchResult<K>, K exten
   dso: K;
   dsoTitle: string;
 
-  public constructor(protected truncatableService: TruncatableService, protected dsoNameService: DSONameService) {
+  public constructor(protected truncatableService: TruncatableService,
+                     protected dsoNameService: DSONameService,
+                     @Inject(APP_CONFIG) protected appConfig?: AppConfig) {
     super();
   }
 
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
index 91f3ba6d88..ae8fbf94ca 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
@@ -1,7 +1,7 @@
 import { SearchResult } from '../../search/models/search-result.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { SearchResultListElementComponent } from '../search-result-list-element/search-result-list-element.component';
-import { Component } from '@angular/core';
+import { Component, Inject } from '@angular/core';
 import { hasValue, isNotEmpty } from '../../empty.util';
 import { Observable, of as observableOf } from 'rxjs';
 import { TruncatableService } from '../../truncatable/truncatable.service';
@@ -12,6 +12,7 @@ import { followLink } from '../../utils/follow-link-config.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Context } from '../../../core/shared/context.model';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
 
 @Component({
   selector: 'ds-sidebar-search-list-element',
@@ -42,7 +43,7 @@ export class SidebarSearchListElementComponent<T extends SearchResult<K>, K exte
                      protected linkService: LinkService,
                      protected dsoNameService: DSONameService
   ) {
-    super(truncatableService, dsoNameService);
+    super(truncatableService, dsoNameService, null);
   }
 
   /**
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index b9a9e2f8e4..146c8a8c89 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -142,6 +142,10 @@ ds-dynamic-form-control-container.d-none {
 .thumb-font-1 {
   .thumbnail-placeholder {
     font-size: 0.7rem !important;
+    @media screen and (max-width: map-get($grid-breakpoints, sm)) {
+      font-size: 1.1rem !important;
+      padding: 0.5rem;
+    }
     visibility: inherit;
   }
 }
@@ -154,6 +158,7 @@ ds-dynamic-form-control-container.d-none {
 .thumb-font-3 {
   .thumbnail-placeholder {
     font-size: 1.25rem !important;
+    padding: 0.5rem;
     visibility: inherit;
   }
 }

From 989d243c8ee00035ae19e558b4b7f2b12ebe9105 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Sun, 11 Sep 2022 14:49:02 -0700
Subject: [PATCH 32/73] Pooled task thumb and unused imports.

---
 .../person/person-search-result-list-element.component.ts  | 1 -
 .../pool-search-result-list-element.component.html         | 7 ++++++-
 .../pool-search-result-list-element.component.ts           | 6 ++++++
 .../sidebar-search-list-element.component.ts               | 1 -
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
index f87e08e40a..d78149c6b0 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
@@ -8,7 +8,6 @@ import {
 } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { environment } from '../../../../../../environments/environment';
 import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
 
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement)
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
index 346f9b249a..32ecd04315 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
@@ -4,5 +4,10 @@
                         [object]="object"
                         [showSubmitter]="showSubmitter"
                         [status]="status"></ds-themed-item-list-preview>
-  <ds-pool-task-actions id="actions" *ngIf="workflowitem" [object]="dso" (processCompleted)="this.reloadedObject.emit($event.reloadedObject)"></ds-pool-task-actions>
+  <div class="row">
+    <div [ngClass]="showThumbnails ? 'offset-md-2 pl-3' : ''">
+      <ds-pool-task-actions id="actions" *ngIf="workflowitem" [object]="dso"
+                            (processCompleted)="this.reloadedObject.emit($event.reloadedObject)"></ds-pool-task-actions>
+    </div>
+  </div>
 </ng-container>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
index 7278aca688..8a6fbffa8b 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
@@ -48,6 +48,11 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
    */
   public index: number;
 
+  /**
+   * Display thumbnails if required by configuration
+   */
+  showThumbnails: boolean;
+
   constructor(
     protected linkService: LinkService,
     protected truncatableService: TruncatableService,
@@ -66,6 +71,7 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
       followLink('item'), followLink('submitter')
     ), followLink('action'));
     this.workflowitemRD$ = this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>;
+    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
   }
 
 }
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
index ae8fbf94ca..90ab7a5971 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
@@ -12,7 +12,6 @@ import { followLink } from '../../utils/follow-link-config.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Context } from '../../../core/shared/context.model';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
 
 @Component({
   selector: 'ds-sidebar-search-list-element',

From 7f9c34f08e3cf1188599de036d0f76d3899ffb7f Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Sun, 11 Sep 2022 16:09:39 -0700
Subject: [PATCH 33/73] A bit of padding for the placeholder.

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

diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index 146c8a8c89..8d2d19ad9f 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -142,6 +142,7 @@ ds-dynamic-form-control-container.d-none {
 .thumb-font-1 {
   .thumbnail-placeholder {
     font-size: 0.7rem !important;
+    padding: 0.125rem;
     @media screen and (max-width: map-get($grid-breakpoints, sm)) {
       font-size: 1.1rem !important;
       padding: 0.5rem;
@@ -152,6 +153,7 @@ ds-dynamic-form-control-container.d-none {
 .thumb-font-2 {
   .thumbnail-placeholder {
     font-size: 0.9rem !important;
+    padding: 0.125rem;
     visibility: inherit;
   }
 }

From db79d46a764f403ff5c9f12a2589c995d46abe57 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Mon, 12 Sep 2022 13:13:56 -0700
Subject: [PATCH 34/73] Unused import.

---
 .../sidebar-search-list-element.component.ts                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
index 90ab7a5971..7f343c6dce 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
@@ -1,7 +1,7 @@
 import { SearchResult } from '../../search/models/search-result.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { SearchResultListElementComponent } from '../search-result-list-element/search-result-list-element.component';
-import { Component, Inject } from '@angular/core';
+import { Component } from '@angular/core';
 import { hasValue, isNotEmpty } from '../../empty.util';
 import { Observable, of as observableOf } from 'rxjs';
 import { TruncatableService } from '../../truncatable/truncatable.service';

From 78358a4067fd63e6dd835febc729c55939b41f56 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Tue, 13 Sep 2022 14:26:37 -0700
Subject: [PATCH 35/73] Multiple updates.

---
 config/config.example.yml                       |   2 +-
 .../browse-by-date-page.component.spec.ts       |   8 ++++----
 .../browse-by-date-page.component.ts            |  10 ++++++----
 .../browse-by-metadata-page.component.spec.ts   |   8 +++++---
 .../browse-by-metadata-page.component.ts        |  11 ++++++-----
 .../browse-by-title-page.component.spec.ts      |   8 ++++----
 .../browse-by-title-page.component.ts           |  11 +++++++----
 .../collection-page.component.ts                |   8 +++++---
 src/app/community-page.tar.gz                   | Bin 16872 -> 0 bytes
 src/app/core/browse/browse.service.ts           |   9 +++------
 ...ue-search-result-list-element.component.html |   4 ++--
 ...search-result-list-element.component.spec.ts |   8 ++++----
 ...ssue-search-result-list-element.component.ts |   2 +-
 ...me-search-result-list-element.component.html |   4 ++--
 ...search-result-list-element.component.spec.ts |   8 ++++----
 ...lume-search-result-list-element.component.ts |   2 +-
 ...al-search-result-list-element.component.html |   4 ++--
 ...search-result-list-element.component.spec.ts |   8 ++++----
 ...rnal-search-result-list-element.component.ts |   2 +-
 ...it-search-result-list-element.component.html |   4 ++--
 ...search-result-list-element.component.spec.ts |   8 ++++----
 ...unit-search-result-list-element.component.ts |   2 +-
 ...on-search-result-list-element.component.html |   4 ++--
 ...search-result-list-element.component.spec.ts |   8 ++++----
 ...rson-search-result-list-element.component.ts |   2 +-
 ...ct-search-result-list-element.component.html |   4 ++--
 ...search-result-list-element.component.spec.ts |   8 ++++----
 ...ject-search-result-list-element.component.ts |   2 +-
 ...-result-list-submission-element.component.ts |   2 +-
 ...esult-list-submission-element.component.html |   4 ++--
 ...-result-list-submission-element.component.ts |   2 +-
 .../item-list-preview.component.html            |   4 ++--
 .../item-list-preview.component.ts              |   2 +-
 ...esult-list-element-submission.component.html |   2 +-
 ...-result-list-element-submission.component.ts |   2 +-
 ...ol-search-result-list-element.component.html |   2 +-
 ...pool-search-result-list-element.component.ts |   2 +-
 ...em-search-result-list-element.component.html |   2 +-
 ...item-search-result-list-element.component.ts |   2 +-
 ...em-search-result-list-element.component.html |   2 +-
 ...item-search-result-list-element.component.ts |   2 +-
 ...on-search-result-list-element.component.html |   4 ++--
 ...tion-search-result-list-element.component.ts |   2 +-
 ...ty-search-result-list-element.component.html |   2 +-
 ...nity-search-result-list-element.component.ts |   2 +-
 ...em-search-result-list-element.component.html |   4 ++--
 ...search-result-list-element.component.spec.ts |   8 ++++----
 ...item-search-result-list-element.component.ts |   2 +-
 src/config/browse-by-config.interface.ts        |   2 +-
 src/config/default-app-config.ts                |   2 +-
 src/environments/environment.test.ts            |   2 +-
 src/styles/_custom_variables.scss               |   2 +-
 src/styles/_global-styles.scss                  |   4 ++--
 53 files changed, 116 insertions(+), 109 deletions(-)
 delete mode 100644 src/app/community-page.tar.gz

diff --git a/config/config.example.yml b/config/config.example.yml
index 37d8a97a68..c46e193c6e 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -169,7 +169,7 @@ browseBy:
   # The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
   defaultLowerLimit: 1900
   # If true, thumbnail images for items will be added to BOTH search and browse result lists.
-  showItemThumbnails: true
+  showThumbnails: true
 
 # Item Config
 item:
diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
index 15ec9d78db..5c2a6d820e 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
@@ -18,11 +18,10 @@ import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-
 import { toRemoteData } from '../browse-by-metadata-page/browse-by-metadata-page.component.spec';
 import { VarDirective } from '../../shared/utils/var.directive';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { FindListOptions } from '../../core/data/find-list-options.model';
+import { APP_CONFIG } from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment';
 
 describe('BrowseByDatePageComponent', () => {
   let comp: BrowseByDatePageComponent;
@@ -83,7 +82,8 @@ describe('BrowseByDatePageComponent', () => {
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
         { provide: Router, useValue: new RouterMock() },
         { provide: PaginationService, useValue: paginationService },
-        { provide: ChangeDetectorRef, useValue: mockCdRef }
+        { provide: ChangeDetectorRef, useValue: mockCdRef },
+        { provide: APP_CONFIG, useValue: environment }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
index caa7891861..ca13637556 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component } from '@angular/core';
+import { ChangeDetectorRef, Component, Inject } from '@angular/core';
 import {
   BrowseByMetadataPageComponent,
   browseParamsToOptions
@@ -19,6 +19,7 @@ import { map } from 'rxjs/operators';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { isValidDate } from '../../shared/date.util';
+import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 
 @Component({
   selector: 'ds-browse-by-date-page',
@@ -43,15 +44,16 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
                      protected dsoService: DSpaceObjectDataService,
                      protected router: Router,
                      protected paginationService: PaginationService,
-                     protected cdRef: ChangeDetectorRef) {
-    super(route, browseService, dsoService, paginationService, router);
+                     protected cdRef: ChangeDetectorRef,
+                     @Inject(APP_CONFIG) protected appConfig: AppConfig) {
+    super(route, browseService, dsoService, paginationService, router, appConfig);
   }
 
   ngOnInit(): void {
     const sortConfig = new SortOptions('default', SortDirection.ASC);
     this.startsWithType = StartsWithType.date;
     this.updatePage(new BrowseEntrySearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, null,
-      null, this.embedThumbnail));
+      null));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
index 623537484b..ac3aa3cd02 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
@@ -14,7 +14,7 @@ import { RemoteData } from '../../core/data/remote-data';
 import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { SortDirection } from '../../core/cache/models/sort-options.model';
 import { Item } from '../../core/shared/item.model';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { Community } from '../../core/shared/community.model';
@@ -26,6 +26,7 @@ import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { environment } from '../../../environments/environment';
+import { APP_CONFIG } from '../../../config/app-config.interface';
 
 describe('BrowseByMetadataPageComponent', () => {
   let comp: BrowseByMetadataPageComponent;
@@ -98,14 +99,15 @@ describe('BrowseByMetadataPageComponent', () => {
         { provide: BrowseService, useValue: mockBrowseService },
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
         { provide: PaginationService, useValue: paginationService },
-        { provide: Router, useValue: new RouterMock() }
+        { provide: Router, useValue: new RouterMock() },
+        { provide: APP_CONFIG, useValue: environment }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
   }));
 
   beforeEach(() => {
-    environment.browseBy.showItemThumbnails = true;
+    environment.browseBy.showThumbnails = true;
     fixture = TestBed.createComponent(BrowseByMetadataPageComponent);
     comp = fixture.componentInstance;
     fixture.detectChanges();
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
index 0bcd6115a6..2c0e05302c 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -1,5 +1,5 @@
 import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { Component, OnInit } from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
@@ -17,8 +17,7 @@ import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
 import { BrowseByDataType, rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { map } from 'rxjs/operators';
-import { environment } from '../../../environments/environment';
-
+import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 
 export const BBM_PAGINATION_ID = 'bbm';
 
@@ -122,8 +121,9 @@ export class BrowseByMetadataPageComponent implements OnInit {
                      protected browseService: BrowseService,
                      protected dsoService: DSpaceObjectDataService,
                      protected paginationService: PaginationService,
-                     protected router: Router) {
-    this.embedThumbnail = environment.browseBy.showItemThumbnails;
+                     protected router: Router,
+                     @Inject(APP_CONFIG) protected appConfig: AppConfig) {
+    this.embedThumbnail = this.appConfig.browseBy.showThumbnails;
   }
 
   ngOnInit(): void {
@@ -172,6 +172,7 @@ export class BrowseByMetadataPageComponent implements OnInit {
    *                          scope: string }
    */
   updatePage(searchOptions: BrowseEntrySearchOptions) {
+    searchOptions.embedThumbnail = this.embedThumbnail;
     this.browseEntries$ = this.browseService.getBrowseEntriesFor(searchOptions);
     this.items$ = undefined;
   }
diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
index 554b059ac5..dcee77a12b 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
@@ -18,11 +18,10 @@ import { BrowseService } from '../../core/browse/browse.service';
 import { RouterMock } from '../../shared/mocks/router.mock';
 import { VarDirective } from '../../shared/utils/var.directive';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { FindListOptions } from '../../core/data/find-list-options.model';
+import { APP_CONFIG } from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment';
 
 describe('BrowseByTitlePageComponent', () => {
   let comp: BrowseByTitlePageComponent;
@@ -77,7 +76,8 @@ describe('BrowseByTitlePageComponent', () => {
         { provide: BrowseService, useValue: mockBrowseService },
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
         { provide: PaginationService, useValue: paginationService },
-        { provide: Router, useValue: new RouterMock() }
+        { provide: Router, useValue: new RouterMock() },
+        { provide: APP_CONFIG, useValue: environment }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
index d0782b38e5..4fd7087019 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
@@ -1,5 +1,5 @@
 import { combineLatest as observableCombineLatest } from 'rxjs';
-import { Component } from '@angular/core';
+import { Component, Inject } from '@angular/core';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { hasValue } from '../../shared/empty.util';
 import {
@@ -14,6 +14,8 @@ import { BrowseByDataType, rendersBrowseBy } from '../browse-by-switcher/browse-
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { map } from 'rxjs/operators';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment';
 
 @Component({
   selector: 'ds-browse-by-title-page',
@@ -30,14 +32,15 @@ export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
                      protected browseService: BrowseService,
                      protected dsoService: DSpaceObjectDataService,
                      protected paginationService: PaginationService,
-                     protected router: Router) {
-    super(route, browseService, dsoService, paginationService, router);
+                     protected router: Router,
+                     @Inject(APP_CONFIG) protected appConfig: AppConfig) {
+    super(route, browseService, dsoService, paginationService, router, appConfig);
   }
 
   ngOnInit(): void {
     const sortConfig = new SortOptions('dc.title', SortDirection.ASC);
     this.updatePage(new BrowseEntrySearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, null,
-      null, this.embedThumbnail));
+      null));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
diff --git a/src/app/collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts
index 1f30824877..2171942ef2 100644
--- a/src/app/collection-page/collection-page.component.ts
+++ b/src/app/collection-page/collection-page.component.ts
@@ -28,7 +28,9 @@ import { AuthorizationDataService } from '../core/data/feature-authorization/aut
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
 import { getCollectionPageRoute } from './collection-page-routing-paths';
 import { redirectOn4xx } from '../core/shared/authorized.operators';
-import { BROWSE_ITEM_LINKS_TO_FOLLOW } from '../core/browse/browse.service';
+import { BROWSE_LINKS_TO_FOLLOW } from '../core/browse/browse.service';
+import { DSpaceObject } from '../core/shared/dspace-object.model';
+import { FollowLinkConfig } from '../shared/utils/follow-link-config.model';
 
 @Component({
   selector: 'ds-collection-page',
@@ -104,13 +106,13 @@ export class CollectionPageComponent implements OnInit {
         getFirstSucceededRemoteData(),
         map((rd) => rd.payload.id),
         switchMap((id: string) => {
-          return this.searchService.search(
+          return this.searchService.search<Item>(
             new PaginatedSearchOptions({
               scope: id,
               pagination: currentPagination,
               sort: currentSort,
               dsoTypes: [DSpaceObjectType.ITEM]
-            }), null, true, true, ...BROWSE_ITEM_LINKS_TO_FOLLOW)
+            }), null, true, true, ...BROWSE_LINKS_TO_FOLLOW)
             .pipe(toDSpaceObjectListRD()) as Observable<RemoteData<PaginatedList<Item>>>;
         }),
         startWith(undefined) // Make sure switching pages shows loading component
diff --git a/src/app/community-page.tar.gz b/src/app/community-page.tar.gz
deleted file mode 100644
index 33169aa5094ba1a326e2a50b3842f4b46000008d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16872
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

diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
index 46524e4385..63d5a8a360 100644
--- a/src/app/core/browse/browse.service.ts
+++ b/src/app/core/browse/browse.service.ts
@@ -23,11 +23,8 @@ import { BrowseDefinitionDataService } from './browse-definition-data.service';
 import { HrefOnlyDataService } from '../data/href-only-data.service';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 
-const BROWSE_ENTRY_LINKS_TO_FOLLOW: FollowLinkConfig<BrowseEntry>[] = [
-  followLink('thumbnail')
-];
 
-export const BROWSE_ITEM_LINKS_TO_FOLLOW: FollowLinkConfig<Item>[] = [
+export const BROWSE_LINKS_TO_FOLLOW: FollowLinkConfig<BrowseEntry | Item>[] = [
   followLink('thumbnail')
 ];
 
@@ -106,7 +103,7 @@ export class BrowseService {
       })
     );
     if (options.embedThumbnail) {
-      return this.hrefOnlyDataService.findAllByHref<BrowseEntry>(href$, {}, null, null, ...BROWSE_ENTRY_LINKS_TO_FOLLOW);
+      return this.hrefOnlyDataService.findAllByHref<BrowseEntry>(href$, {}, null, null, ...BROWSE_LINKS_TO_FOLLOW);
     }
     return this.hrefOnlyDataService.findAllByHref<BrowseEntry>(href$);
   }
@@ -154,7 +151,7 @@ export class BrowseService {
       }),
     );
     if (options.embedThumbnail) {
-      return this.hrefOnlyDataService.findAllByHref<Item>(href$, {}, null, null, ...BROWSE_ITEM_LINKS_TO_FOLLOW);
+      return this.hrefOnlyDataService.findAllByHref<Item>(href$, {}, null, null, ...BROWSE_LINKS_TO_FOLLOW);
     }
     return this.hrefOnlyDataService.findAllByHref<Item>(href$);
   }
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index 9b47a7fb7a..d93639a5d9 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -1,5 +1,5 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-md-2">
+  <div *ngIf="showThumbnails" class="col-3 col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        rel="noopener noreferrer"
        [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
@@ -7,7 +7,7 @@
       </ds-thumbnail>
     </a>
   </div>
-  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+  <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
     <ds-truncatable [id]="dso.id">
       <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
index c56db015a6..b754173c39 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
@@ -76,13 +76,13 @@ describe('JournalIssueSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showItemThumbnails = true;
+    environment.browseBy.showThumbnails = true;
     fixture = TestBed.createComponent(JournalIssueSearchResultListElementComponent);
     journalIssueListElementComponent = fixture.componentInstance;
 
   }));
 
-  describe('with environment.browseBy.showItemThumbnails set to true', () => {
+  describe('with environment.browseBy.showThumbnails set to true', () => {
     beforeEach(() => {
       journalIssueListElementComponent.object = mockItemWithMetadata;
       fixture.detectChanges();
@@ -165,12 +165,12 @@ describe('JournalIssueSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showItemThumbnails = false;
+    environment.browseBy.showThumbnails = false;
     fixture = TestBed.createComponent(JournalIssueSearchResultListElementComponent);
     journalIssueListElementComponent = fixture.componentInstance;
   }));
 
-  describe('with environment.browseBy.showItemThumbnails set to false', () => {
+  describe('with environment.browseBy.showThumbnails set to false', () => {
     beforeEach(() => {
 
       journalIssueListElementComponent.object = mockItemWithMetadata;
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
index ce017a5712..88f93d9d85 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
@@ -21,7 +21,7 @@ export class JournalIssueSearchResultListElementComponent extends ItemSearchResu
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 
 }
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
index 04991cb6f0..2226d03649 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
@@ -1,5 +1,5 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-md-2">
+  <div *ngIf="showThumbnails" class="col-3 col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        rel="noopener noreferrer"
        [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
@@ -7,7 +7,7 @@
       </ds-thumbnail>
     </a>
   </div>
-  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+  <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
     <ds-truncatable [id]="dso.id">
       <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
index 8277ec946d..cf3274cc14 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
@@ -75,13 +75,13 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showItemThumbnails = true;
+    environment.browseBy.showThumbnails = true;
     fixture = TestBed.createComponent(JournalVolumeSearchResultListElementComponent);
     journalVolumeListElementComponent = fixture.componentInstance;
 
   }));
 
-  describe('with environment.browseBy.showItemThumbnails set to true', () => {
+  describe('with environment.browseBy.showThumbnails set to true', () => {
     beforeEach(() => {
       journalVolumeListElementComponent.object = mockItemWithMetadata;
       fixture.detectChanges();
@@ -163,12 +163,12 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showItemThumbnails = false;
+    environment.browseBy.showThumbnails = false;
     fixture = TestBed.createComponent(JournalVolumeSearchResultListElementComponent);
     journalVolumeListElementComponent = fixture.componentInstance;
   }));
 
-  describe('with environment.browseBy.showItemThumbnails set to false', () => {
+  describe('with environment.browseBy.showThumbnails set to false', () => {
     beforeEach(() => {
       journalVolumeListElementComponent.object = mockItemWithMetadata;
       fixture.detectChanges();
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
index fa01a54fa4..ec98946937 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
@@ -21,7 +21,7 @@ export class JournalVolumeSearchResultListElementComponent extends ItemSearchRes
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 
 }
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
index 58ad5ab364..3cafccf0b9 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
@@ -1,12 +1,12 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-md-2">
+  <div *ngIf="showThumbnails" class="col-3 col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
        [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
       </ds-thumbnail>
     </a>
   </div>
-  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+  <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
     <ds-truncatable [id]="dso.id">
       <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
index 45dcc1e15a..433d05f6d4 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
@@ -71,13 +71,13 @@ describe('JournalSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showItemThumbnails = true;
+    environment.browseBy.showThumbnails = true;
     fixture = TestBed.createComponent(JournalSearchResultListElementComponent);
     journalListElementComponent = fixture.componentInstance;
 
   }));
 
-  describe('with environment.browseBy.showItemThumbnails set to true', () => {
+  describe('with environment.browseBy.showThumbnails set to true', () => {
     beforeEach(() => {
       journalListElementComponent.object = mockItemWithMetadata;
       fixture.detectChanges();
@@ -135,12 +135,12 @@ describe('JournalSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showItemThumbnails = false;
+    environment.browseBy.showThumbnails = false;
     fixture = TestBed.createComponent(JournalSearchResultListElementComponent);
     journalListElementComponent = fixture.componentInstance;
   }));
 
-  describe('with environment.browseBy.showItemThumbnails set to false', () => {
+  describe('with environment.browseBy.showThumbnails set to false', () => {
     beforeEach(() => {
 
       journalListElementComponent.object = mockItemWithMetadata;
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
index 0c94e084c7..199bd3a748 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
@@ -21,7 +21,7 @@ export class JournalSearchResultListElementComponent extends ItemSearchResultLis
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 
 }
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
index 4d40b3450a..f3f5099211 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
@@ -1,5 +1,5 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-md-2">
+  <div *ngIf="showThumbnails" class="col-3 col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        rel="noopener noreferrer"
        [routerLink]="[itemPageRoute]" class="dont-break-out">
@@ -10,7 +10,7 @@
       </ds-thumbnail>
     </a>
   </div>
-  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+  <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
     <ds-truncatable [id]="dso.id">
       <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
index 1cd46832b2..e65377f682 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
@@ -69,13 +69,13 @@ describe('OrgUnitSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showItemThumbnails = true;
+    environment.browseBy.showThumbnails = true;
     fixture = TestBed.createComponent(OrgUnitSearchResultListElementComponent);
     orgUnitListElementComponent = fixture.componentInstance;
 
   }));
 
-  describe('with environment.browseBy.showItemThumbnails set to true', () => {
+  describe('with environment.browseBy.showThumbnails set to true', () => {
     beforeEach(() => {
       orgUnitListElementComponent.object = mockItemWithMetadata;
       fixture.detectChanges();
@@ -133,12 +133,12 @@ describe('OrgUnitSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showItemThumbnails = false;
+    environment.browseBy.showThumbnails = false;
     fixture = TestBed.createComponent(OrgUnitSearchResultListElementComponent);
     orgUnitListElementComponent = fixture.componentInstance;
   }));
 
-  describe('with environment.browseBy.showItemThumbnails set to false', () => {
+  describe('with environment.browseBy.showThumbnails set to false', () => {
     beforeEach(() => {
 
       orgUnitListElementComponent.object = mockItemWithMetadata;
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
index e3d6ab171b..baa27cdf0c 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
@@ -21,7 +21,7 @@ export class OrgUnitSearchResultListElementComponent extends ItemSearchResultLis
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 
 }
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
index 55aec9854d..e3c7767802 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
@@ -1,5 +1,5 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-md-2">
+  <div *ngIf="showThumbnails" class="col-3 col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        rel="noopener noreferrer"
        [routerLink]="[itemPageRoute]" class="dont-break-out">
@@ -10,7 +10,7 @@
       </ds-thumbnail>
     </a>
   </div>
-  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+  <div [ngClass]="showThumbnails ? 'col-9 col-md-10' : 'col-12'">
     <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
     <ds-truncatable [id]="dso.id">
       <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
index 3092430065..96bfda48ad 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
@@ -69,13 +69,13 @@ describe('PersonSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showItemThumbnails = true;
+    environment.browseBy.showThumbnails = true;
     fixture = TestBed.createComponent(PersonSearchResultListElementComponent);
     personListElementComponent = fixture.componentInstance;
 
   }));
 
-  describe('with environment.browseBy.showItemThumbnails set to true', () => {
+  describe('with environment.browseBy.showThumbnails set to true', () => {
     beforeEach(() => {
       personListElementComponent.object = mockItemWithMetadata;
       fixture.detectChanges();
@@ -133,12 +133,12 @@ describe('PersonSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showItemThumbnails = false;
+    environment.browseBy.showThumbnails = false;
     fixture = TestBed.createComponent(PersonSearchResultListElementComponent);
     personListElementComponent = fixture.componentInstance;
   }));
 
-  describe('with environment.browseBy.showItemThumbnails set to false', () => {
+  describe('with environment.browseBy.showThumbnails set to false', () => {
     beforeEach(() => {
 
       personListElementComponent.object = mockItemWithMetadata;
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
index d78149c6b0..186c79eab9 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
@@ -34,7 +34,7 @@ export class PersonSearchResultListElementComponent extends ItemSearchResultList
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 
   /**
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
index b63841eccb..3cfc6eaeb4 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
@@ -1,5 +1,5 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-md-2">
+  <div *ngIf="showThumbnails" class="col-3 col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        rel="noopener noreferrer"
        [routerLink]="[itemPageRoute]" class="dont-break-out">
@@ -10,7 +10,7 @@
       </ds-thumbnail>
     </a>
   </div>
-  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+  <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <ds-truncatable [id]="dso.id">
       <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
       <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
index 4274db08f5..eb06acfa8d 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
@@ -70,13 +70,13 @@ describe('ProjectSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showItemThumbnails = true;
+    environment.browseBy.showThumbnails = true;
     fixture = TestBed.createComponent(ProjectSearchResultListElementComponent);
     projectListElementComponent = fixture.componentInstance;
 
   }));
 
-  describe('with environment.browseBy.showItemThumbnails set to true', () => {
+  describe('with environment.browseBy.showThumbnails set to true', () => {
     beforeEach(() => {
       projectListElementComponent.object = mockItemWithMetadata;
       fixture.detectChanges();
@@ -135,12 +135,12 @@ describe('ProjectSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showItemThumbnails = false;
+    environment.browseBy.showThumbnails = false;
     fixture = TestBed.createComponent(ProjectSearchResultListElementComponent);
     projectListElementComponent = fixture.componentInstance;
   }));
 
-  describe('with environment.browseBy.showItemThumbnails set to false', () => {
+  describe('with environment.browseBy.showThumbnails set to false', () => {
     beforeEach(() => {
 
       projectListElementComponent.object = mockItemWithMetadata;
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
index e5d4c04c75..88e95528ac 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
@@ -21,7 +21,7 @@ export class ProjectSearchResultListElementComponent extends ItemSearchResultLis
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 
 }
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
index e550e9fc8a..8113c4c54b 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
@@ -72,7 +72,7 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
           }
         );
     }
-    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 
   select(value) {
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
index 6f9773678a..7d1ab508b7 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
@@ -1,5 +1,5 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-md-2">
+  <div *ngIf="showThumbnails" class="col-3 col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        rel="noopener noreferrer" class="dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
@@ -9,7 +9,7 @@
       </ds-thumbnail>
     </a>
   </div>
-  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+  <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <div class="d-flex">
       <div class="flex-grow-1">
         <ds-person-input-suggestions [suggestions]="allSuggestions" [(ngModel)]="selectedName"
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
index 5ff1d31741..3c4b008324 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
@@ -65,7 +65,7 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu
         this.selectedName = nameVariant || defaultValue;
         }
       );
-    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 
   select(value) {
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 cfc75a3c82..daa89ec806 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
@@ -1,9 +1,9 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-md-2">
+  <div *ngIf="showThumbnails" class="col-3 col-md-2">
     <ds-thumbnail [thumbnail]="item?.thumbnail | async" [limitWidth]="true">
     </ds-thumbnail>
   </div>
-  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+  <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <div *ngIf="item" @fadeInOut>
       <ng-container *ngIf="status">
         <ds-mydspace-item-status [status]="status"></ds-mydspace-item-status>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
index 08415db308..3b52e0b879 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
@@ -47,6 +47,6 @@ export class ItemListPreviewComponent implements OnInit{
   }
 
   ngOnInit(): void {
-    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 }
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html
index 64579682cb..b5e9155b81 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html
@@ -3,7 +3,7 @@
                       [status]="status"></ds-themed-item-list-preview>
 
 <div class="row">
-  <div [ngClass]="showThumbnails ? 'offset-md-2 pl-3' : ''">
+  <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 pl-3' : ''">
     <ds-item-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-item-actions>
   </div>
 </div>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts
index d81a68de74..26cbafc102 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts
@@ -32,6 +32,6 @@ export class ItemSearchResultListElementSubmissionComponent extends SearchResult
 
   ngOnInit() {
     super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 }
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
index 32ecd04315..cf5d54564c 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
@@ -5,7 +5,7 @@
                         [showSubmitter]="showSubmitter"
                         [status]="status"></ds-themed-item-list-preview>
   <div class="row">
-    <div [ngClass]="showThumbnails ? 'offset-md-2 pl-3' : ''">
+    <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2pl-3' : ''">
       <ds-pool-task-actions id="actions" *ngIf="workflowitem" [object]="dso"
                             (processCompleted)="this.reloadedObject.emit($event.reloadedObject)"></ds-pool-task-actions>
     </div>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
index 8a6fbffa8b..71feeb6bdd 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
@@ -71,7 +71,7 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
       followLink('item'), followLink('submitter')
     ), followLink('action'));
     this.workflowitemRD$ = this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>;
-    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 
 }
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 aceb235eaa..74a2433ba3 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
@@ -4,7 +4,7 @@
     [object]="object"
     [status]="status"></ds-themed-item-list-preview>
   <div class="row">
-    <div [ngClass]="showThumbnails ? 'offset-md-2 pl-3' : ''">
+    <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2  pl-3' : ''">
       <ds-workflowitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workflowitem-actions>
     </div>
   </div>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
index b6e641acd5..f123caf1ac 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
@@ -61,7 +61,7 @@ export class WorkflowItemSearchResultListElementComponent extends SearchResultLi
     super.ngOnInit();
     this.linkService.resolveLink(this.dso, followLink('item'));
     this.initItem(this.dso.item as Observable<RemoteData<Item>> );
-    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 
   /**
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 6cdd6bd226..4781b87f01 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
@@ -5,7 +5,7 @@
     [status]="status"></ds-themed-item-list-preview>
 
   <div class="row">
-    <div [ngClass]="showThumbnails ? 'offset-md-2 pl-3' : ''">
+    <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2  pl-3' : ''">
       <ds-workspaceitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workspaceitem-actions>
     </div>
   </div>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
index c52dc08085..675cdef975 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
@@ -61,7 +61,7 @@ export class WorkspaceItemSearchResultListElementComponent extends SearchResultL
     super.ngOnInit();
     this.linkService.resolveLink(this.dso, followLink('item'));
     this.initItem(this.dso.item as Observable<RemoteData<Item>>);
-    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 
   /**
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
index 55c377b749..83a8f4fdfa 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
@@ -1,6 +1,6 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="offset-md-2"></div>
-  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+  <div *ngIf="showThumbnails" class="offset-3 offset-md-2 "></div>
+  <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/collections/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
     <span *ngIf="linkType == linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
index e7f695001f..60415f649e 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
@@ -23,7 +23,7 @@ export class CollectionSearchResultListElementComponent extends SearchResultList
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 
 }
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
index ba5d5ebc23..22be357a53 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
@@ -1,6 +1,6 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="offset-md-2"></div>
-  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+  <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"  [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
     <span *ngIf="linkType == linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
index e12a94f0ea..4cc25b8b76 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
@@ -23,6 +23,6 @@ export class CommunitySearchResultListElementComponent extends SearchResultListE
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 }
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index c2dbb4b3df..90a6633980 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -1,12 +1,12 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-md-2">
+  <div *ngIf="showThumbnails" class="col-3 col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
        [routerLink]="[itemPageRoute]" class="dont-break-out">
     <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
     </ds-thumbnail>
     </a>
   </div>
-  <div [ngClass]="showThumbnails ? 'col-md-10' : 'col-md-12'">
+  <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <div class="d-flex">
       <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
       <ds-access-status-badge [item]="dso" class="pl-1"></ds-access-status-badge>
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
index 33fb914b3c..80dd80658b 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
@@ -79,13 +79,13 @@ describe('ItemSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showItemThumbnails = true;
+    environment.browseBy.showThumbnails = true;
     fixture = TestBed.createComponent(ItemSearchResultListElementComponent);
     publicationListElementComponent = fixture.componentInstance;
 
   }));
 
-  describe('with environment.browseBy.showItemThumbnails set to true', () => {
+  describe('with environment.browseBy.showThumbnails set to true', () => {
     beforeEach(() => {
       publicationListElementComponent.object = mockItemWithMetadata;
       fixture.detectChanges();
@@ -227,12 +227,12 @@ describe('ItemSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showItemThumbnails = false;
+    environment.browseBy.showThumbnails = false;
     fixture = TestBed.createComponent(ItemSearchResultListElementComponent);
     publicationListElementComponent = fixture.componentInstance;
   }));
 
-  describe('with environment.browseBy.showItemThumbnails set to false', () => {
+  describe('with environment.browseBy.showThumbnails set to false', () => {
     beforeEach(() => {
 
       publicationListElementComponent.object = mockItemWithMetadata;
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index bce78bd67f..f84ae642ad 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -29,7 +29,7 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showItemThumbnails;
+    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
     this.itemPageRoute = getItemPageRoute(this.dso);
   }
 }
diff --git a/src/config/browse-by-config.interface.ts b/src/config/browse-by-config.interface.ts
index 86f4d7ea9f..b029482edc 100644
--- a/src/config/browse-by-config.interface.ts
+++ b/src/config/browse-by-config.interface.ts
@@ -22,5 +22,5 @@ export interface BrowseByConfig extends Config {
   /**
    *  If true, thumbnail images for items will be added to BOTH search and browse result lists.
    */
-  showItemThumbnails: boolean;
+  showThumbnails: boolean;
 }
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index b80b0aa73a..f3bd189102 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -207,7 +207,7 @@ export class DefaultAppConfig implements AppConfig {
     // The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
     defaultLowerLimit: 1900,
     // Whether to add item thumbnail images to BOTH browse and search result lists.
-    showItemThumbnails: true
+    showThumbnails: true
   };
 
   // Item Config
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 6cbe55cea0..806652a2fa 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -200,7 +200,7 @@ export const environment: BuildConfig = {
     // The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
     defaultLowerLimit: 1900,
     // Whether to add item thumbnail images to BOTH browse and search result lists.
-    showItemThumbnails: true
+    showThumbnails: true
   },
 
   item: {
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 40180d8342..2000e007a0 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -45,7 +45,7 @@
   --ds-edit-item-metadata-field-width: 190px;
   --ds-edit-item-language-field-width: 43px;
 
-  --ds-thumbnail-max-width: 175px;
+  --ds-thumbnail-max-width: 125px;
   --ds-thumbnail-placeholder-background: #{$gray-100};
   --ds-thumbnail-placeholder-border: 1px solid #{$gray-300};
   --ds-thumbnail-placeholder-color: #{lighten($gray-800, 7%)};
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index 8d2d19ad9f..df6652a02d 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -144,8 +144,8 @@ ds-dynamic-form-control-container.d-none {
     font-size: 0.7rem !important;
     padding: 0.125rem;
     @media screen and (max-width: map-get($grid-breakpoints, sm)) {
-      font-size: 1.1rem !important;
-      padding: 0.5rem;
+      font-size: 0.5rem !important;
+      padding: 0.1rem;
     }
     visibility: inherit;
   }

From 4fff311fe49dc6d732ebd6f057082c7e84c175ef Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Tue, 13 Sep 2022 14:59:55 -0700
Subject: [PATCH 36/73] Ah those sneaky unused imports.

---
 .../browse-by-title-page/browse-by-title-page.component.ts      | 1 -
 src/app/collection-page/collection-page.component.ts            | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
index 4fd7087019..351d177899 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
@@ -15,7 +15,6 @@ import { PaginationService } from '../../core/pagination/pagination.service';
 import { map } from 'rxjs/operators';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
-import { environment } from '../../../environments/environment';
 
 @Component({
   selector: 'ds-browse-by-title-page',
diff --git a/src/app/collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts
index 2171942ef2..f730f44658 100644
--- a/src/app/collection-page/collection-page.component.ts
+++ b/src/app/collection-page/collection-page.component.ts
@@ -29,8 +29,6 @@ import { FeatureID } from '../core/data/feature-authorization/feature-id';
 import { getCollectionPageRoute } from './collection-page-routing-paths';
 import { redirectOn4xx } from '../core/shared/authorized.operators';
 import { BROWSE_LINKS_TO_FOLLOW } from '../core/browse/browse.service';
-import { DSpaceObject } from '../core/shared/dspace-object.model';
-import { FollowLinkConfig } from '../shared/utils/follow-link-config.model';
 
 @Component({
   selector: 'ds-collection-page',

From 84ad250de6602ec2494ddd3794198f62f9d89729 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Wed, 14 Sep 2022 11:14:46 -0700
Subject: [PATCH 37/73] New and updated tests.

Unused import.
---
 .../browse-by-date-page.component.ts          |  7 +-
 .../browse-by-metadata-page.component.spec.ts | 10 ++-
 ...arch-result-list-element.component.spec.ts | 19 +++--
 ...arch-result-list-element.component.spec.ts | 19 +++--
 ...arch-result-list-element.component.spec.ts | 19 +++--
 ...arch-result-list-element.component.spec.ts | 21 +++--
 ...arch-result-list-element.component.spec.ts | 19 +++--
 ...arch-result-list-element.component.spec.ts | 19 +++--
 ...-list-submission-element.component.spec.ts |  2 +
 ...-list-submission-element.component.spec.ts | 83 ++++++++++++++++++-
 .../browse-by/browse-by.component.spec.ts     |  2 +-
 .../item-list-preview.component.spec.ts       | 71 +++++++++++++++-
 ...-search-result-list-element.component.html |  2 +-
 ...arch-result-list-element.component.spec.ts | 15 +++-
 ...arch-result-list-element.component.spec.ts | 17 +++-
 ...arch-result-list-element.component.spec.ts | 16 +++-
 ...arch-result-list-element.component.spec.ts | 16 +++-
 ...arch-result-list-element.component.spec.ts | 15 +++-
 ...arch-result-list-element.component.spec.ts | 22 +++--
 19 files changed, 333 insertions(+), 61 deletions(-)

diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
index ca13637556..7da6b5ede0 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
@@ -13,7 +13,6 @@ import { BrowseService } from '../../core/browse/browse.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
 import { BrowseByDataType, rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
-import { environment } from '../../../environments/environment';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { map } from 'rxjs/operators';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
@@ -86,7 +85,7 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
   updateStartsWithOptions(definition: string, metadataKeys: string[], scope?: string) {
     this.subs.push(
       this.browseService.getFirstItemFor(definition, scope).subscribe((firstItemRD: RemoteData<Item>) => {
-        let lowerLimit = environment.browseBy.defaultLowerLimit;
+        let lowerLimit = this.appConfig.browseBy.defaultLowerLimit;
         if (hasValue(firstItemRD.payload)) {
           const date = firstItemRD.payload.firstMetadataValue(metadataKeys);
           if (isNotEmpty(date) && isValidDate(date)) {
@@ -97,8 +96,8 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
         }
         const options = [];
         const currentYear = new Date().getUTCFullYear();
-        const oneYearBreak = Math.floor((currentYear - environment.browseBy.oneYearLimit) / 5) * 5;
-        const fiveYearBreak = Math.floor((currentYear - environment.browseBy.fiveYearLimit) / 10) * 10;
+        const oneYearBreak = Math.floor((currentYear - this.appConfig.browseBy.oneYearLimit) / 5) * 5;
+        const fiveYearBreak = Math.floor((currentYear - this.appConfig.browseBy.fiveYearLimit) / 10) * 10;
         if (lowerLimit <= fiveYearBreak) {
           lowerLimit -= 10;
         } else if (lowerLimit <= oneYearBreak) {
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
index ac3aa3cd02..19b849b9b4 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
@@ -25,7 +25,6 @@ import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.util
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { environment } from '../../../environments/environment';
 import { APP_CONFIG } from '../../../config/app-config.interface';
 
 describe('BrowseByMetadataPageComponent', () => {
@@ -45,6 +44,12 @@ describe('BrowseByMetadataPageComponent', () => {
     ]
   });
 
+  const environmentUseThumbs = {
+    browseBy: {
+      showThumbnails: true
+    }
+  }
+
   const mockEntries = [
     {
       type: BrowseEntry.type,
@@ -100,14 +105,13 @@ describe('BrowseByMetadataPageComponent', () => {
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
         { provide: PaginationService, useValue: paginationService },
         { provide: Router, useValue: new RouterMock() },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
   }));
 
   beforeEach(() => {
-    environment.browseBy.showThumbnails = true;
     fixture = TestBed.createComponent(BrowseByMetadataPageComponent);
     comp = fixture.componentInstance;
     fixture.detectChanges();
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
index b754173c39..997459a1ef 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
@@ -9,7 +9,6 @@ import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
-import { environment } from '../../../../../../environments/environment';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 
 let journalIssueListElementComponent: JournalIssueSearchResultListElementComponent;
@@ -59,6 +58,18 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
     })
   });
 
+const environmentUseThumbs = {
+  browseBy: {
+    showThumbnails: true
+  }
+}
+
+const enviromentNoThumbs = {
+  browseBy: {
+    showThumbnails: false
+  }
+}
+
 describe('JournalIssueSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -66,7 +77,7 @@ describe('JournalIssueSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -76,7 +87,6 @@ describe('JournalIssueSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showThumbnails = true;
     fixture = TestBed.createComponent(JournalIssueSearchResultListElementComponent);
     journalIssueListElementComponent = fixture.componentInstance;
 
@@ -155,7 +165,7 @@ describe('JournalIssueSearchResultListElementComponent', () => {
       providers: [
         {provide: TruncatableService, useValue: {}},
         {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -165,7 +175,6 @@ describe('JournalIssueSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showThumbnails = false;
     fixture = TestBed.createComponent(JournalIssueSearchResultListElementComponent);
     journalIssueListElementComponent = fixture.componentInstance;
   }));
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
index cf3274cc14..8692966402 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
@@ -9,7 +9,6 @@ import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
-import { environment } from '../../../../../../environments/environment';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 
 let journalVolumeListElementComponent: JournalVolumeSearchResultListElementComponent;
@@ -58,6 +57,18 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
     })
   });
 
+const environmentUseThumbs = {
+  browseBy: {
+    showThumbnails: true
+  }
+}
+
+const enviromentNoThumbs = {
+  browseBy: {
+    showThumbnails: false
+  }
+}
+
 describe('JournalVolumeSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -65,7 +76,7 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -75,7 +86,6 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showThumbnails = true;
     fixture = TestBed.createComponent(JournalVolumeSearchResultListElementComponent);
     journalVolumeListElementComponent = fixture.componentInstance;
 
@@ -153,7 +163,7 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
       providers: [
         {provide: TruncatableService, useValue: {}},
         {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -163,7 +173,6 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showThumbnails = false;
     fixture = TestBed.createComponent(JournalVolumeSearchResultListElementComponent);
     journalVolumeListElementComponent = fixture.componentInstance;
   }));
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
index 433d05f6d4..a778839b4f 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
@@ -9,7 +9,6 @@ import { TruncatableService } from '../../../../../shared/truncatable/truncatabl
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
-import { environment } from '../../../../../../environments/environment';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 
 let journalListElementComponent: JournalSearchResultListElementComponent;
@@ -54,6 +53,18 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
   }
 );
 
+const environmentUseThumbs = {
+  browseBy: {
+    showThumbnails: true
+  }
+}
+
+const enviromentNoThumbs = {
+  browseBy: {
+    showThumbnails: false
+  }
+}
+
 describe('JournalSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -61,7 +72,7 @@ describe('JournalSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -71,7 +82,6 @@ describe('JournalSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showThumbnails = true;
     fixture = TestBed.createComponent(JournalSearchResultListElementComponent);
     journalListElementComponent = fixture.componentInstance;
 
@@ -125,7 +135,7 @@ describe('JournalSearchResultListElementComponent', () => {
       providers: [
         {provide: TruncatableService, useValue: {}},
         {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -135,7 +145,6 @@ describe('JournalSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showThumbnails = false;
     fixture = TestBed.createComponent(JournalSearchResultListElementComponent);
     journalListElementComponent = fixture.componentInstance;
   }));
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
index e65377f682..f2f9a3967e 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
@@ -9,7 +9,6 @@ import { TruncatableService } from '../../../../../shared/truncatable/truncatabl
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
-import { environment } from '../../../../../../environments/environment';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 
 let orgUnitListElementComponent: OrgUnitSearchResultListElementComponent;
@@ -52,6 +51,18 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
     })
   });
 
+const environmentUseThumbs = {
+  browseBy: {
+    showThumbnails: true
+  }
+}
+
+const enviromentNoThumbs = {
+  browseBy: {
+    showThumbnails: false
+  }
+}
+
 describe('OrgUnitSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -59,7 +70,7 @@ describe('OrgUnitSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ],
 
       schemas: [ NO_ERRORS_SCHEMA ]
@@ -69,7 +80,6 @@ describe('OrgUnitSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showThumbnails = true;
     fixture = TestBed.createComponent(OrgUnitSearchResultListElementComponent);
     orgUnitListElementComponent = fixture.componentInstance;
 
@@ -123,7 +133,7 @@ describe('OrgUnitSearchResultListElementComponent', () => {
       providers: [
         {provide: TruncatableService, useValue: {}},
         {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -133,7 +143,6 @@ describe('OrgUnitSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showThumbnails = false;
     fixture = TestBed.createComponent(OrgUnitSearchResultListElementComponent);
     orgUnitListElementComponent = fixture.componentInstance;
   }));
@@ -147,7 +156,7 @@ describe('OrgUnitSearchResultListElementComponent', () => {
 
     it('should not add thumbnail element', () => {
       const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
-      expect(thumbnailElement).toBeFalsy();
+      expect(thumbnailElement).toBeNull();
     });
   });
 });
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
index 96bfda48ad..02a7a5bb52 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
@@ -9,7 +9,6 @@ import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
-import { environment } from '../../../../../../environments/environment';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 
 let personListElementComponent: PersonSearchResultListElementComponent;
@@ -52,6 +51,18 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
     })
   });
 
+const environmentUseThumbs = {
+  browseBy: {
+    showThumbnails: true
+  }
+}
+
+const enviromentNoThumbs = {
+  browseBy: {
+    showThumbnails: false
+  }
+}
+
 describe('PersonSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -59,7 +70,7 @@ describe('PersonSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -69,7 +80,6 @@ describe('PersonSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showThumbnails = true;
     fixture = TestBed.createComponent(PersonSearchResultListElementComponent);
     personListElementComponent = fixture.componentInstance;
 
@@ -123,7 +133,7 @@ describe('PersonSearchResultListElementComponent', () => {
       providers: [
         {provide: TruncatableService, useValue: {}},
         {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -133,7 +143,6 @@ describe('PersonSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showThumbnails = false;
     fixture = TestBed.createComponent(PersonSearchResultListElementComponent);
     personListElementComponent = fixture.componentInstance;
   }));
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
index eb06acfa8d..17333392d3 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
@@ -8,7 +8,6 @@ import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
-import { environment } from '../../../../../../environments/environment';
 import { By } from '@angular/platform-browser';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 
@@ -53,6 +52,18 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
     })
   });
 
+const environmentUseThumbs = {
+  browseBy: {
+    showThumbnails: true
+  }
+}
+
+const enviromentNoThumbs = {
+  browseBy: {
+    showThumbnails: false
+  }
+}
+
 describe('ProjectSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -60,7 +71,7 @@ describe('ProjectSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -70,7 +81,6 @@ describe('ProjectSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showThumbnails = true;
     fixture = TestBed.createComponent(ProjectSearchResultListElementComponent);
     projectListElementComponent = fixture.componentInstance;
 
@@ -124,7 +134,7 @@ describe('ProjectSearchResultListElementComponent', () => {
       providers: [
         {provide: TruncatableService, useValue: {}},
         {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
 
       ],
 
@@ -135,7 +145,6 @@ describe('ProjectSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showThumbnails = false;
     fixture = TestBed.createComponent(ProjectSearchResultListElementComponent);
     projectListElementComponent = fixture.componentInstance;
   }));
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts
index e884edbbb9..9e0866c027 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts
@@ -182,4 +182,6 @@ describe('OrgUnitSearchResultListSubmissionElementComponent', () => {
       expect(jobTitleField).toBeNull();
     });
   });
+
 });
+
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
index 6c83ec919c..389e1852f5 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
@@ -28,7 +28,6 @@ import { TruncatableService } from '../../../../../shared/truncatable/truncatabl
 import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { PersonSearchResultListSubmissionElementComponent } from './person-search-result-list-submission-element.component';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
-import { environment } from '../../../../../../environments/environment';
 
 let personListElementComponent: PersonSearchResultListSubmissionElementComponent;
 let fixture: ComponentFixture<PersonSearchResultListSubmissionElementComponent>;
@@ -39,6 +38,18 @@ let mockItemWithoutMetadata: ItemSearchResult;
 let nameVariant;
 let mockRelationshipService;
 
+const environmentUseThumbs = {
+  browseBy: {
+    showThumbnails: true
+  }
+}
+
+const enviromentNoThumbs = {
+  browseBy: {
+    showThumbnails: false
+  }
+}
+
 function init() {
   mockItemWithMetadata = Object.assign(
     new ItemSearchResult(),
@@ -111,7 +122,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -149,4 +160,72 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
       expect(jobTitleField).toBeNull();
     });
   });
+
+  describe('When the environment is set to show thumbnails', () => {
+    beforeEach(() => {
+      personListElementComponent.object = mockItemWithoutMetadata;
+      fixture.detectChanges();
+    });
+
+    it('should add the ds-thumbnail element', () => {
+      const thumbnail = fixture.debugElement.query(By.css('ds-thumbnail'));
+      expect(thumbnail).toBeTruthy();
+    });
+  });
+});
+
+describe('PersonSearchResultListElementSubmissionComponent', () => {
+  const mockBitstreamDataService = {
+    getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
+      return createSuccessfulRemoteDataObject$(new Bitstream());
+    }
+  };
+  beforeEach(waitForAsync(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [PersonSearchResultListSubmissionElementComponent, TruncatePipe],
+      providers: [
+        { provide: TruncatableService, useValue: {} },
+        { provide: RelationshipService, useValue: mockRelationshipService },
+        { provide: NotificationsService, useValue: {} },
+        { provide: TranslateService, useValue: {} },
+        { provide: NgbModal, useValue: {} },
+        { provide: ItemDataService, useValue: {} },
+        { provide: SelectableListService, useValue: {} },
+        { provide: Store, useValue: {}},
+        { provide: ObjectCacheService, useValue: {} },
+        { provide: UUIDService, useValue: {} },
+        { provide: RemoteDataBuildService, useValue: {} },
+        { provide: CommunityDataService, useValue: {} },
+        { provide: HALEndpointService, useValue: {} },
+        { provide: HttpClient, useValue: {} },
+        { provide: DSOChangeAnalyzer, useValue: {} },
+        { provide: DefaultChangeAnalyzer, useValue: {} },
+        { provide: BitstreamDataService, useValue: mockBitstreamDataService },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
+      ],
+
+      schemas: [NO_ERRORS_SCHEMA]
+    }).overrideComponent(PersonSearchResultListSubmissionElementComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default }
+    }).compileComponents();
+  }));
+
+  beforeEach(waitForAsync(() => {
+    fixture = TestBed.createComponent(PersonSearchResultListSubmissionElementComponent);
+    personListElementComponent = fixture.componentInstance;
+
+  }));
+
+  describe('When the environment is not set to show thumbnails', () => {
+    beforeEach(() => {
+      personListElementComponent.object = mockItemWithoutMetadata;
+      fixture.detectChanges();
+    });
+
+    it('should not add the ds-thumbnail element', () => {
+      const thumbnail = fixture.debugElement.query(By.css('ds-thumbnail'));
+      expect(thumbnail).toBeNull();
+    });
+  });
 });
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 4553ba16bf..02d0f69c19 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -132,7 +132,7 @@ describe('BrowseByComponent', () => {
         { provide: PaginationService, useValue: paginationService },
         { provide: MockThemedBrowseEntryListElementComponent },
         { provide: ThemeService, useValue: themeService },
-        {provide: RouteService, useValue: routeServiceStub},
+        { provide: RouteService, useValue: routeServiceStub},
         { provide: SelectableListService, useValue: {} },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
       ],
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
index 468092820a..7959ed57d9 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
@@ -11,7 +11,6 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
-import { environment } from '../../../../../environments/environment';
 
 let component: ItemListPreviewComponent;
 let fixture: ComponentFixture<ItemListPreviewComponent>;
@@ -68,6 +67,18 @@ const mockItemWithEntityType: Item = Object.assign(new Item(), {
   }
 });
 
+const environmentUseThumbs = {
+  browseBy: {
+    showThumbnails: true
+  }
+}
+
+const enviromentNoThumbs = {
+  browseBy: {
+    showThumbnails: false
+  }
+}
+
 describe('ItemListPreviewComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -83,7 +94,7 @@ describe('ItemListPreviewComponent', () => {
       declarations: [ItemListPreviewComponent, TruncatePipe],
       providers: [
         { provide: 'objectElementProvider', useValue: { mockItemWithAuthorAndDate }},
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -102,6 +113,17 @@ describe('ItemListPreviewComponent', () => {
     component.object = { hitHighlights: {} } as any;
   });
 
+  describe('When showThumbnails is true', () => {
+    beforeEach(() => {
+      component.item = mockItemWithAuthorAndDate;
+      fixture.detectChanges();
+    });
+    it('should add the ds-thumbnail element', () => {
+      const thumbnail = fixture.debugElement.query(By.css('ds-thumbnail'));
+      expect(thumbnail).toBeTruthy();
+    });
+  });
+
   describe('When the item has an author', () => {
     beforeEach(() => {
       component.item = mockItemWithAuthorAndDate;
@@ -162,3 +184,48 @@ describe('ItemListPreviewComponent', () => {
     });
   });
 });
+
+describe('ItemListPreviewComponent', () => {
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        }),
+        NoopAnimationsModule
+      ],
+      declarations: [ItemListPreviewComponent, TruncatePipe],
+      providers: [
+        {provide: 'objectElementProvider', useValue: {mockItemWithAuthorAndDate}},
+        {provide: APP_CONFIG, useValue: enviromentNoThumbs}
+      ],
+
+      schemas: [NO_ERRORS_SCHEMA]
+    }).overrideComponent(ItemListPreviewComponent, {
+      set: {changeDetection: ChangeDetectionStrategy.Default}
+    }).compileComponents();
+  }));
+  beforeEach(waitForAsync(() => {
+    fixture = TestBed.createComponent(ItemListPreviewComponent);
+    component = fixture.componentInstance;
+
+  }));
+
+  beforeEach(() => {
+    component.object = { hitHighlights: {} } as any;
+  });
+
+  describe('When showThumbnails is true', () => {
+    beforeEach(() => {
+      component.item = mockItemWithAuthorAndDate;
+      fixture.detectChanges();
+    });
+    it('should add the ds-thumbnail element', () => {
+      const thumbnail = fixture.debugElement.query(By.css('ds-thumbnail'));
+      expect(thumbnail).toBeFalsy();
+    })
+  })
+});
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
index cf5d54564c..0fd27eb073 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
@@ -5,7 +5,7 @@
                         [showSubmitter]="showSubmitter"
                         [status]="status"></ds-themed-item-list-preview>
   <div class="row">
-    <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2pl-3' : ''">
+    <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 pl-3' : ''">
       <ds-pool-task-actions id="actions" *ngIf="workflowitem" [object]="dso"
                             (processCompleted)="this.reloadedObject.emit($event.reloadedObject)"></ds-pool-task-actions>
     </div>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
index 3eb37efb3f..8ad9bafab7 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
@@ -19,7 +19,6 @@ import { By } from '@angular/platform-browser';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
-import { environment } from '../../../../../environments/environment';
 
 let component: PoolSearchResultListElementComponent;
 let fixture: ComponentFixture<PoolSearchResultListElementComponent>;
@@ -56,6 +55,13 @@ const item = Object.assign(new Item(), {
     ]
   }
 });
+
+const environmentUseThumbs = {
+  browseBy: {
+    showThumbnails: true
+  }
+}
+
 const rdItem = createSuccessfulRemoteDataObject(item);
 const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
 const rdWorkflowitem = createSuccessfulRemoteDataObject(workflowitem);
@@ -71,7 +77,7 @@ describe('PoolSearchResultListElementComponent', () => {
         { provide: TruncatableService, useValue: {} },
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(PoolSearchResultListElementComponent, {
@@ -115,4 +121,9 @@ describe('PoolSearchResultListElementComponent', () => {
     expect(component.reloadedObject.emit).toHaveBeenCalledWith(actionPayload.reloadedObject);
 
   }));
+
+  it('should add an offset to the actions element', () => {
+    const thumbnail = fixture.debugElement.query(By.css('.offset-3'));
+    expect(thumbnail).toBeTruthy();
+  });
 });
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
index c8573c628b..a384ca5755 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
@@ -19,7 +19,6 @@ import { By } from '@angular/platform-browser';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
-import { environment } from '../../../../../environments/environment';
 
 let component: WorkflowItemSearchResultListElementComponent;
 let fixture: ComponentFixture<WorkflowItemSearchResultListElementComponent>;
@@ -56,6 +55,13 @@ const item = Object.assign(new Item(), {
     ]
   }
 });
+
+const environmentUseThumbs = {
+  browseBy: {
+    showThumbnails: true
+  }
+}
+
 const rd = createSuccessfulRemoteDataObject(item);
 mockResultObject.indexableObject = Object.assign(new WorkflowItem(), { item: observableOf(rd) });
 
@@ -72,7 +78,7 @@ describe('WorkflowItemSearchResultListElementComponent', () => {
         { provide: ItemDataService, useValue: {} },
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(WorkflowItemSearchResultListElementComponent, {
@@ -113,4 +119,11 @@ describe('WorkflowItemSearchResultListElementComponent', () => {
     expect(component.reloadedObject.emit).toHaveBeenCalledWith(actionPayload.reloadedObject);
 
   }));
+
+
+  it('should add an offset to the actions element', () => {
+    const thumbnail = fixture.debugElement.query(By.css('.offset-3'));
+    expect(thumbnail).toBeTruthy();
+  });
+
 });
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
index 1a20a06d61..aea8b93370 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
@@ -19,7 +19,6 @@ import { By } from '@angular/platform-browser';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
-import { environment } from '../../../../../environments/environment';
 
 let component: WorkspaceItemSearchResultListElementComponent;
 let fixture: ComponentFixture<WorkspaceItemSearchResultListElementComponent>;
@@ -56,6 +55,13 @@ const item = Object.assign(new Item(), {
     ]
   }
 });
+
+const environmentUseThumbs = {
+  browseBy: {
+    showThumbnails: true
+  }
+}
+
 const rd = createSuccessfulRemoteDataObject(item);
 mockResultObject.indexableObject = Object.assign(new WorkspaceItem(), { item: observableOf(rd) });
 let linkService;
@@ -71,7 +77,7 @@ describe('WorkspaceItemSearchResultListElementComponent', () => {
         { provide: ItemDataService, useValue: {} },
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(WorkspaceItemSearchResultListElementComponent, {
@@ -113,4 +119,10 @@ describe('WorkspaceItemSearchResultListElementComponent', () => {
     expect(component.reloadedObject.emit).toHaveBeenCalledWith(actionPayload.reloadedObject);
 
   }));
+
+
+  it('should add an offset to the actions element', () => {
+    const thumbnail = fixture.debugElement.query(By.css('.offset-3'));
+    expect(thumbnail).toBeTruthy();
+  });
 });
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
index 3a62682be1..fcb91b6953 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
@@ -10,7 +10,6 @@ import { CollectionSearchResult } from '../../../object-collection/shared/collec
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
-import { environment } from '../../../../../environments/environment';
 
 let collectionSearchResultListElementComponent: CollectionSearchResultListElementComponent;
 let fixture: ComponentFixture<CollectionSearchResultListElementComponent>;
@@ -45,6 +44,12 @@ mockCollectionWithoutAbstract.indexableObject = Object.assign(new Collection(),
   }
 });
 
+const environmentUseThumbs = {
+  browseBy: {
+    showThumbnails: true
+  }
+}
+
 describe('CollectionSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -52,7 +57,7 @@ describe('CollectionSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: truncatableServiceStub },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(CollectionSearchResultListElementComponent, {
@@ -90,4 +95,11 @@ describe('CollectionSearchResultListElementComponent', () => {
       expect(collectionAbstractField).toBeNull();
     });
   });
+
+  describe('when environment is set to show thumbnail images', () => {
+    it('should offset content', () => {
+      const offset = fixture.debugElement.query(By.css('offset-md-2'))
+    });
+  });
+
 });
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
index bcaf03987a..1b155ce153 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
@@ -10,7 +10,6 @@ import { CommunitySearchResult } from '../../../object-collection/shared/communi
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
-import { environment } from '../../../../../environments/environment';
 
 let communitySearchResultListElementComponent: CommunitySearchResultListElementComponent;
 let fixture: ComponentFixture<CommunitySearchResultListElementComponent>;
@@ -45,6 +44,12 @@ mockCommunityWithoutAbstract.indexableObject = Object.assign(new Community(), {
   }
 });
 
+const environmentUseThumbs = {
+  browseBy: {
+    showThumbnails: true
+  }
+}
+
 describe('CommunitySearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -52,7 +57,7 @@ describe('CommunitySearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: truncatableServiceStub },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -91,4 +96,10 @@ describe('CommunitySearchResultListElementComponent', () => {
       expect(communityAbstractField).toBeNull();
     });
   });
+
+  describe('when environment is set to show thumbnail images', () => {
+    it('should offset content', () => {
+      const offset = fixture.debugElement.query(By.css('offset-md-2'))
+    });
+  });
 });
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
index 80dd80658b..84989c289c 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
@@ -9,7 +9,6 @@ import { TruncatableService } from '../../../../../truncatable/truncatable.servi
 import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
 import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock, UNDEFINED_NAME } from '../../../../../mocks/dso-name.service.mock';
-import { environment } from '../../../../../../../environments/environment';
 import { APP_CONFIG } from '../../../../../../../config/app-config.interface';
 
 let publicationListElementComponent: ItemSearchResultListElementComponent;
@@ -61,6 +60,17 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(new ItemSearchRe
     })
 });
 
+const environmentUseThumbs = {
+  browseBy: {
+    showThumbnails: true
+  }
+}
+
+const enviromentNoThumbs = {
+  browseBy: {
+    showThumbnails: false
+  }
+}
 
 describe('ItemSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
@@ -69,7 +79,7 @@ describe('ItemSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -79,7 +89,6 @@ describe('ItemSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showThumbnails = true;
     fixture = TestBed.createComponent(ItemSearchResultListElementComponent);
     publicationListElementComponent = fixture.componentInstance;
 
@@ -94,7 +103,7 @@ describe('ItemSearchResultListElementComponent', () => {
       expect(publicationListElementComponent.showThumbnails).toBeTrue();
     });
 
-    it('should add thumbnail element', () => {
+    it('should add ds-thumbnail element', () => {
       const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
       expect(thumbnailElement).toBeTruthy();
     });
@@ -217,7 +226,7 @@ describe('ItemSearchResultListElementComponent', () => {
       providers: [
         {provide: TruncatableService, useValue: {}},
         {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -227,7 +236,6 @@ describe('ItemSearchResultListElementComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
-    environment.browseBy.showThumbnails = false;
     fixture = TestBed.createComponent(ItemSearchResultListElementComponent);
     publicationListElementComponent = fixture.componentInstance;
   }));
@@ -239,7 +247,7 @@ describe('ItemSearchResultListElementComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should not add thumbnail element', () => {
+    it('should not add ds-thumbnail element', () => {
       const thumbnailElement = fixture.debugElement.query(By.css('ds-thumbnail'));
       expect(thumbnailElement).toBeFalsy();
     });

From abe19b12bb4784f6e479a0eb1af235c22377d836 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Wed, 14 Sep 2022 16:33:25 -0700
Subject: [PATCH 38/73] Related entity thumbnails.

---
 .../browse-by-metadata-page.component.spec.ts |  2 +-
 ...arch-result-list-element.component.spec.ts |  4 ++--
 ...arch-result-list-element.component.spec.ts |  4 ++--
 ...arch-result-list-element.component.spec.ts |  4 ++--
 ...arch-result-list-element.component.spec.ts |  4 ++--
 ...arch-result-list-element.component.spec.ts |  4 ++--
 ...arch-result-list-element.component.spec.ts |  4 ++--
 ...-list-submission-element.component.spec.ts |  4 ++--
 .../abstract-incremental-list.component.ts    |  6 +++++
 .../related-items/related-items-component.ts  | 11 ++++++++--
 .../related-items.component.html              |  4 +++-
 .../related-items.component.scss              |  6 +++++
 .../object-collection.component.ts            | 22 +++++--------------
 .../item-list-preview.component.spec.ts       |  8 +++----
 ...arch-result-list-element.component.spec.ts |  2 +-
 ...arch-result-list-element.component.spec.ts |  3 +--
 ...arch-result-list-element.component.spec.ts |  2 +-
 ...arch-result-list-element.component.spec.ts |  4 ++--
 ...arch-result-list-element.component.spec.ts |  4 ++--
 ...arch-result-list-element.component.spec.ts |  4 ++--
 src/app/shared/utils/object-list-utils.ts     | 13 +++++++++++
 21 files changed, 71 insertions(+), 48 deletions(-)
 create mode 100644 src/app/shared/utils/object-list-utils.ts

diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
index 19b849b9b4..763279ebe5 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
@@ -48,7 +48,7 @@ describe('BrowseByMetadataPageComponent', () => {
     browseBy: {
       showThumbnails: true
     }
-  }
+  };
 
   const mockEntries = [
     {
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
index 997459a1ef..178ed86c40 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
@@ -62,13 +62,13 @@ const environmentUseThumbs = {
   browseBy: {
     showThumbnails: true
   }
-}
+};
 
 const enviromentNoThumbs = {
   browseBy: {
     showThumbnails: false
   }
-}
+};
 
 describe('JournalIssueSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
index 8692966402..71fa83a3b1 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
@@ -61,13 +61,13 @@ const environmentUseThumbs = {
   browseBy: {
     showThumbnails: true
   }
-}
+};
 
 const enviromentNoThumbs = {
   browseBy: {
     showThumbnails: false
   }
-}
+};
 
 describe('JournalVolumeSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
index a778839b4f..07970d7128 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
@@ -57,13 +57,13 @@ const environmentUseThumbs = {
   browseBy: {
     showThumbnails: true
   }
-}
+};
 
 const enviromentNoThumbs = {
   browseBy: {
     showThumbnails: false
   }
-}
+};
 
 describe('JournalSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
index f2f9a3967e..974c418cdc 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
@@ -55,13 +55,13 @@ const environmentUseThumbs = {
   browseBy: {
     showThumbnails: true
   }
-}
+};
 
 const enviromentNoThumbs = {
   browseBy: {
     showThumbnails: false
   }
-}
+};
 
 describe('OrgUnitSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
index 02a7a5bb52..6c69bfd58d 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
@@ -55,13 +55,13 @@ const environmentUseThumbs = {
   browseBy: {
     showThumbnails: true
   }
-}
+};
 
 const enviromentNoThumbs = {
   browseBy: {
     showThumbnails: false
   }
-}
+};
 
 describe('PersonSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
index 17333392d3..0cb3e63e87 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
@@ -56,13 +56,13 @@ const environmentUseThumbs = {
   browseBy: {
     showThumbnails: true
   }
-}
+};
 
 const enviromentNoThumbs = {
   browseBy: {
     showThumbnails: false
   }
-}
+};
 
 describe('ProjectSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
index 389e1852f5..5ab89be34b 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
@@ -42,13 +42,13 @@ const environmentUseThumbs = {
   browseBy: {
     showThumbnails: true
   }
-}
+};
 
 const enviromentNoThumbs = {
   browseBy: {
     showThumbnails: false
   }
-}
+};
 
 function init() {
   mockItemWithMetadata = Object.assign(
diff --git a/src/app/item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts b/src/app/item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts
index c965648c15..e788e6e575 100644
--- a/src/app/item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts
+++ b/src/app/item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts
@@ -10,6 +10,7 @@ import { hasValue, isNotEmpty } from '../../../shared/empty.util';
  * An abstract component for displaying an incremental list of objects
  */
 export class AbstractIncrementalListComponent<T> implements OnInit, OnDestroy {
+
   /**
    * The amount to increment the list by
    * Define this amount in the child component overriding this component
@@ -21,6 +22,11 @@ export class AbstractIncrementalListComponent<T> implements OnInit, OnDestroy {
    */
   objects: T[];
 
+  /**
+   * Placeholder css class (defined in global-styles)
+   */
+  placeholderFontClass: string;
+
   /**
    * A list of open subscriptions
    */
diff --git a/src/app/item-page/simple/related-items/related-items-component.ts b/src/app/item-page/simple/related-items/related-items-component.ts
index e0d65b9a6d..e88af944b4 100644
--- a/src/app/item-page/simple/related-items/related-items-component.ts
+++ b/src/app/item-page/simple/related-items/related-items-component.ts
@@ -1,4 +1,4 @@
-import { Component, Input } from '@angular/core';
+import { Component, ElementRef, Input } from '@angular/core';
 import { Item } from '../../../core/shared/item.model';
 import { Observable } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
@@ -7,6 +7,7 @@ import { ViewMode } from '../../../core/shared/view-mode.model';
 import { RelationshipService } from '../../../core/data/relationship.service';
 import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
 import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { setPlaceHolderFontSize } from '../../../shared/utils/object-list-utils';
 
 @Component({
   selector: 'ds-related-items',
@@ -18,6 +19,7 @@ import { FindListOptions } from '../../../core/data/find-list-options.model';
  * It expects a parent item and relationship type, as well as a label to display on top
  */
 export class RelatedItemsComponent extends AbstractIncrementalListComponent<Observable<RemoteData<PaginatedList<Item>>>> {
+
   /**
    * The parent of the list of related items to display
    */
@@ -53,9 +55,14 @@ export class RelatedItemsComponent extends AbstractIncrementalListComponent<Obse
    */
   viewMode = ViewMode.ListElement;
 
-  constructor(public relationshipService: RelationshipService) {
+  constructor(public relationshipService: RelationshipService, protected elementRef: ElementRef) {
     super();
   }
+  ngOnInit(): void {
+    const width = this.elementRef.nativeElement.offsetWidth;
+    this.placeholderFontClass = setPlaceHolderFontSize(width);
+    super.ngOnInit();
+  }
 
   /**
    * Get a specific page
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 2a43ae90dc..a72bc6b098 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
@@ -1,4 +1,5 @@
-<ds-metadata-field-wrapper [label]="label">
+<ds-metadata-field-wrapper [label]="label" [ngClass]="placeholderFontClass">
+  <div #relatedItems>
   <ng-container *ngFor="let objectPage of objects; let i = index">
     <ng-container *ngVar="(objectPage | async) as itemsRD">
       <ds-listable-object-component-loader *ngFor="let item of itemsRD?.payload?.page"
@@ -17,4 +18,5 @@
       </div>
     </ng-container>
   </ng-container>
+  </div>
 </ds-metadata-field-wrapper>
diff --git a/src/app/item-page/simple/related-items/related-items.component.scss b/src/app/item-page/simple/related-items/related-items.component.scss
index e69de29bb2..72fbdff165 100644
--- a/src/app/item-page/simple/related-items/related-items.component.scss
+++ b/src/app/item-page/simple/related-items/related-items.component.scss
@@ -0,0 +1,6 @@
+
+ds-listable-object-component-loader {
+  margin-bottom: 10px;
+  display: block;
+}
+
diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts
index 3720d4196f..809d956c72 100644
--- a/src/app/shared/object-collection/object-collection.component.ts
+++ b/src/app/shared/object-collection/object-collection.component.ts
@@ -21,6 +21,7 @@ import { ViewMode } from '../../core/shared/view-mode.model';
 import { CollectionElementLinkType } from './collection-element-link.type';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { Context } from '../../core/shared/context.model';
+import { setPlaceHolderFontSize } from '../utils/object-list-utils';
 
 /**
  * Component that can render a list of listable objects in different view modes
@@ -167,7 +168,9 @@ export class ObjectCollectionComponent implements OnInit {
         map((params) => isEmpty(params?.view) ? ViewMode.ListElement : params.view),
         distinctUntilChanged()
       );
-    this.setPlaceHolderFontSize();
+    const width = this.elementRef.nativeElement.offsetWidth;
+    this.placeholderFontClass = setPlaceHolderFontSize(width);
+
   }
 
   /**
@@ -177,6 +180,8 @@ export class ObjectCollectionComponent implements OnInit {
    *    Route is a singleton service provided by Angular.
    * @param router
    *    Router is a singleton service provided by Angular.
+   * @param elementRef
+   *    Used only to read DOM for the element width
    */
   constructor(
     private cdRef: ChangeDetectorRef,
@@ -236,19 +241,4 @@ export class ObjectCollectionComponent implements OnInit {
       this.next.emit(true);
   }
 
-  /**
-   * Sets the class to be used for the "no thumbnail"
-   * placeholder font size.
-   */
-  setPlaceHolderFontSize() {
-    const width = this.elementRef.nativeElement.offsetWidth;
-    if (width < 750) {
-      this.placeholderFontClass = 'thumb-font-1';
-    } else if (width < 1000) {
-      this.placeholderFontClass = 'thumb-font-2';
-    } else {
-      this.placeholderFontClass = 'thumb-font-3';
-    }
-  }
-
 }
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
index 7959ed57d9..aaddebd8eb 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
@@ -71,13 +71,13 @@ const environmentUseThumbs = {
   browseBy: {
     showThumbnails: true
   }
-}
+};
 
 const enviromentNoThumbs = {
   browseBy: {
     showThumbnails: false
   }
-}
+};
 
 describe('ItemListPreviewComponent', () => {
   beforeEach(waitForAsync(() => {
@@ -226,6 +226,6 @@ describe('ItemListPreviewComponent', () => {
     it('should add the ds-thumbnail element', () => {
       const thumbnail = fixture.debugElement.query(By.css('ds-thumbnail'));
       expect(thumbnail).toBeFalsy();
-    })
-  })
+    });
+  });
 });
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
index 8ad9bafab7..4f839a5d86 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
@@ -60,7 +60,7 @@ const environmentUseThumbs = {
   browseBy: {
     showThumbnails: true
   }
-}
+};
 
 const rdItem = createSuccessfulRemoteDataObject(item);
 const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
index a384ca5755..0f051c3c4b 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
@@ -60,7 +60,7 @@ const environmentUseThumbs = {
   browseBy: {
     showThumbnails: true
   }
-}
+};
 
 const rd = createSuccessfulRemoteDataObject(item);
 mockResultObject.indexableObject = Object.assign(new WorkflowItem(), { item: observableOf(rd) });
@@ -120,7 +120,6 @@ describe('WorkflowItemSearchResultListElementComponent', () => {
 
   }));
 
-
   it('should add an offset to the actions element', () => {
     const thumbnail = fixture.debugElement.query(By.css('.offset-3'));
     expect(thumbnail).toBeTruthy();
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
index aea8b93370..d2cef02555 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
@@ -60,7 +60,7 @@ const environmentUseThumbs = {
   browseBy: {
     showThumbnails: true
   }
-}
+};
 
 const rd = createSuccessfulRemoteDataObject(item);
 mockResultObject.indexableObject = Object.assign(new WorkspaceItem(), { item: observableOf(rd) });
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
index fcb91b6953..e5ea60b35d 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
@@ -48,7 +48,7 @@ const environmentUseThumbs = {
   browseBy: {
     showThumbnails: true
   }
-}
+};
 
 describe('CollectionSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
@@ -98,7 +98,7 @@ describe('CollectionSearchResultListElementComponent', () => {
 
   describe('when environment is set to show thumbnail images', () => {
     it('should offset content', () => {
-      const offset = fixture.debugElement.query(By.css('offset-md-2'))
+      const offset = fixture.debugElement.query(By.css('offset-md-2'));
     });
   });
 
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
index 1b155ce153..ce12f5f7da 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
@@ -48,7 +48,7 @@ const environmentUseThumbs = {
   browseBy: {
     showThumbnails: true
   }
-}
+};
 
 describe('CommunitySearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
@@ -99,7 +99,7 @@ describe('CommunitySearchResultListElementComponent', () => {
 
   describe('when environment is set to show thumbnail images', () => {
     it('should offset content', () => {
-      const offset = fixture.debugElement.query(By.css('offset-md-2'))
+      const offset = fixture.debugElement.query(By.css('offset-md-2'));
     });
   });
 });
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
index 84989c289c..d1e6c27ba4 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
@@ -64,13 +64,13 @@ const environmentUseThumbs = {
   browseBy: {
     showThumbnails: true
   }
-}
+};
 
 const enviromentNoThumbs = {
   browseBy: {
     showThumbnails: false
   }
-}
+};
 
 describe('ItemSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
diff --git a/src/app/shared/utils/object-list-utils.ts b/src/app/shared/utils/object-list-utils.ts
new file mode 100644
index 0000000000..3837ada1fd
--- /dev/null
+++ b/src/app/shared/utils/object-list-utils.ts
@@ -0,0 +1,13 @@
+/**
+ * Sets the class to be used for the "no thumbnail"
+ * placeholder font size in lists.
+ */
+export function  setPlaceHolderFontSize(width: number): string {
+  if (width < 750) {
+    return 'thumb-font-1';
+  } else if (width < 1000) {
+    return 'thumb-font-2';
+  } else {
+    return 'thumb-font-3';
+  }
+}

From 46ecf287a4453604cb87ab4d63eebb5107e99e5e Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Thu, 15 Sep 2022 11:40:00 -0700
Subject: [PATCH 39/73] Thumbnails fixed for relationships and added styling.

---
 .../core/data/relationship.service.spec.ts    |  7 ++++--
 src/app/core/data/relationship.service.ts     | 15 +++++++++++--
 .../org-unit/org-unit.component.html          |  2 +-
 .../item-pages/person/person.component.html   |  2 +-
 .../item-pages/project/project.component.html |  2 +-
 .../publication/publication.component.html    |  2 +-
 src/app/shared/utils/object-list-utils.ts     |  4 +++-
 src/styles/_global-styles.scss                | 22 +++++++++++++++++--
 8 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/src/app/core/data/relationship.service.spec.ts b/src/app/core/data/relationship.service.spec.ts
index 387593d609..38a3183cac 100644
--- a/src/app/core/data/relationship.service.spec.ts
+++ b/src/app/core/data/relationship.service.spec.ts
@@ -121,6 +121,8 @@ describe('RelationshipService', () => {
     findByHref: createSuccessfulRemoteDataObject$(relatedItems[0])
   });
 
+  const appConfig = Object.assign({browseBy: {showThumbnails: true}})
+
   function initTestService() {
     return new RelationshipService(
       itemService,
@@ -133,6 +135,7 @@ describe('RelationshipService', () => {
       null,
       null,
       null,
+      appConfig,
       jasmine.createSpy('paginatedRelationsToItems').and.returnValue((v) => v),
     );
   }
@@ -210,8 +213,8 @@ describe('RelationshipService', () => {
           mockOptions,
           true,
           true,
-          followLink('leftItem'),
-          followLink('rightItem'),
+          followLink('leftItem',{}, followLink('thumbnail')),
+          followLink('rightItem',{}, followLink('thumbnail')),
           followLink('relationshipType')
         );
         done();
diff --git a/src/app/core/data/relationship.service.ts b/src/app/core/data/relationship.service.ts
index 4594e17a11..7d339352d9 100644
--- a/src/app/core/data/relationship.service.ts
+++ b/src/app/core/data/relationship.service.ts
@@ -46,6 +46,7 @@ import { sendRequest } from '../shared/request.operators';
 import { RestRequest } from './rest-request.model';
 import { CoreState } from '../core-state.model';
 import { FindListOptions } from './find-list-options.model';
+import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 
 const relationshipListsStateSelector = (state: AppState) => state.relationshipLists;
 
@@ -89,6 +90,7 @@ export class RelationshipService extends DataService<Relationship> {
               protected http: HttpClient,
               protected comparator: DefaultChangeAnalyzer<Relationship>,
               protected appStore: Store<AppState>,
+              @Inject(APP_CONFIG) private appConfig: AppConfig,
               @Inject(PAGINATED_RELATIONS_TO_ITEMS_OPERATOR) private paginatedRelationsToItems: (thisId: string) => (source: Observable<RemoteData<PaginatedList<Relationship>>>) => Observable<RemoteData<PaginatedList<Item>>>) {
     super();
   }
@@ -183,7 +185,7 @@ export class RelationshipService extends DataService<Relationship> {
     ]).pipe(
       filter(([existsInOC, existsInRC]) => !existsInOC && !existsInRC),
       take(1),
-    ).subscribe(() => this.itemService.findByHref(item._links.self.href, false));
+    ).subscribe(() => this.itemService.findByHref(item._links.self.href, false, true, followLink('thumbnail')));
   }
 
   /**
@@ -256,7 +258,16 @@ export class RelationshipService extends DataService<Relationship> {
    * @param options
    */
   getRelatedItemsByLabel(item: Item, label: string, options?: FindListOptions): Observable<RemoteData<PaginatedList<Item>>> {
-    return this.getItemRelationshipsByLabel(item, label, options, true, true, followLink('leftItem'), followLink('rightItem'), followLink('relationshipType')).pipe(this.paginatedRelationsToItems(item.uuid));
+    let linksToFollow: FollowLinkConfig<Relationship>[];
+    if (this.appConfig.browseBy.showThumbnails) {
+      linksToFollow = [
+        followLink('leftItem',{}, followLink('thumbnail')),
+        followLink('rightItem',{}, followLink('thumbnail')),
+        followLink('relationshipType') ];
+    } else {
+      linksToFollow = [followLink('leftItem'), followLink('rightItem'), followLink('relationshipType')];
+    }
+    return this.getItemRelationshipsByLabel(item, label, options, true, true, ...linksToFollow).pipe(this.paginatedRelationsToItems(item.uuid));
   }
 
   /**
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
index ff4bc4d226..0ce9823ce6 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -36,7 +36,7 @@
       [label]="'orgunit.page.id'">
     </ds-generic-item-page-field>
   </div>
-  <div class="col-xs-12 col-md-6">
+  <div class="col-xs-12 col-md-7">
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isPublicationOfOrgUnit'"
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
index ace42f844e..d5babd0faf 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -29,7 +29,7 @@
       [label]="'person.page.birthdate'">
     </ds-generic-item-page-field>
   </div>
-  <div class="col-xs-12 col-md-6">
+  <div class="col-xs-12 col-md-7">
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isProjectOfPerson'"
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
index a068878fb4..d73a8786cf 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
@@ -42,7 +42,7 @@
       <!--[label]="'project.page.expectedcompletion'">-->
     <!--</ds-generic-item-page-field>-->
   </div>
-  <div class="col-xs-12 col-md-6">
+  <div class="col-xs-12 col-md-7">
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isPersonOfProject'"
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html
index d83202ce12..6d1ce9a1ad 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/item-page/simple/item-types/publication/publication.component.html
@@ -53,7 +53,7 @@
       [label]="'publication.page.publisher'">
     </ds-generic-item-page-field>
   </div>
-  <div class="col-xs-12 col-md-6">
+  <div class="col-xs-12 col-md-7">
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isProjectOfPublication'"
diff --git a/src/app/shared/utils/object-list-utils.ts b/src/app/shared/utils/object-list-utils.ts
index 3837ada1fd..6c438c4600 100644
--- a/src/app/shared/utils/object-list-utils.ts
+++ b/src/app/shared/utils/object-list-utils.ts
@@ -3,7 +3,9 @@
  * placeholder font size in lists.
  */
 export function  setPlaceHolderFontSize(width: number): string {
-  if (width < 750) {
+  if (width < 400) {
+    return 'thumb-font-0'
+  } else if (width < 750) {
     return 'thumb-font-1';
   } else if (width < 1000) {
     return 'thumb-font-2';
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index df6652a02d..9bfe804c42 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -139,14 +139,32 @@ ds-dynamic-form-control-container.d-none {
   background-color: var(--ds-admin-sidebar-bg);
 }
 /* The font sizes used in "no thumbnail" placeholder */
+.thumb-font-0 {
+  .thumbnail-placeholder {
+    @media screen and (max-width: map-get($grid-breakpoints, lg)) {
+      font-size: 0.7rem !important;
+      padding: 0.2rem;
+    }
+    @media screen and (max-width: map-get($grid-breakpoints, sm)) {
+      font-size: 0.6rem !important;
+      padding: 0.1rem;
+    }
+    font-size: 0.4rem !important;
+    padding: 0.1rem;
+  }
+}
 .thumb-font-1 {
   .thumbnail-placeholder {
-    font-size: 0.7rem !important;
-    padding: 0.125rem;
     @media screen and (max-width: map-get($grid-breakpoints, sm)) {
+      font-size: 0.9rem !important;
+      padding: 0.1rem;
+    }
+    @media screen and (max-width: 950px) {
       font-size: 0.5rem !important;
       padding: 0.1rem;
     }
+    font-size: 0.7rem !important;
+    padding: 0.125rem;
     visibility: inherit;
   }
 }

From 516300f3e59058aa99fbdcbb7580ab3190fc7e2b Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Thu, 15 Sep 2022 11:52:13 -0700
Subject: [PATCH 40/73] Fixed a couple lint errors.

---
 src/app/core/data/relationship.service.spec.ts | 2 +-
 src/app/shared/utils/object-list-utils.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/core/data/relationship.service.spec.ts b/src/app/core/data/relationship.service.spec.ts
index 38a3183cac..f0e59be9ee 100644
--- a/src/app/core/data/relationship.service.spec.ts
+++ b/src/app/core/data/relationship.service.spec.ts
@@ -121,7 +121,7 @@ describe('RelationshipService', () => {
     findByHref: createSuccessfulRemoteDataObject$(relatedItems[0])
   });
 
-  const appConfig = Object.assign({browseBy: {showThumbnails: true}})
+  const appConfig = Object.assign({browseBy: {showThumbnails: true}});
 
   function initTestService() {
     return new RelationshipService(
diff --git a/src/app/shared/utils/object-list-utils.ts b/src/app/shared/utils/object-list-utils.ts
index 6c438c4600..6aa9f18510 100644
--- a/src/app/shared/utils/object-list-utils.ts
+++ b/src/app/shared/utils/object-list-utils.ts
@@ -4,7 +4,7 @@
  */
 export function  setPlaceHolderFontSize(width: number): string {
   if (width < 400) {
-    return 'thumb-font-0'
+    return 'thumb-font-0';
   } else if (width < 750) {
     return 'thumb-font-1';
   } else if (width < 1000) {

From 7047f9ccef2eff8eda0c856a234a609e0db16f37 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Thu, 15 Sep 2022 12:40:35 -0700
Subject: [PATCH 41/73] Fixed merge issue.

---
 .../simple/related-items/related-items-component.ts        | 7 ++-----
 .../simple/related-items/related-items.component.html      | 2 --
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/app/item-page/simple/related-items/related-items-component.ts b/src/app/item-page/simple/related-items/related-items-component.ts
index 6f63e8b7c9..e3866e0254 100644
--- a/src/app/item-page/simple/related-items/related-items-component.ts
+++ b/src/app/item-page/simple/related-items/related-items-component.ts
@@ -55,13 +55,10 @@ export class RelatedItemsComponent extends AbstractIncrementalListComponent<Obse
    */
   viewMode = ViewMode.ListElement;
 
-<<<<<<< HEAD
-  constructor(public relationshipService: RelationshipService, protected elementRef: ElementRef) {
-=======
-  constructor(public relationshipService: RelationshipDataService) {
->>>>>>> main
+  constructor(public relationshipService: RelationshipDataService,  protected elementRef: ElementRef) {
     super();
   }
+
   ngOnInit(): void {
     const width = this.elementRef.nativeElement.offsetWidth;
     this.placeholderFontClass = setPlaceHolderFontSize(width);
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 a72bc6b098..0d1e14941d 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
@@ -1,5 +1,4 @@
 <ds-metadata-field-wrapper [label]="label" [ngClass]="placeholderFontClass">
-  <div #relatedItems>
   <ng-container *ngFor="let objectPage of objects; let i = index">
     <ng-container *ngVar="(objectPage | async) as itemsRD">
       <ds-listable-object-component-loader *ngFor="let item of itemsRD?.payload?.page"
@@ -18,5 +17,4 @@
       </div>
     </ng-container>
   </ng-container>
-  </div>
 </ds-metadata-field-wrapper>

From 75da8ca10da3d3c809e701501637fdb2fadbe717 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Thu, 15 Sep 2022 13:20:33 -0700
Subject: [PATCH 42/73] Fixed tests after merge.

---
 src/app/core/data/relationship-data.service.spec.ts             | 2 +-
 ...rson-search-result-list-submission-element.component.spec.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/core/data/relationship-data.service.spec.ts b/src/app/core/data/relationship-data.service.spec.ts
index 796f5b6cf0..aba1f6a3eb 100644
--- a/src/app/core/data/relationship-data.service.spec.ts
+++ b/src/app/core/data/relationship-data.service.spec.ts
@@ -149,7 +149,7 @@ describe('RelationshipDataService', () => {
   });
 
   describe('composition', () => {
-    const initService = () => new RelationshipDataService(null, null, null, null, null, null, null);
+    const initService = () => new RelationshipDataService(null, null, null, null, null, null, null, null);
 
     testSearchDataImplementation(initService);
   });
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
index c580c92481..9e4d347150 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
@@ -186,7 +186,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
       declarations: [PersonSearchResultListSubmissionElementComponent, TruncatePipe],
       providers: [
         { provide: TruncatableService, useValue: {} },
-        { provide: RelationshipService, useValue: mockRelationshipService },
+        { provide: RelationshipDataService, useValue: mockRelationshipService },
         { provide: NotificationsService, useValue: {} },
         { provide: TranslateService, useValue: {} },
         { provide: NgbModal, useValue: {} },

From 900dd31351afb01520686610189070a577d01f7f Mon Sep 17 00:00:00 2001
From: "Mark H. Wood" <mwood@IUPUI.Edu>
Date: Thu, 15 Sep 2022 16:46:25 -0400
Subject: [PATCH 43/73] Get the environment by injection, as suggested.

---
 .../browse-by-metadata-page.component.ts      | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
index 8af140cc08..86450e05c2 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -1,5 +1,6 @@
 import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { Component, OnInit } from '@angular/core';
+import { Component, Inject, Injectable, OnInit } from '@angular/core';
+import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
@@ -17,19 +18,20 @@ import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
 import { BrowseByDataType, rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { map } from 'rxjs/operators';
-import { environment } from 'src/environments/environment';
 
 export const BBM_PAGINATION_ID = 'bbm';
 
+@Injectable()
 @Component({
   selector: 'ds-browse-by-metadata-page',
   styleUrls: ['./browse-by-metadata-page.component.scss'],
   templateUrl: './browse-by-metadata-page.component.html'
 })
 /**
- * Component for browsing (items) by metadata definition
- * A metadata definition (a.k.a. browse id) is a short term used to describe one or multiple metadata fields.
- * An example would be 'author' for 'dc.contributor.*'
+ * Component for browsing (items) by metadata definition.
+ * A metadata definition (a.k.a. browse id) is a short term used to describe one
+ * or multiple metadata fields.  An example would be 'author' for
+ * 'dc.contributor.*'
  */
 @rendersBrowseBy(BrowseByDataType.Metadata)
 export class BrowseByMetadataPageComponent implements OnInit {
@@ -52,11 +54,7 @@ export class BrowseByMetadataPageComponent implements OnInit {
   /**
    * The pagination config used to display the values
    */
-  paginationConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
-    id: BBM_PAGINATION_ID,
-    currentPage: 1,
-    pageSize: environment.browseBy.pageSize,
-  });
+  paginationConfig: PaginationComponentOptions;
 
   /**
    * The pagination observable
@@ -116,10 +114,16 @@ export class BrowseByMetadataPageComponent implements OnInit {
                      protected browseService: BrowseService,
                      protected dsoService: DSpaceObjectDataService,
                      protected paginationService: PaginationService,
-                     protected router: Router) {
+                     protected router: Router,
+                     @Inject(APP_CONFIG) protected appConfig: AppConfig) {
   }
 
   ngOnInit(): void {
+    this.paginationConfig = Object.assign(new PaginationComponentOptions(), {
+        id: BBM_PAGINATION_ID,
+        currentPage: 1,
+        pageSize: this.appConfig.browseBy.pageSize,
+        });
     const sortConfig = new SortOptions('default', SortDirection.ASC);
     this.updatePage(new BrowseEntrySearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);

From 7de56a4f149d76e64032838f2c87fd0846ee7510 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Fri, 16 Sep 2022 10:44:43 +0200
Subject: [PATCH 44/73] Fix unused import, remove resurrected data.service.ts

---
 .../group-form/members-list/members-list.component.ts            | 1 -
 src/app/core/data/data.service.ts                                | 0
 2 files changed, 1 deletion(-)
 delete mode 100644 src/app/core/data/data.service.ts

diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
index d136bfdb23..5c02e02d78 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -25,7 +25,6 @@ import { NotificationsService } from '../../../../shared/notifications/notificat
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 import {EpersonDtoModel} from '../../../../core/eperson/models/eperson-dto.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { isNotEmpty } from '../../../../shared/empty.util';
 
 /**
  * Keys to keep track of specific subscriptions
diff --git a/src/app/core/data/data.service.ts b/src/app/core/data/data.service.ts
deleted file mode 100644
index e69de29bb2..0000000000

From 7b47c22531b3af864404f0c1d531fbea0edc0f1f Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Fri, 16 Sep 2022 02:18:47 -0700
Subject: [PATCH 45/73] Minor css change

---
 .../simple/related-items/related-items.component.scss      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/item-page/simple/related-items/related-items.component.scss b/src/app/item-page/simple/related-items/related-items.component.scss
index 72fbdff165..6467d1399d 100644
--- a/src/app/item-page/simple/related-items/related-items.component.scss
+++ b/src/app/item-page/simple/related-items/related-items.component.scss
@@ -1,6 +1,7 @@
-
-ds-listable-object-component-loader {
-  margin-bottom: 10px;
+:host {
   display: block;
 }
+ds-listable-object-component-loader {
+  margin-bottom: 10px;
+}
 

From ccfa1410c2178d800947ccbc0cf66ad1579c393b Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Fri, 16 Sep 2022 10:07:00 -0700
Subject: [PATCH 46/73] Added embedThumbnail to FindListOptions.

---
 src/app/core/data/find-list-options.model.ts                | 1 +
 src/app/core/data/relationship-data.service.spec.ts         | 6 ++----
 src/app/core/data/relationship-data.service.ts              | 4 +---
 .../simple/related-items/related-items-component.ts         | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/app/core/data/find-list-options.model.ts b/src/app/core/data/find-list-options.model.ts
index 52a527d9e0..7467b019f5 100644
--- a/src/app/core/data/find-list-options.model.ts
+++ b/src/app/core/data/find-list-options.model.ts
@@ -11,4 +11,5 @@ export class FindListOptions {
     sort?: SortOptions;
     searchParams?: RequestParam[];
     startsWith?: string;
+    embedThumbnail?: boolean;
 }
diff --git a/src/app/core/data/relationship-data.service.spec.ts b/src/app/core/data/relationship-data.service.spec.ts
index aba1f6a3eb..50a10945a6 100644
--- a/src/app/core/data/relationship-data.service.spec.ts
+++ b/src/app/core/data/relationship-data.service.spec.ts
@@ -122,8 +122,6 @@ describe('RelationshipDataService', () => {
     findByHref: createSuccessfulRemoteDataObject$(relatedItems[0])
   });
 
-  const appConfig = Object.assign({browseBy: {showThumbnails: true}});
-
   function initTestService() {
     return new RelationshipDataService(
       requestService,
@@ -132,7 +130,6 @@ describe('RelationshipDataService', () => {
       objectCache,
       itemService,
       null,
-      appConfig,
       jasmine.createSpy('paginatedRelationsToItems').and.returnValue((v) => v),
     );
   }
@@ -149,7 +146,7 @@ describe('RelationshipDataService', () => {
   });
 
   describe('composition', () => {
-    const initService = () => new RelationshipDataService(null, null, null, null, null, null, null, null);
+    const initService = () => new RelationshipDataService(null, null, null, null, null, null, null);
 
     testSearchDataImplementation(initService);
   });
@@ -205,6 +202,7 @@ describe('RelationshipDataService', () => {
     });
 
     it('should call getItemRelationshipsByLabel with the correct params', (done) => {
+      mockOptions = Object.assign(mockOptions, { embedThumbnail: true });
       service.getRelatedItemsByLabel(
         mockItem,
         mockLabel,
diff --git a/src/app/core/data/relationship-data.service.ts b/src/app/core/data/relationship-data.service.ts
index 468d07eb3c..38490e9a8c 100644
--- a/src/app/core/data/relationship-data.service.ts
+++ b/src/app/core/data/relationship-data.service.ts
@@ -41,7 +41,6 @@ import { RequestEntryState } from './request-entry-state.model';
 import { sendRequest } from '../shared/request.operators';
 import { RestRequest } from './rest-request.model';
 import { FindListOptions } from './find-list-options.model';
-import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 import { SearchData, SearchDataImpl } from './base/search-data';
 import { PutData, PutDataImpl } from './base/put-data';
 import { IdentifiableDataService } from './base/identifiable-data.service';
@@ -86,7 +85,6 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
     protected objectCache: ObjectCacheService,
     protected itemService: ItemDataService,
     protected appStore: Store<AppState>,
-    @Inject(APP_CONFIG) private appConfig: AppConfig,
     @Inject(PAGINATED_RELATIONS_TO_ITEMS_OPERATOR) private paginatedRelationsToItems: (thisId: string) => (source: Observable<RemoteData<PaginatedList<Relationship>>>) => Observable<RemoteData<PaginatedList<Item>>>,
   ) {
     super('relationships', requestService, rdbService, objectCache, halService, 15 * 60 * 1000);
@@ -261,7 +259,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
    */
   getRelatedItemsByLabel(item: Item, label: string, options?: FindListOptions): Observable<RemoteData<PaginatedList<Item>>> {
     let linksToFollow: FollowLinkConfig<Relationship>[];
-    if (this.appConfig.browseBy.showThumbnails) {
+    if (options.embedThumbnail) {
       linksToFollow = [
         followLink('leftItem',{}, followLink('thumbnail')),
         followLink('rightItem',{}, followLink('thumbnail')),
diff --git a/src/app/item-page/simple/related-items/related-items-component.ts b/src/app/item-page/simple/related-items/related-items-component.ts
index e3866e0254..490a745533 100644
--- a/src/app/item-page/simple/related-items/related-items-component.ts
+++ b/src/app/item-page/simple/related-items/related-items-component.ts
@@ -70,6 +70,6 @@ export class RelatedItemsComponent extends AbstractIncrementalListComponent<Obse
    * @param page  The page to fetch
    */
   getPage(page: number): Observable<RemoteData<PaginatedList<Item>>> {
-    return this.relationshipService.getRelatedItemsByLabel(this.parentItem, this.relationType, Object.assign(this.options, { elementsPerPage: this.incrementBy, currentPage: page }));
+    return this.relationshipService.getRelatedItemsByLabel(this.parentItem, this.relationType, Object.assign(this.options, { elementsPerPage: this.incrementBy, currentPage: page, embedThumbnail: true }));
   }
 }

From 4b62fb2db41958ccd22f052b699e2807debb1d05 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Fri, 16 Sep 2022 10:26:15 -0700
Subject: [PATCH 47/73] Added display:block for ds-listable-component-loader
 back into related-items scss; fixes veritcal spacing issue.

---
 .../item-page/simple/related-items/related-items.component.scss  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/item-page/simple/related-items/related-items.component.scss b/src/app/item-page/simple/related-items/related-items.component.scss
index 6467d1399d..322bf5c0d8 100644
--- a/src/app/item-page/simple/related-items/related-items.component.scss
+++ b/src/app/item-page/simple/related-items/related-items.component.scss
@@ -3,5 +3,6 @@
 }
 ds-listable-object-component-loader {
   margin-bottom: 10px;
+  display: block;
 }
 

From 8d36de27d19959c5b470adb0817afa0c8c932b49 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Fri, 16 Sep 2022 20:56:38 +0200
Subject: [PATCH 48/73] 94207: Update DeleteDate to use
 buildFromRequestUUIDAndAwait

---
 src/app/core/data/base/delete-data.spec.ts | 105 +++++++++------------
 src/app/core/data/base/delete-data.ts      |  27 +-----
 2 files changed, 48 insertions(+), 84 deletions(-)

diff --git a/src/app/core/data/base/delete-data.spec.ts b/src/app/core/data/base/delete-data.spec.ts
index 7bffef18e6..a076473b0f 100644
--- a/src/app/core/data/base/delete-data.spec.ts
+++ b/src/app/core/data/base/delete-data.spec.ts
@@ -22,7 +22,7 @@ import { RequestEntryState } from '../request-entry-state.model';
 import { DeleteData, DeleteDataImpl } from './delete-data';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { fakeAsync, tick } from '@angular/core/testing';
+import { RestRequestMethod } from '../rest-request-method';
 
 /**
  * Tests whether calls to `DeleteData` methods are correctly patched through in a concrete data service that implements it
@@ -63,8 +63,6 @@ export function testDeleteDataImplementation(serviceFactory: () => DeleteData<an
 
 const endpoint = 'https://rest.api/core';
 
-const BOOLEAN = { f: false, t: true };
-
 class TestService extends DeleteDataImpl<any> {
   constructor(
     protected requestService: RequestService,
@@ -155,13 +153,13 @@ describe('DeleteDataImpl', () => {
     let MOCK_FAILED_RD;
 
     let invalidateByHrefSpy: jasmine.Spy;
-    let buildFromRequestUUIDSpy: jasmine.Spy;
+    let buildFromRequestUUIDAndAwaitSpy: jasmine.Spy;
     let getIDHrefObsSpy: jasmine.Spy;
     let deleteByHrefSpy: jasmine.Spy;
 
     beforeEach(() => {
       invalidateByHrefSpy = spyOn(service, 'invalidateByHref').and.returnValue(observableOf(true));
-      buildFromRequestUUIDSpy = spyOn(rdbService, 'buildFromRequestUUID').and.callThrough();
+      buildFromRequestUUIDAndAwaitSpy = spyOn(rdbService, 'buildFromRequestUUIDAndAwait').and.callThrough();
       getIDHrefObsSpy = spyOn(service, 'getIDHrefObs').and.callThrough();
       deleteByHrefSpy = spyOn(service, 'deleteByHref').and.callThrough();
 
@@ -171,7 +169,7 @@ describe('DeleteDataImpl', () => {
 
     it('should retrieve href by ID and call deleteByHref', () => {
       getIDHrefObsSpy.and.returnValue(observableOf('some-href'));
-      buildFromRequestUUIDSpy.and.returnValue(createSuccessfulRemoteDataObject$({}));
+      buildFromRequestUUIDAndAwaitSpy.and.returnValue(createSuccessfulRemoteDataObject$({}));
 
       service.delete('some-id', ['a', 'b', 'c']).subscribe(rd => {
         expect(getIDHrefObsSpy).toHaveBeenCalledWith('some-id');
@@ -180,66 +178,53 @@ describe('DeleteDataImpl', () => {
     });
 
     describe('deleteByHref', () => {
-      it('should call invalidateByHref if the DELETE request succeeds', (done) => {
-        buildFromRequestUUIDSpy.and.returnValue(observableOf(MOCK_SUCCEEDED_RD));
+      it('should send a DELETE request', (done) => {
+        buildFromRequestUUIDAndAwaitSpy.and.returnValue(observableOf(MOCK_SUCCEEDED_RD));
+
+        service.deleteByHref('some-href').subscribe(() => {
+          expect(requestService.send).toHaveBeenCalledWith(jasmine.objectContaining({
+            method: RestRequestMethod.DELETE,
+            href: 'some-href',
+          }));
+          done();
+        });
+      });
+
+      it('should include the virtual metadata to be copied in the DELETE request', (done) => {
+        buildFromRequestUUIDAndAwaitSpy.and.returnValue(observableOf(MOCK_SUCCEEDED_RD));
+
+        service.deleteByHref('some-href', ['a', 'b', 'c']).subscribe(() => {
+          expect(requestService.send).toHaveBeenCalledWith(jasmine.objectContaining({
+            method: RestRequestMethod.DELETE,
+            href: 'some-href?copyVirtualMetadata=a&copyVirtualMetadata=b&copyVirtualMetadata=c',
+          }));
+          done();
+        });
+      });
+
+      it('should invalidate the currently cached object', (done) => {
+        service.deleteByHref('some-href').subscribe(() => {
+          expect(buildFromRequestUUIDAndAwaitSpy).toHaveBeenCalledWith(
+            requestService.generateRequestId(),
+            jasmine.anything(),
+          );
+
+          const callback = (rdbService.buildFromRequestUUIDAndAwait as jasmine.Spy).calls.argsFor(0)[1];
+          callback();
+          expect(service.invalidateByHref).toHaveBeenCalledWith('some-href');
+
+          done();
+        });
+      });
+
+      it('should return the RemoteData of the response', (done) => {
+        buildFromRequestUUIDAndAwaitSpy.and.returnValue(observableOf(MOCK_SUCCEEDED_RD));
 
         service.deleteByHref('some-href').subscribe(rd => {
           expect(rd).toBe(MOCK_SUCCEEDED_RD);
-          expect(invalidateByHrefSpy).toHaveBeenCalled();
           done();
         });
       });
-
-      it('should call invalidateByHref even if not subscribing to returned Observable', fakeAsync(() => {
-        buildFromRequestUUIDSpy.and.returnValue(observableOf(MOCK_SUCCEEDED_RD));
-
-        service.deleteByHref('some-href');
-        tick();
-
-        expect(invalidateByHrefSpy).toHaveBeenCalled();
-      }));
-
-      it('should not call invalidateByHref if the DELETE request fails', (done) => {
-        buildFromRequestUUIDSpy.and.returnValue(observableOf(MOCK_FAILED_RD));
-
-        service.deleteByHref('some-href').subscribe(rd => {
-          expect(rd).toBe(MOCK_FAILED_RD);
-          expect(invalidateByHrefSpy).not.toHaveBeenCalled();
-          done();
-        });
-      });
-
-      it('should wait for invalidateByHref before emitting', () => {
-        testScheduler.run(({ cold, expectObservable }) => {
-          buildFromRequestUUIDSpy.and.returnValue(
-            cold('(r|)', { r: MOCK_SUCCEEDED_RD})      // RD emits right away
-          );
-          invalidateByHrefSpy.and.returnValue(
-            cold('----(t|)', BOOLEAN)                  // but we pretend that setting requests to stale takes longer
-          );
-
-          const done$ = service.deleteByHref('some-href');
-          expectObservable(done$).toBe(
-            '----(r|)', { r: MOCK_SUCCEEDED_RD}        // ...and expect the returned Observable to wait until that's done
-          );
-        });
-      });
-
-      it('should wait for the DELETE request to resolve before emitting', () => {
-        testScheduler.run(({ cold, expectObservable }) => {
-          buildFromRequestUUIDSpy.and.returnValue(
-            cold('----(r|)', { r: MOCK_SUCCEEDED_RD})   // the request takes a while
-          );
-          invalidateByHrefSpy.and.returnValue(
-            cold('(t|)', BOOLEAN)                       // but we pretend that setting to stale happens sooner
-          );                                            // e.g.: maybe already stale before this call?
-
-          const done$ = service.deleteByHref('some-href');
-          expectObservable(done$).toBe(
-            '----(r|)', { r: MOCK_SUCCEEDED_RD}         // ...and expect the returned Observable to wait for the request
-          );
-        });
-      });
     });
   });
 });
diff --git a/src/app/core/data/base/delete-data.ts b/src/app/core/data/base/delete-data.ts
index 2e34f0957c..807d9d838e 100644
--- a/src/app/core/data/base/delete-data.ts
+++ b/src/app/core/data/base/delete-data.ts
@@ -6,13 +6,12 @@
  * http://www.dspace.org/license/
  */
 import { CacheableObject } from '../../cache/cacheable-object.model';
-import { AsyncSubject, combineLatest, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 import { RemoteData } from '../remote-data';
 import { NoContent } from '../../shared/NoContent.model';
-import { filter, map, switchMap } from 'rxjs/operators';
+import { switchMap } from 'rxjs/operators';
 import { DeleteRequest } from '../request.models';
 import { hasNoValue, hasValue } from '../../../shared/empty.util';
-import { getFirstCompletedRemoteData } from '../../shared/operators';
 import { RequestService } from '../request.service';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
@@ -83,26 +82,6 @@ export class DeleteDataImpl<T extends CacheableObject> extends IdentifiableDataS
     }
     this.requestService.send(request);
 
-    const response$ = this.rdbService.buildFromRequestUUID(requestId);
-
-    const invalidated$ = new AsyncSubject<boolean>();
-    response$.pipe(
-      getFirstCompletedRemoteData(),
-      switchMap((rd: RemoteData<NoContent>) => {
-        if (rd.hasSucceeded) {
-          return this.invalidateByHref(href);
-        } else {
-          return [true];
-        }
-      })
-    ).subscribe(() => {
-      invalidated$.next(true);
-      invalidated$.complete();
-    });
-
-    return combineLatest([response$, invalidated$]).pipe(
-      filter(([_, invalidated]) => invalidated),
-      map(([response, _]) => response),
-    );
+    return this.rdbService.buildFromRequestUUIDAndAwait(requestId, () => this.invalidateByHref(href));
   }
 }

From 231b7e2c2eca75ef8712778717de59f80f6feca6 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Fri, 16 Sep 2022 12:27:16 -0700
Subject: [PATCH 49/73] Added thumbnail followLinks for
 ds-edit-relationship-list

---
 .../core/data/relationship-data.service.ts    |  4 +-
 .../edit-relationship-list.component.spec.ts  | 12 +++-
 .../edit-relationship-list.component.ts       | 27 +++++++--
 .../related-items/related-items-component.ts  | 17 +++++-
 .../related-items.component.spec.ts           | 59 ++++++++++++++++++-
 5 files changed, 106 insertions(+), 13 deletions(-)

diff --git a/src/app/core/data/relationship-data.service.ts b/src/app/core/data/relationship-data.service.ts
index 38490e9a8c..fc01880c2b 100644
--- a/src/app/core/data/relationship-data.service.ts
+++ b/src/app/core/data/relationship-data.service.ts
@@ -525,14 +525,14 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
         {
           fieldName: 'relatedItem',
           fieldValue: itemId,
-        },
+        }
       );
     });
 
     return this.searchBy(
       'byItemsAndType',
       {
-        searchParams: searchParams,
+        searchParams: searchParams
       },
     ) as Observable<RemoteData<PaginatedList<Relationship>>>;
 
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
index 76c5717bb8..4cd663f0fb 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
@@ -31,6 +31,7 @@ import { SearchConfigurationServiceStub } from '../../../../shared/testing/searc
 import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
 import { Router } from '@angular/router';
 import { RouterMock } from '../../../../shared/mocks/router.mock';
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
 
 let comp: EditRelationshipListComponent;
 let fixture: ComponentFixture<EditRelationshipListComponent>;
@@ -201,6 +202,12 @@ describe('EditRelationshipListComponent', () => {
       }))
     });
 
+    const environmentUseThumbs = {
+      browseBy: {
+        showThumbnails: true
+      }
+    };
+
     TestBed.configureTestingModule({
       imports: [SharedModule, TranslateModule.forRoot()],
       declarations: [EditRelationshipListComponent],
@@ -217,6 +224,7 @@ describe('EditRelationshipListComponent', () => {
         { provide: LinkHeadService, useValue: linkHeadService },
         { provide: ConfigurationDataService, useValue: configurationDataService },
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
+        { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ], schemas: [
         NO_ERRORS_SCHEMA
       ]
@@ -259,9 +267,11 @@ describe('EditRelationshipListComponent', () => {
 
       const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
       const findListOptions = callArgs[2];
-
+      const linksToFollow = callArgs[5];
       expect(findListOptions.elementsPerPage).toEqual(paginationOptions.pageSize);
       expect(findListOptions.currentPage).toEqual(paginationOptions.currentPage);
+      expect(linksToFollow.linksToFollow[0].name).toEqual('thumbnail');
+
     });
 
     describe('when the publication is on the left side of the relationship', () => {
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index f5a5a583d7..14a748c4b2 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Inject, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { LinkService } from '../../../../core/cache/builders/link.service';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
@@ -29,7 +29,7 @@ import { DsDynamicLookupRelationModalComponent } from '../../../../shared/form/b
 import { RelationshipOptions } from '../../../../shared/form/builder/models/relationship-options.model';
 import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
 import { SearchResult } from '../../../../shared/search/models/search-result.model';
-import { followLink } from '../../../../shared/utils/follow-link-config.model';
+import { followLink, FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Collection } from '../../../../core/shared/collection.model';
@@ -39,6 +39,7 @@ import { RelationshipTypeDataService } from '../../../../core/data/relationship-
 import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
 import { FieldUpdates } from '../../../../core/data/object-updates/field-updates.model';
 import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
+import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
 
 @Component({
   selector: 'ds-edit-relationship-list',
@@ -138,6 +139,10 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
    */
   modalRef: NgbModalRef;
 
+  /**
+   * Determines whether to ask for the embedded item thumbnail.
+   */
+  embedThumbnail: boolean;
 
   constructor(
     protected objectUpdatesService: ObjectUpdatesService,
@@ -147,7 +152,9 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     protected modalService: NgbModal,
     protected paginationService: PaginationService,
     protected selectableListService: SelectableListService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig
   ) {
+    this.embedThumbnail = this.appConfig.browseBy.showThumbnails;
   }
 
   /**
@@ -484,6 +491,17 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
       tap(() => this.loading$.next(true))
     );
 
+    // this adds thumbnail images when required by configuration
+    let linksToFollow: FollowLinkConfig<Relationship>[];
+    if (this.embedThumbnail) {
+      linksToFollow = [
+        followLink('leftItem',{}, followLink('thumbnail')),
+        followLink('rightItem',{}, followLink('thumbnail')),
+        followLink('relationshipType') ];
+    } else {
+      linksToFollow = [followLink('leftItem'), followLink('rightItem'), followLink('relationshipType')];
+    }
+
     this.subs.push(
       observableCombineLatest([
         currentPagination$,
@@ -496,12 +514,11 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
             currentItemIsLeftItem ? this.relationshipType.leftwardType : this.relationshipType.rightwardType,
             {
               elementsPerPage: currentPagination.pageSize,
-              currentPage: currentPagination.currentPage,
+              currentPage: currentPagination.currentPage
             },
             false,
             true,
-            followLink('leftItem'),
-            followLink('rightItem'),
+            ...linksToFollow
           )),
       ).subscribe((rd: RemoteData<PaginatedList<Relationship>>) => {
         this.relationshipsRd$.next(rd);
diff --git a/src/app/item-page/simple/related-items/related-items-component.ts b/src/app/item-page/simple/related-items/related-items-component.ts
index 490a745533..b58a86d2da 100644
--- a/src/app/item-page/simple/related-items/related-items-component.ts
+++ b/src/app/item-page/simple/related-items/related-items-component.ts
@@ -1,4 +1,4 @@
-import { Component, ElementRef, Input } from '@angular/core';
+import { Component, ElementRef, Inject, Input } from '@angular/core';
 import { Item } from '../../../core/shared/item.model';
 import { Observable } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
@@ -8,6 +8,7 @@ import { RelationshipDataService } from '../../../core/data/relationship-data.se
 import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
 import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { setPlaceHolderFontSize } from '../../../shared/utils/object-list-utils';
+import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
 
 @Component({
   selector: 'ds-related-items',
@@ -55,8 +56,17 @@ export class RelatedItemsComponent extends AbstractIncrementalListComponent<Obse
    */
   viewMode = ViewMode.ListElement;
 
-  constructor(public relationshipService: RelationshipDataService,  protected elementRef: ElementRef) {
+  /**
+   * Determines whether to request embedded thumbnail.
+   */
+  embedThumbnail: boolean;
+
+  constructor(public relationshipService: RelationshipDataService,
+              protected elementRef: ElementRef,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig
+              ) {
     super();
+    this.embedThumbnail = this.appConfig.browseBy.showThumbnails;
   }
 
   ngOnInit(): void {
@@ -70,6 +80,7 @@ export class RelatedItemsComponent extends AbstractIncrementalListComponent<Obse
    * @param page  The page to fetch
    */
   getPage(page: number): Observable<RemoteData<PaginatedList<Item>>> {
-    return this.relationshipService.getRelatedItemsByLabel(this.parentItem, this.relationType, Object.assign(this.options, { elementsPerPage: this.incrementBy, currentPage: page, embedThumbnail: true }));
+    return this.relationshipService.getRelatedItemsByLabel(this.parentItem, this.relationType, Object.assign(this.options,
+      { elementsPerPage: this.incrementBy, currentPage: page, embedThumbnail: this.embedThumbnail }));
   }
 }
diff --git a/src/app/item-page/simple/related-items/related-items.component.spec.ts b/src/app/item-page/simple/related-items/related-items.component.spec.ts
index 75453b5b14..89ad1685e5 100644
--- a/src/app/item-page/simple/related-items/related-items.component.spec.ts
+++ b/src/app/item-page/simple/related-items/related-items.component.spec.ts
@@ -10,6 +10,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { of as observableOf } from 'rxjs';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { APP_CONFIG } from '../../../../config/app-config.interface';
 
 const parentItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
@@ -30,6 +31,18 @@ const mockItems = [mockItem1, mockItem2];
 const relationType = 'isItemOfItem';
 let relationshipService: RelationshipDataService;
 
+const environmentUseThumbs = {
+  browseBy: {
+    showThumbnails: true
+  }
+};
+
+const enviromentNoThumbs = {
+  browseBy: {
+    showThumbnails: false
+  }
+};
+
 describe('RelatedItemsComponent', () => {
   let comp: RelatedItemsComponent;
   let fixture: ComponentFixture<RelatedItemsComponent>;
@@ -45,7 +58,8 @@ describe('RelatedItemsComponent', () => {
       imports: [TranslateModule.forRoot()],
       declarations: [RelatedItemsComponent, VarDirective],
       providers: [
-        { provide: RelationshipDataService, useValue: relationshipService }
+        { provide: RelationshipDataService, useValue: relationshipService },
+        { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(RelatedItemsComponent, {
@@ -82,9 +96,11 @@ describe('RelatedItemsComponent', () => {
     it('should call relationship-service\'s getRelatedItemsByLabel with the correct arguments (second page)', () => {
       expect(relationshipService.getRelatedItemsByLabel).toHaveBeenCalledWith(parentItem, relationType, Object.assign(comp.options, {
         elementsPerPage: comp.incrementBy,
-        currentPage: 2
+        currentPage: 2,
+        embedThumbnail: true
       }));
     });
+
   });
 
   describe('when decrease is called', () => {
@@ -100,3 +116,42 @@ describe('RelatedItemsComponent', () => {
   });
 
 });
+describe('RelatedItemsComponent', () => {
+  let comp: RelatedItemsComponent;
+  let fixture: ComponentFixture<RelatedItemsComponent>;
+
+  beforeEach(waitForAsync(() => {
+    relationshipService = jasmine.createSpyObj('relationshipService',
+      {
+        getRelatedItemsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList(mockItems)),
+      }
+    );
+
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [RelatedItemsComponent, VarDirective],
+      providers: [
+        {provide: RelationshipDataService, useValue: relationshipService},
+        {provide: APP_CONFIG, useValue: enviromentNoThumbs}
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).overrideComponent(RelatedItemsComponent, {
+      set: {changeDetection: ChangeDetectionStrategy.Default}
+    }).compileComponents();
+  }));
+
+  beforeEach(waitForAsync(() => {
+    fixture = TestBed.createComponent(RelatedItemsComponent);
+    comp = fixture.componentInstance;
+    comp.parentItem = parentItem;
+    comp.relationType = relationType;
+    fixture.detectChanges();
+  }));
+  it('should call relationship-service\'s getRelatedItemsByLabel with the correct arguments (second page)', () => {
+    expect(relationshipService.getRelatedItemsByLabel).toHaveBeenCalledWith(parentItem, relationType, Object.assign(comp.options, {
+      elementsPerPage: comp.incrementBy,
+      currentPage: 2,
+      embedThumbnail: false
+    }));
+  });
+});

From cfff05b1da76009ce774b5707343a0f240b82e86 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Fri, 16 Sep 2022 12:43:05 -0700
Subject: [PATCH 50/73] Minor style tweak

---
 src/styles/_global-styles.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index 9bfe804c42..9426aa4a4c 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -160,10 +160,10 @@ ds-dynamic-form-control-container.d-none {
       padding: 0.1rem;
     }
     @media screen and (max-width: 950px) {
-      font-size: 0.5rem !important;
+      font-size: 0.4rem !important;
       padding: 0.1rem;
     }
-    font-size: 0.7rem !important;
+    font-size: 0.6rem !important;
     padding: 0.125rem;
     visibility: inherit;
   }

From 41d1f5383f7f60f0f80e5063d95dfcf7ffdd999a Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Fri, 16 Sep 2022 17:33:20 -0700
Subject: [PATCH 51/73] Added thumbnail property to browse entry model.

---
 src/app/core/shared/browse-entry.model.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/app/core/shared/browse-entry.model.ts b/src/app/core/shared/browse-entry.model.ts
index 7556306235..d4842e1294 100644
--- a/src/app/core/shared/browse-entry.model.ts
+++ b/src/app/core/shared/browse-entry.model.ts
@@ -40,6 +40,12 @@ export class BrowseEntry extends ListableObject implements TypedObject {
   @autoserializeAs('valueLang')
   language: string;
 
+  /**
+   * Thumbnail link used when browsing items with showThumbs config enabled.
+   */
+  @autoserializeAs('thumbnail')
+  thumbnail: string;
+
   /**
    * The count of this browse entry
    */

From eb48b1b2044e8ab56f3bffa09125b059d7f87d4a Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Sat, 17 Sep 2022 10:18:10 -0700
Subject: [PATCH 52/73] Bug fix for browse.

---
 .../browse-by-date-page.component.ts          |  9 ++--
 .../browse-by-metadata-page.component.spec.ts | 41 +++++++++++++++++--
 .../browse-by-metadata-page.component.ts      | 35 ++++++++++++----
 .../browse-by-title-page.component.ts         |  9 ++--
 .../browse-entry-search-options.model.ts      |  4 +-
 src/app/core/browse/browse.service.ts         |  4 +-
 src/app/core/data/find-list-options.model.ts  |  2 +-
 .../data/relationship-data.service.spec.ts    |  2 +-
 .../core/data/relationship-data.service.ts    | 15 +++----
 .../edit-relationship-list.component.ts       | 17 +++-----
 .../related-items/related-items-component.ts  |  6 +--
 .../related-items.component.spec.ts           |  4 +-
 src/app/shared/utils/relation-query.utils.ts  | 21 ++++++++++
 13 files changed, 113 insertions(+), 56 deletions(-)

diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
index 7da6b5ede0..317b3c45c2 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
@@ -1,9 +1,8 @@
 import { ChangeDetectorRef, Component, Inject } from '@angular/core';
 import {
   BrowseByMetadataPageComponent,
-  browseParamsToOptions
+  browseParamsToOptions, getBrowseSearchOptions
 } from '../browse-by-metadata-page/browse-by-metadata-page.component';
-import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
 import { combineLatest as observableCombineLatest } from 'rxjs';
 import { RemoteData } from '../../core/data/remote-data';
 import { Item } from '../../core/shared/item.model';
@@ -51,8 +50,8 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
   ngOnInit(): void {
     const sortConfig = new SortOptions('default', SortDirection.ASC);
     this.startsWithType = StartsWithType.date;
-    this.updatePage(new BrowseEntrySearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, null,
-      null));
+    // include the thumbnail configuration in browse search options
+    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, this.fetchThumbnails));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
@@ -65,7 +64,7 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
         const metadataKeys = params.browseDefinition ? params.browseDefinition.metadataKeys : this.defaultMetadataKeys;
         this.browseId = params.id || this.defaultBrowseId;
         this.startsWith = +params.startsWith || params.startsWith;
-        const searchOptions = browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.embedThumbnail);
+        const searchOptions = browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.fetchThumbnails);
         this.updatePageWithItems(searchOptions, this.value, undefined);
         this.updateParent(params.scope);
         this.updateStartsWithOptions(this.browseId, metadataKeys, params.scope);
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
index 763279ebe5..1b3d5d0664 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
@@ -1,4 +1,8 @@
-import { BrowseByMetadataPageComponent, browseParamsToOptions } from './browse-by-metadata-page.component';
+import {
+  BrowseByMetadataPageComponent,
+  browseParamsToOptions,
+  getBrowseSearchOptions
+} from './browse-by-metadata-page.component';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { BrowseService } from '../../core/browse/browse.service';
 import { CommonModule } from '@angular/common';
@@ -127,7 +131,7 @@ describe('BrowseByMetadataPageComponent', () => {
   });
 
   it('should set embed thumbnail property to true', () => {
-    expect(comp.embedThumbnail).toBeTrue();
+    expect(comp.fetchThumbnails).toBeTrue();
   });
 
   describe('when a value is provided', () => {
@@ -164,7 +168,7 @@ describe('BrowseByMetadataPageComponent', () => {
         field: 'fake-field',
       };
 
-      result = browseParamsToOptions(paramsScope, paginationOptions, sortOptions, 'author', comp.embedThumbnail);
+      result = browseParamsToOptions(paramsScope, paginationOptions, sortOptions, 'author', comp.fetchThumbnails);
     });
 
     it('should return BrowseEntrySearchOptions with the correct properties', () => {
@@ -175,7 +179,36 @@ describe('BrowseByMetadataPageComponent', () => {
       expect(result.sort.direction).toEqual(SortDirection.ASC);
       expect(result.sort.field).toEqual('fake-field');
       expect(result.scope).toEqual('fake-scope');
-      expect(result.embedThumbnail).toBeTrue();
+      expect(result.fetchThumbnail).toBeTrue();
+    });
+  });
+
+  describe('calling getBrowseSearchOptions', () => {
+    let result: BrowseEntrySearchOptions;
+
+    beforeEach(() => {
+      const paramsScope = {
+        scope: 'fake-scope'
+      };
+      const paginationOptions = Object.assign(new PaginationComponentOptions(), {
+        currentPage: 5,
+        pageSize: 10,
+      });
+      const sortOptions = {
+        direction: SortDirection.ASC,
+        field: 'fake-field',
+      };
+
+      result = getBrowseSearchOptions('title', paginationOptions, sortOptions, comp.fetchThumbnails);
+    });
+    it('should return BrowseEntrySearchOptions with the correct properties', () => {
+
+      expect(result.metadataDefinition).toEqual('title');
+      expect(result.pagination.currentPage).toEqual(5);
+      expect(result.pagination.pageSize).toEqual(10);
+      expect(result.sort.direction).toEqual(SortDirection.ASC);
+      expect(result.sort.field).toEqual('fake-field');
+      expect(result.fetchThumbnail).toBeTrue();
     });
   });
 });
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
index 2c0e05302c..e14532c2fd 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -115,7 +115,7 @@ export class BrowseByMetadataPageComponent implements OnInit {
   /**
    * Determines whether to request embedded thumbnail.
    */
-  embedThumbnail: boolean;
+  fetchThumbnails: boolean;
 
   public constructor(protected route: ActivatedRoute,
                      protected browseService: BrowseService,
@@ -123,14 +123,13 @@ export class BrowseByMetadataPageComponent implements OnInit {
                      protected paginationService: PaginationService,
                      protected router: Router,
                      @Inject(APP_CONFIG) protected appConfig: AppConfig) {
-    this.embedThumbnail = this.appConfig.browseBy.showThumbnails;
+    this.fetchThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 
   ngOnInit(): void {
 
     const sortConfig = new SortOptions('default', SortDirection.ASC);
-    this.updatePage(new BrowseEntrySearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, null,
-      null, false));
+    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
@@ -145,7 +144,7 @@ export class BrowseByMetadataPageComponent implements OnInit {
           this.startsWith = +params.startsWith || params.startsWith;
           if (isNotEmpty(this.value)) {
             this.updatePageWithItems(
-              browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.embedThumbnail), this.value, this.authority);
+              browseParamsToOptions(params, currentPage, currentSort, this.browseId, false), this.value, this.authority);
           } else {
             this.updatePage(browseParamsToOptions(params, currentPage, currentSort, this.browseId, false));
           }
@@ -172,7 +171,6 @@ export class BrowseByMetadataPageComponent implements OnInit {
    *                          scope: string }
    */
   updatePage(searchOptions: BrowseEntrySearchOptions) {
-    searchOptions.embedThumbnail = this.embedThumbnail;
     this.browseEntries$ = this.browseService.getBrowseEntriesFor(searchOptions);
     this.items$ = undefined;
   }
@@ -240,25 +238,44 @@ export class BrowseByMetadataPageComponent implements OnInit {
 
 }
 
+/**
+ * Creates browse entry search options.
+ * @param defaultBrowseId the metadata definition to fetch entries or items for
+ * @param paginationConfig the required pagination configuration
+ * @param sortConfig the required sort configuration
+ * @param fetchThumbnails optional boolean for fetching thumbnails
+ * @returns BrowseEntrySearchOptions instance
+ */
+export function getBrowseSearchOptions(defaultBrowseId: string,
+                                       paginationConfig: PaginationComponentOptions,
+                                       sortConfig: SortOptions,
+                                       fetchThumbnails?: boolean) {
+  if (!hasValue(fetchThumbnails)) {
+    fetchThumbnails = false;
+  }
+  return new BrowseEntrySearchOptions(defaultBrowseId, paginationConfig, sortConfig, null,
+    null, fetchThumbnails);
+}
+
 /**
  * Function to transform query and url parameters into searchOptions used to fetch browse entries or items
  * @param params            URL and query parameters
  * @param paginationConfig  Pagination configuration
  * @param sortConfig        Sorting configuration
  * @param metadata          Optional metadata definition to fetch browse entries/items for
- * @param embedThumbnails   Optional parameter for requesting thumbnail images
+ * @param fetchThumbnail   Optional parameter for requesting thumbnail images
  */
 export function browseParamsToOptions(params: any,
                                       paginationConfig: PaginationComponentOptions,
                                       sortConfig: SortOptions,
                                       metadata?: string,
-                                      embedThumbnails?: boolean): BrowseEntrySearchOptions {
+                                      fetchThumbnail?: boolean): BrowseEntrySearchOptions {
   return new BrowseEntrySearchOptions(
     metadata,
     paginationConfig,
     sortConfig,
     +params.startsWith || params.startsWith,
     params.scope,
-    embedThumbnails
+    fetchThumbnail
   );
 }
diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
index 351d177899..b2281efe97 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
@@ -4,9 +4,8 @@ import { ActivatedRoute, Params, Router } from '@angular/router';
 import { hasValue } from '../../shared/empty.util';
 import {
   BrowseByMetadataPageComponent,
-  browseParamsToOptions
+  browseParamsToOptions, getBrowseSearchOptions
 } from '../browse-by-metadata-page/browse-by-metadata-page.component';
-import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { BrowseService } from '../../core/browse/browse.service';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
@@ -38,8 +37,8 @@ export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
 
   ngOnInit(): void {
     const sortConfig = new SortOptions('dc.title', SortDirection.ASC);
-    this.updatePage(new BrowseEntrySearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, null,
-      null));
+    // include the thumbnail configuration in browse search options
+    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, this.fetchThumbnails));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
@@ -50,7 +49,7 @@ export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
       ).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
         this.startsWith = +params.startsWith || params.startsWith;
         this.browseId = params.id || this.defaultBrowseId;
-        this.updatePageWithItems(browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.embedThumbnail), undefined, undefined);
+        this.updatePageWithItems(browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.fetchThumbnails), undefined, undefined);
         this.updateParent(params.scope);
       }));
     this.updateStartsWithTextOptions();
diff --git a/src/app/core/browse/browse-entry-search-options.model.ts b/src/app/core/browse/browse-entry-search-options.model.ts
index a4b04e0d57..1604c693e9 100644
--- a/src/app/core/browse/browse-entry-search-options.model.ts
+++ b/src/app/core/browse/browse-entry-search-options.model.ts
@@ -8,7 +8,7 @@ import { SortOptions } from '../cache/models/sort-options.model';
  * - sort:                Optional sorting options to use
  * - startsWith           An optional value to use to filter the browse results
  * - scope:               An optional scope to limit the results within a specific collection or community
- * - embedThumbnail       An optional boolean to request thumbnail for items
+ * - fetchThumbnail       An optional boolean to request thumbnail for items
  */
 export class BrowseEntrySearchOptions {
   constructor(public metadataDefinition: string,
@@ -16,6 +16,6 @@ export class BrowseEntrySearchOptions {
               public sort?: SortOptions,
               public startsWith?: string,
               public scope?: string,
-              public embedThumbnail?: boolean) {
+              public fetchThumbnail?: boolean) {
   }
 }
diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
index d970db9d02..2fab189254 100644
--- a/src/app/core/browse/browse.service.ts
+++ b/src/app/core/browse/browse.service.ts
@@ -102,7 +102,7 @@ export class BrowseService {
         return href;
       })
     );
-    if (options.embedThumbnail) {
+    if (options.fetchThumbnail ) {
       return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$, {}, null, null, ...BROWSE_LINKS_TO_FOLLOW);
     }
     return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$);
@@ -150,7 +150,7 @@ export class BrowseService {
         return href;
       }),
     );
-    if (options.embedThumbnail) {
+    if (options.fetchThumbnail) {
       return this.hrefOnlyDataService.findListByHref<Item>(href$, {}, null, null, ...BROWSE_LINKS_TO_FOLLOW);
     }
     return this.hrefOnlyDataService.findListByHref<Item>(href$);
diff --git a/src/app/core/data/find-list-options.model.ts b/src/app/core/data/find-list-options.model.ts
index 7467b019f5..dc567d4b53 100644
--- a/src/app/core/data/find-list-options.model.ts
+++ b/src/app/core/data/find-list-options.model.ts
@@ -11,5 +11,5 @@ export class FindListOptions {
     sort?: SortOptions;
     searchParams?: RequestParam[];
     startsWith?: string;
-    embedThumbnail?: boolean;
+    fetchThumbnail?: boolean;
 }
diff --git a/src/app/core/data/relationship-data.service.spec.ts b/src/app/core/data/relationship-data.service.spec.ts
index 50a10945a6..39aa7cbd58 100644
--- a/src/app/core/data/relationship-data.service.spec.ts
+++ b/src/app/core/data/relationship-data.service.spec.ts
@@ -202,7 +202,7 @@ describe('RelationshipDataService', () => {
     });
 
     it('should call getItemRelationshipsByLabel with the correct params', (done) => {
-      mockOptions = Object.assign(mockOptions, { embedThumbnail: true });
+      mockOptions = Object.assign(mockOptions, { fetchThumbnail: true });
       service.getRelatedItemsByLabel(
         mockItem,
         mockLabel,
diff --git a/src/app/core/data/relationship-data.service.ts b/src/app/core/data/relationship-data.service.ts
index fc01880c2b..85adeff754 100644
--- a/src/app/core/data/relationship-data.service.ts
+++ b/src/app/core/data/relationship-data.service.ts
@@ -45,6 +45,7 @@ import { SearchData, SearchDataImpl } from './base/search-data';
 import { PutData, PutDataImpl } from './base/put-data';
 import { IdentifiableDataService } from './base/identifiable-data.service';
 import { dataService } from './base/data-service.decorator';
+import { itemLinksToFollow } from '../../shared/utils/relation-query.utils';
 
 const relationshipListsStateSelector = (state: AppState) => state.relationshipLists;
 
@@ -185,7 +186,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
     ]).pipe(
       filter(([existsInOC, existsInRC]) => !existsInOC && !existsInRC),
       take(1),
-    ).subscribe(() => this.itemService.findByHref(item._links.self.href, false, true, followLink('thumbnail')));
+    ).subscribe(() => this.itemService.findByHref(item._links.self.href));
   }
 
   /**
@@ -258,15 +259,9 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
    * @param options
    */
   getRelatedItemsByLabel(item: Item, label: string, options?: FindListOptions): Observable<RemoteData<PaginatedList<Item>>> {
-    let linksToFollow: FollowLinkConfig<Relationship>[];
-    if (options.embedThumbnail) {
-      linksToFollow = [
-        followLink('leftItem',{}, followLink('thumbnail')),
-        followLink('rightItem',{}, followLink('thumbnail')),
-        followLink('relationshipType') ];
-    } else {
-      linksToFollow = [followLink('leftItem'), followLink('rightItem'), followLink('relationshipType')];
-    }
+    let linksToFollow: FollowLinkConfig<Relationship>[] = itemLinksToFollow(options.fetchThumbnail);
+    linksToFollow.push(followLink('relationshipType'));
+
     return this.getItemRelationshipsByLabel(item, label, options, true, true, ...linksToFollow).pipe(this.paginatedRelationsToItems(item.uuid));
   }
 
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 14a748c4b2..b8542f5806 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -29,7 +29,7 @@ import { DsDynamicLookupRelationModalComponent } from '../../../../shared/form/b
 import { RelationshipOptions } from '../../../../shared/form/builder/models/relationship-options.model';
 import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
 import { SearchResult } from '../../../../shared/search/models/search-result.model';
-import { followLink, FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model';
+import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Collection } from '../../../../core/shared/collection.model';
@@ -40,6 +40,7 @@ import { FieldUpdate } from '../../../../core/data/object-updates/field-update.m
 import { FieldUpdates } from '../../../../core/data/object-updates/field-updates.model';
 import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
 import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
+import { itemLinksToFollow } from '../../../../shared/utils/relation-query.utils';
 
 @Component({
   selector: 'ds-edit-relationship-list',
@@ -142,7 +143,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
   /**
    * Determines whether to ask for the embedded item thumbnail.
    */
-  embedThumbnail: boolean;
+  fetchThumbnail: boolean;
 
   constructor(
     protected objectUpdatesService: ObjectUpdatesService,
@@ -154,7 +155,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     protected selectableListService: SelectableListService,
     @Inject(APP_CONFIG) protected appConfig: AppConfig
   ) {
-    this.embedThumbnail = this.appConfig.browseBy.showThumbnails;
+    this.fetchThumbnail = this.appConfig.browseBy.showThumbnails;
   }
 
   /**
@@ -492,15 +493,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     );
 
     // this adds thumbnail images when required by configuration
-    let linksToFollow: FollowLinkConfig<Relationship>[];
-    if (this.embedThumbnail) {
-      linksToFollow = [
-        followLink('leftItem',{}, followLink('thumbnail')),
-        followLink('rightItem',{}, followLink('thumbnail')),
-        followLink('relationshipType') ];
-    } else {
-      linksToFollow = [followLink('leftItem'), followLink('rightItem'), followLink('relationshipType')];
-    }
+    let linksToFollow: FollowLinkConfig<Relationship>[] = itemLinksToFollow(this.fetchThumbnail);
 
     this.subs.push(
       observableCombineLatest([
diff --git a/src/app/item-page/simple/related-items/related-items-component.ts b/src/app/item-page/simple/related-items/related-items-component.ts
index b58a86d2da..4c76bb3828 100644
--- a/src/app/item-page/simple/related-items/related-items-component.ts
+++ b/src/app/item-page/simple/related-items/related-items-component.ts
@@ -59,14 +59,14 @@ export class RelatedItemsComponent extends AbstractIncrementalListComponent<Obse
   /**
    * Determines whether to request embedded thumbnail.
    */
-  embedThumbnail: boolean;
+  fetchThumbnail: boolean;
 
   constructor(public relationshipService: RelationshipDataService,
               protected elementRef: ElementRef,
               @Inject(APP_CONFIG) protected appConfig: AppConfig
               ) {
     super();
-    this.embedThumbnail = this.appConfig.browseBy.showThumbnails;
+    this.fetchThumbnail = this.appConfig.browseBy.showThumbnails;
   }
 
   ngOnInit(): void {
@@ -81,6 +81,6 @@ export class RelatedItemsComponent extends AbstractIncrementalListComponent<Obse
    */
   getPage(page: number): Observable<RemoteData<PaginatedList<Item>>> {
     return this.relationshipService.getRelatedItemsByLabel(this.parentItem, this.relationType, Object.assign(this.options,
-      { elementsPerPage: this.incrementBy, currentPage: page, embedThumbnail: this.embedThumbnail }));
+      { elementsPerPage: this.incrementBy, currentPage: page, fetchThumbnail: this.fetchThumbnail }));
   }
 }
diff --git a/src/app/item-page/simple/related-items/related-items.component.spec.ts b/src/app/item-page/simple/related-items/related-items.component.spec.ts
index 89ad1685e5..4307c1aaa2 100644
--- a/src/app/item-page/simple/related-items/related-items.component.spec.ts
+++ b/src/app/item-page/simple/related-items/related-items.component.spec.ts
@@ -97,7 +97,7 @@ describe('RelatedItemsComponent', () => {
       expect(relationshipService.getRelatedItemsByLabel).toHaveBeenCalledWith(parentItem, relationType, Object.assign(comp.options, {
         elementsPerPage: comp.incrementBy,
         currentPage: 2,
-        embedThumbnail: true
+        fetchThumbnail: true
       }));
     });
 
@@ -151,7 +151,7 @@ describe('RelatedItemsComponent', () => {
     expect(relationshipService.getRelatedItemsByLabel).toHaveBeenCalledWith(parentItem, relationType, Object.assign(comp.options, {
       elementsPerPage: comp.incrementBy,
       currentPage: 2,
-      embedThumbnail: false
+      fetchThumbnail: false
     }));
   });
 });
diff --git a/src/app/shared/utils/relation-query.utils.ts b/src/app/shared/utils/relation-query.utils.ts
index 13248c5a6b..62a69075fc 100644
--- a/src/app/shared/utils/relation-query.utils.ts
+++ b/src/app/shared/utils/relation-query.utils.ts
@@ -1,3 +1,6 @@
+import { followLink, FollowLinkConfig } from './follow-link-config.model';
+import { Relationship } from '../../core/shared/item-relationships/relationship.model';
+
 /**
  * Get the query for looking up items by relation type
  * @param {string} relationType   Relation type
@@ -16,3 +19,21 @@ export function getQueryByRelations(relationType: string, itemUUID: string): str
 export function getFilterByRelation(relationType: string, itemUUID: string): string {
   return `f.${relationType}=${itemUUID},equals`;
 }
+
+/**
+ * Creates links to follow for the leftItem and rightItem. Links will include
+ * @param showThumbnail thumbnail image configuration
+ * @returns followLink array
+ */
+export function itemLinksToFollow(showThumbnail: boolean):  FollowLinkConfig<Relationship>[] {
+  let linksToFollow: FollowLinkConfig<Relationship>[];
+  if (showThumbnail) {
+    linksToFollow = [
+      followLink('leftItem',{}, followLink('thumbnail')),
+      followLink('rightItem',{}, followLink('thumbnail'))
+    ];
+  } else {
+    linksToFollow = [followLink('leftItem'), followLink('rightItem')];
+  }
+  return linksToFollow;
+}

From d2d6554e26c2918f75f2cc6092177677697dfbfc Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Sat, 17 Sep 2022 10:51:45 -0700
Subject: [PATCH 53/73] Second-level browse thumbnails fixed.

---
 .../browse-by-metadata-page.component.ts                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
index e14532c2fd..4892493d74 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -144,7 +144,7 @@ export class BrowseByMetadataPageComponent implements OnInit {
           this.startsWith = +params.startsWith || params.startsWith;
           if (isNotEmpty(this.value)) {
             this.updatePageWithItems(
-              browseParamsToOptions(params, currentPage, currentSort, this.browseId, false), this.value, this.authority);
+              browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.fetchThumbnails), this.value, this.authority);
           } else {
             this.updatePage(browseParamsToOptions(params, currentPage, currentSort, this.browseId, false));
           }

From bc1e49c783c2c3f466272d3a7faed5828a7dfe59 Mon Sep 17 00:00:00 2001
From: "Mark H. Wood" <mwood@iu.edu>
Date: Mon, 19 Sep 2022 11:36:52 -0400
Subject: [PATCH 54/73] Fix @Injectable/@Component conflict

---
 .../browse-by-date-page/browse-by-date-page.component.ts  | 8 +++++---
 .../browse-by-metadata-page.component.ts                  | 3 +--
 .../browse-by-title-page.component.ts                     | 8 +++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
index 271828a38e..9b031260ce 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component } from '@angular/core';
+import { ChangeDetectorRef, Component, Inject } from '@angular/core';
 import {
   BrowseByMetadataPageComponent,
   browseParamsToOptions
@@ -19,6 +19,7 @@ import { map } from 'rxjs/operators';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { isValidDate } from '../../shared/date.util';
+import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
 
 @Component({
   selector: 'ds-browse-by-date-page',
@@ -43,8 +44,9 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
                      protected dsoService: DSpaceObjectDataService,
                      protected router: Router,
                      protected paginationService: PaginationService,
-                     protected cdRef: ChangeDetectorRef) {
-    super(route, browseService, dsoService, paginationService, router);
+                     protected cdRef: ChangeDetectorRef,
+                     @Inject(APP_CONFIG) protected appConfig: AppConfig) {
+    super(route, browseService, dsoService, paginationService, router, appConfig);
   }
 
   ngOnInit(): void {
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
index 86450e05c2..70408d3a85 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -1,5 +1,5 @@
 import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { Component, Inject, Injectable, OnInit } from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
 import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
@@ -21,7 +21,6 @@ import { map } from 'rxjs/operators';
 
 export const BBM_PAGINATION_ID = 'bbm';
 
-@Injectable()
 @Component({
   selector: 'ds-browse-by-metadata-page',
   styleUrls: ['./browse-by-metadata-page.component.scss'],
diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
index 6504a8700a..a6528bed49 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
@@ -1,5 +1,5 @@
 import { combineLatest as observableCombineLatest } from 'rxjs';
-import { Component } from '@angular/core';
+import { Component, Inject } from '@angular/core';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { hasValue } from '../../shared/empty.util';
 import {
@@ -14,6 +14,7 @@ import { BrowseByDataType, rendersBrowseBy } from '../browse-by-switcher/browse-
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { map } from 'rxjs/operators';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
 
 @Component({
   selector: 'ds-browse-by-title-page',
@@ -30,8 +31,9 @@ export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
                      protected browseService: BrowseService,
                      protected dsoService: DSpaceObjectDataService,
                      protected paginationService: PaginationService,
-                     protected router: Router) {
-    super(route, browseService, dsoService, paginationService, router);
+                     protected router: Router,
+                     @Inject(APP_CONFIG) protected appConfig: AppConfig) {
+    super(route, browseService, dsoService, paginationService, router, appConfig);
   }
 
   ngOnInit(): void {

From 4ca5571a2b5e51be44503d82ea167d3a8c785d2b Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Mon, 19 Sep 2022 18:09:05 +0200
Subject: [PATCH 55/73] [CST-6110] Remove check for password length

---
 .../forgot-password-form.component.html       |  1 -
 .../forgot-password-form.component.spec.ts    | 17 +--------
 .../forgot-password-form.component.ts         | 13 ++-----
 .../profile-page-security-form.component.html |  2 -
 ...ofile-page-security-form.component.spec.ts | 15 +-------
 .../profile-page-security-form.component.ts   | 37 +++++--------------
 .../profile-page/profile-page.component.html  |  1 -
 .../profile-page.component.spec.ts            | 17 ---------
 .../profile-page/profile-page.component.ts    |  6 +--
 .../create-profile.component.html             |  1 -
 .../create-profile.component.spec.ts          | 17 ---------
 .../create-profile.component.ts               |  9 ++---
 src/assets/i18n/en.json5                      | 18 +++------
 13 files changed, 23 insertions(+), 131 deletions(-)

diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
index f3bc9005c6..5fb0006279 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
@@ -21,7 +21,6 @@
                     [FORM_PREFIX]="'forgot-password.form.'"
                     (isInvalid)="setInValid($event)"
                     (passwordValue)="setPasswordValue($event)"
-                    [isRobustPasswordError]="isRobustPasswordError | async"
             ></ds-profile-page-security-form>
         </div>
     </div>
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
index a618e7b46d..68566efaec 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
@@ -1,4 +1,4 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
 import { RouterStub } from '../../shared/testing/router.stub';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
@@ -109,21 +109,6 @@ describe('ForgotPasswordFormComponent', () => {
       expect(notificationsService.error).toHaveBeenCalled();
     });
 
-    it('should submit a patch request for the user uuid and get robust password error stay on page', () => {
-
-      (ePersonDataService.patchPasswordWithToken as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Error', 422));
-
-      comp.password = 'password';
-      comp.isInValid = false;
-
-      comp.submit();
-
-      expect(ePersonDataService.patchPasswordWithToken).toHaveBeenCalledWith('test-uuid', 'test-token', 'password');
-      expect(store.dispatch).not.toHaveBeenCalled();
-      expect(router.navigate).not.toHaveBeenCalled();
-      expect(comp.isRobustPasswordError.value).toBeTrue();
-    });
-
     it('should submit a patch request for the user uuid when the form is invalid', () => {
 
       comp.password = 'password';
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index 5e4439fa20..e20683e6e3 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { TranslateService } from '@ngx-translate/core';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 import { Registration } from '../../core/shared/registration.model';
 import { map } from 'rxjs/operators';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -10,10 +10,7 @@ import { AuthenticateAction } from '../../core/auth/auth.actions';
 import { Store } from '@ngrx/store';
 import { RemoteData } from '../../core/data/remote-data';
 import { EPerson } from '../../core/eperson/models/eperson.model';
-import {
-  getFirstCompletedRemoteData,
-  getFirstSucceededRemoteDataPayload,
-} from '../../core/shared/operators';
+import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload, } from '../../core/shared/operators';
 import { CoreState } from '../../core/core-state.model';
 
 @Component({
@@ -39,7 +36,6 @@ export class ForgotPasswordFormComponent {
    * Prefix for the notification messages of this component
    */
   NOTIFICATIONS_PREFIX = 'forgot-password.form.notification';
-  isRobustPasswordError: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   constructor(private ePersonDataService: EPersonDataService,
               private translateService: TranslateService,
@@ -68,7 +64,6 @@ export class ForgotPasswordFormComponent {
 
   setPasswordValue($event: string) {
     this.password = $event;
-    this.isRobustPasswordError.next(false);
   }
 
   /**
@@ -80,9 +75,7 @@ export class ForgotPasswordFormComponent {
       this.ePersonDataService.patchPasswordWithToken(this.user, this.token, this.password).pipe(
         getFirstCompletedRemoteData()
       ).subscribe((response: RemoteData<EPerson>) => {
-        if (response.statusCode === 422) {
-          this.isRobustPasswordError.next(true);
-        } else if (response.hasSucceeded) {
+        if (response.hasSucceeded) {
           this.notificationsService.success(
             this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.success.title'),
             this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.success.content')
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
index 976ff88eda..0f944e0016 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
@@ -6,7 +6,5 @@
          [displaySubmit]="false"
          [displayCancel]="false">
 </ds-form>
-<div id="notLongEnough" class="container-fluid text-danger" *ngIf="formGroup.hasError('notLongEnough')">{{FORM_PREFIX + 'error.password-length' | translate}}</div>
 <div id="notSame" class="container-fluid text-danger" *ngIf="formGroup.hasError('notSame')">{{FORM_PREFIX + 'error.matching-passwords' | translate}}</div>
 <div id="emptyPassword" class="container-fluid text-danger" *ngIf="(formGroup.dirty || formGroup.touched) && formGroup.hasError('emptyPassword')">{{FORM_PREFIX + 'error.empty-password' | translate}}</div>
-<div data-test="robust-password-error" class="container-fluid text-danger" *ngIf="isRobustPasswordError">{{'password.error.robust-password' | translate}}</div>
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
index 621d67cab6..dd7a1d8655 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
@@ -1,4 +1,4 @@
-import { waitForAsync, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { VarDirective } from '../../shared/utils/var.directive';
 import { TranslateModule } from '@ngx-translate/core';
@@ -9,7 +9,6 @@ import { FormBuilderService } from '../../shared/form/builder/form-builder.servi
 import { ProfilePageSecurityFormComponent } from './profile-page-security-form.component';
 import { of as observableOf } from 'rxjs';
 import { RestResponse } from '../../core/cache/response.models';
-import { By } from '@angular/platform-browser';
 
 describe('ProfilePageSecurityFormComponent', () => {
   let component: ProfilePageSecurityFormComponent;
@@ -77,16 +76,4 @@ describe('ProfilePageSecurityFormComponent', () => {
       }));
     });
   });
-
-  describe('On robust password Error', () => {
-    it('should show/hide robust password error', () => {
-      component.isRobustPasswordError = true;
-      fixture.detectChanges();
-      expect(fixture.debugElement.query(By.css('[data-test="robust-password-error"]'))).toBeTruthy();
-
-      component.isRobustPasswordError = false;
-      fixture.detectChanges();
-      expect(fixture.debugElement.query(By.css('[data-test="robust-password-error"]'))).toBeFalsy();
-    });
-  });
 });
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
index 83548a09d7..ecee22303f 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
@@ -61,11 +61,6 @@ export class ProfilePageSecurityFormComponent implements OnInit {
   @Input()
   FORM_PREFIX: string;
 
-  /**
-   * monitor to password is weak or not from server response
-   */
-  @Input()
-  isRobustPasswordError: boolean;
   private subs: Subscription[] = [];
 
   constructor(protected formService: DynamicFormService,
@@ -77,10 +72,10 @@ export class ProfilePageSecurityFormComponent implements OnInit {
   ngOnInit(): void {
     if (this.passwordCanBeEmpty) {
       this.formGroup = this.formService.createFormGroup(this.formModel,
-        {validators: [this.checkPasswordsEqual, this.checkPasswordLength]});
+        { validators: [this.checkPasswordsEqual] });
     } else {
       this.formGroup = this.formService.createFormGroup(this.formModel,
-        {validators: [this.checkPasswordsEqual, this.checkPasswordLength, this.checkPasswordEmpty]});
+        { validators: [this.checkPasswordsEqual, this.checkPasswordEmpty] });
     }
     this.updateFieldTranslations();
     this.translate.onLangChange
@@ -88,15 +83,11 @@ export class ProfilePageSecurityFormComponent implements OnInit {
         this.updateFieldTranslations();
       });
 
-    this.subs.push(this.formGroup.statusChanges.pipe(
-      debounceTime(300),
-      map((status: string) => {
-        if (status !== 'VALID') {
-          return true;
-        } else {
-          return false;
-        }
-      })).subscribe((status) => this.isInvalid.emit(status))
+    this.subs.push(
+      this.formGroup.statusChanges.pipe(
+        debounceTime(300),
+        map((status: string) => status !== 'VALID')
+      ).subscribe((status) => this.isInvalid.emit(status))
     );
 
     this.subs.push(this.formGroup.valueChanges.pipe(
@@ -125,17 +116,7 @@ export class ProfilePageSecurityFormComponent implements OnInit {
     const pass = group.get('password').value;
     const repeatPass = group.get('passwordrepeat').value;
 
-    return pass === repeatPass ? null : {notSame: true};
-  }
-
-  /**
-   * Check if the password is at least 8 characters long
-   * @param group The FormGroup to validate
-   */
-  checkPasswordLength(group: FormGroup) {
-    const pass = group.get('password').value;
-
-    return isEmpty(pass) || pass.length >= 8 ? null : {notLongEnough: true};
+    return pass === repeatPass ? null : { notSame: true };
   }
 
   /**
@@ -144,7 +125,7 @@ export class ProfilePageSecurityFormComponent implements OnInit {
    */
   checkPasswordEmpty(group: FormGroup) {
     const pass = group.get('password').value;
-    return isEmpty(pass) ? {emptyPassword: true} : null;
+    return isEmpty(pass) ? { emptyPassword: true } : null;
   }
 
   /**
diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index 63c34d02b3..6e22f73a75 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -24,7 +24,6 @@
                 [FORM_PREFIX]="'profile.security.form.'"
                 (isInvalid)="setInvalid($event)"
                 (passwordValue)="setPasswordValue($event)"
-                [isRobustPasswordError]="isRobustPasswordError | async"
         ></ds-profile-page-security-form>
       </div>
     </div>
diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts
index bd85448566..6893ac2437 100644
--- a/src/app/profile-page/profile-page.component.spec.ts
+++ b/src/app/profile-page/profile-page.component.spec.ts
@@ -228,23 +228,6 @@ describe('ProfilePageComponent', () => {
           expect(epersonService.patch).toHaveBeenCalledWith(user, operations);
         });
       });
-
-      describe('when password is filled in, and is weak', () => {
-        let result;
-        let operations;
-
-        it('should return call epersonService.patch', () => {
-          (epersonService.patch as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Error', 422));
-          component.setPasswordValue('testest');
-
-          component.setInvalid(false);
-          operations = [{ op: 'add', path: '/password', value: 'testest' }];
-          result = component.updateSecurity();
-          expect(result).toEqual(true);
-          expect(epersonService.patch).toHaveBeenCalledWith(user, operations);
-          expect(component.isRobustPasswordError.value).toBeTrue();
-        });
-      });
     });
 
     describe('canChangePassword$', () => {
diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index 940422628d..5629a1ae18 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -73,7 +73,6 @@ export class ProfilePageComponent implements OnInit {
    */
   private currentUser: EPerson;
   canChangePassword$: Observable<boolean>;
-  isRobustPasswordError: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   isResearcherProfileEnabled$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
@@ -148,9 +147,7 @@ export class ProfilePageComponent implements OnInit {
       this.epersonService.patch(this.currentUser, [operation]).pipe(
         getFirstCompletedRemoteData()
       ).subscribe((response: RemoteData<EPerson>) => {
-        if (response.statusCode === 422) {
-          this.isRobustPasswordError.next(true);
-        } else if (response.hasSucceeded) {
+        if (response.hasSucceeded) {
           this.notificationsService.success(
             this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'success.title'),
             this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'success.content')
@@ -171,7 +168,6 @@ export class ProfilePageComponent implements OnInit {
    */
   setPasswordValue($event: string) {
     this.password = $event;
-    this.isRobustPasswordError.next(false);
   }
 
   /**
diff --git a/src/app/register-page/create-profile/create-profile.component.html b/src/app/register-page/create-profile/create-profile.component.html
index 5ef17c6b64..f56059ad69 100644
--- a/src/app/register-page/create-profile/create-profile.component.html
+++ b/src/app/register-page/create-profile/create-profile.component.html
@@ -73,7 +73,6 @@
                     [FORM_PREFIX]="'register-page.create-profile.security.'"
                     (isInvalid)="setInValid($event)"
                     (passwordValue)="setPasswordValue($event)"
-                    [isRobustPasswordError]="isRobustPasswordError | async"
             ></ds-profile-page-security-form>
         </div>
     </div>
diff --git a/src/app/register-page/create-profile/create-profile.component.spec.ts b/src/app/register-page/create-profile/create-profile.component.spec.ts
index d2d4c4c0ee..026785e59b 100644
--- a/src/app/register-page/create-profile/create-profile.component.spec.ts
+++ b/src/app/register-page/create-profile/create-profile.component.spec.ts
@@ -239,23 +239,6 @@ describe('CreateProfileComponent', () => {
       expect(notificationsService.error).toHaveBeenCalled();
     });
 
-    it('should submit an eperson for creation but password is weak', () => {
-
-      (ePersonDataService.createEPersonForToken as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Error', 422));
-
-      comp.firstName.patchValue('First');
-      comp.lastName.patchValue('Last');
-      comp.contactPhone.patchValue('Phone');
-      comp.language.patchValue('en');
-      comp.password = 'password';
-      comp.isInValidPassword = false;
-
-      comp.submitEperson();
-
-      expect(ePersonDataService.createEPersonForToken).toHaveBeenCalledWith(eperson, 'test-token');
-      expect(comp.isRobustPasswordError.value).toBeTrue();
-    });
-
     it('should submit not create an eperson when the user info form is invalid', () => {
 
       (ePersonDataService.createEPersonForToken as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Error', 500));
diff --git a/src/app/register-page/create-profile/create-profile.component.ts b/src/app/register-page/create-profile/create-profile.component.ts
index 09449b9be8..d042e63ece 100644
--- a/src/app/register-page/create-profile/create-profile.component.ts
+++ b/src/app/register-page/create-profile/create-profile.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { map } from 'rxjs/operators';
 import { Registration } from '../../core/shared/registration.model';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
 import { TranslateService } from '@ngx-translate/core';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
@@ -40,7 +40,7 @@ export class CreateProfileComponent implements OnInit {
 
   userInfoForm: FormGroup;
   activeLangs: LangConfig[];
-  isRobustPasswordError: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
   constructor(
     private translateService: TranslateService,
     private ePersonDataService: EPersonDataService,
@@ -93,7 +93,6 @@ export class CreateProfileComponent implements OnInit {
   setPasswordValue($event: string) {
     this.password = $event;
     this.isInValidPassword = this.isInValidPassword || isEmpty(this.password);
-    this.isRobustPasswordError.next(false);
   }
 
   get firstName() {
@@ -161,9 +160,7 @@ export class CreateProfileComponent implements OnInit {
       this.ePersonDataService.createEPersonForToken(eperson, this.token).pipe(
         getFirstCompletedRemoteData(),
       ).subscribe((rd: RemoteData<EPerson>) => {
-        if (rd.statusCode === 422) {
-          this.isRobustPasswordError.next(true);
-        } else if (rd.hasSucceeded) {
+        if (rd.hasSucceeded) {
           this.notificationsService.success(this.translateService.get('register-page.create-profile.submit.success.head'),
             this.translateService.get('register-page.create-profile.submit.success.content'));
           this.store.dispatch(new AuthenticateAction(this.email, this.password));
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 75cf0c9cca..a78a094d8f 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1490,7 +1490,7 @@
 
   "forgot-password.form.head": "Forgot Password",
 
-  "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least eight characters long.",
+  "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box.",
 
   "forgot-password.form.card.security": "Security",
 
@@ -1506,8 +1506,6 @@
 
   "forgot-password.form.error.matching-passwords": "The passwords do not match.",
 
-  "forgot-password.form.error.password-length": "The password should be at least 8 characters long.",
-
   "forgot-password.form.notification.error.title": "Error when trying to submit new password",
 
   "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.",
@@ -1516,8 +1514,6 @@
 
   "forgot-password.form.submit": "Submit password",
 
-  "password.error.robust-password": "New password is invalid. Valid passwords must be between 8-15 characters long and must include a minimum of: one uppercase letter, one lowercase letter, one number, and one special character (!?$@#$%^&+=).",
-
 
   "form.add": "Add more",
 
@@ -2985,7 +2981,7 @@
   "process.detail.create" : "Create similar process",
 
   "process.detail.actions": "Actions",
-  
+
   "process.detail.delete.button": "Delete process",
 
   "process.detail.delete.header": "Delete process",
@@ -3038,7 +3034,7 @@
 
   "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
 
-  
+
 
   "profile.breadcrumbs": "Update Profile",
 
@@ -3078,9 +3074,7 @@
 
   "profile.security.form.error.matching-passwords": "The passwords do not match.",
 
-  "profile.security.form.error.password-length": "The password should be at least 8 characters long.",
-
-  "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least eight characters long.",
+  "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box.",
 
   "profile.security.form.label.password": "Password",
 
@@ -3180,7 +3174,7 @@
 
   "register-page.create-profile.security.header": "Security",
 
-  "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least eight characters long.",
+  "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box.",
 
   "register-page.create-profile.security.label.password": "Password *",
 
@@ -3190,8 +3184,6 @@
 
   "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
 
-  "register-page.create-profile.security.error.password-length": "The password should be at least 8 characters long.",
-
   "register-page.create-profile.submit": "Complete Registration",
 
   "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",

From 5bdf911fc77e1fb8f825190284a9de1fb37b7ac6 Mon Sep 17 00:00:00 2001
From: "Mark H. Wood" <mwood@iu.edu>
Date: Mon, 19 Sep 2022 12:25:22 -0400
Subject: [PATCH 56/73] Specs must provide APP_CONFIG now.

---
 .../browse-by-date-page.component.spec.ts                    | 5 ++++-
 .../browse-by-metadata-page.component.spec.ts                | 5 ++++-
 .../browse-by-title-page.component.spec.ts                   | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
index 15ec9d78db..b6ff177d3d 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
@@ -23,6 +23,8 @@ import { SortDirection, SortOptions } from '../../core/cache/models/sort-options
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { FindListOptions } from '../../core/data/find-list-options.model';
+import { APP_CONFIG } from 'src/config/app-config.interface';
+import { environment } from 'src/environments/environment';
 
 describe('BrowseByDatePageComponent', () => {
   let comp: BrowseByDatePageComponent;
@@ -83,7 +85,8 @@ describe('BrowseByDatePageComponent', () => {
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
         { provide: Router, useValue: new RouterMock() },
         { provide: PaginationService, useValue: paginationService },
-        { provide: ChangeDetectorRef, useValue: mockCdRef }
+        { provide: ChangeDetectorRef, useValue: mockCdRef },
+        { provide: APP_CONFIG, useValue: environment }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
index 60d2fa549b..03152d0d3e 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
@@ -25,6 +25,8 @@ import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.util
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import { APP_CONFIG } from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment';
 
 describe('BrowseByMetadataPageComponent', () => {
   let comp: BrowseByMetadataPageComponent;
@@ -97,7 +99,8 @@ describe('BrowseByMetadataPageComponent', () => {
         { provide: BrowseService, useValue: mockBrowseService },
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
         { provide: PaginationService, useValue: paginationService },
-        { provide: Router, useValue: new RouterMock() }
+        { provide: Router, useValue: new RouterMock() },
+        { provide: APP_CONFIG, useValue: environment }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
index 554b059ac5..600eab575b 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
@@ -23,6 +23,8 @@ import { SortDirection, SortOptions } from '../../core/cache/models/sort-options
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { FindListOptions } from '../../core/data/find-list-options.model';
+import { APP_CONFIG } from 'src/config/app-config.interface';
+import { environment } from 'src/environments/environment';
 
 describe('BrowseByTitlePageComponent', () => {
   let comp: BrowseByTitlePageComponent;
@@ -77,7 +79,8 @@ describe('BrowseByTitlePageComponent', () => {
         { provide: BrowseService, useValue: mockBrowseService },
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
         { provide: PaginationService, useValue: paginationService },
-        { provide: Router, useValue: new RouterMock() }
+        { provide: Router, useValue: new RouterMock() },
+        { provide: APP_CONFIG, useValue: environment }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();

From ed611c571697cda27ffc5b8a6883649f4c414701 Mon Sep 17 00:00:00 2001
From: Toni Prieto <antonio.juan.prieto@upc.edu>
Date: Mon, 19 Sep 2022 18:49:30 +0200
Subject: [PATCH 57/73] Implement findAll function of
 SubmissionCcLicenseDataService

---
 .../core/submission/submission-cc-license-data.service.ts  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/core/submission/submission-cc-license-data.service.ts b/src/app/core/submission/submission-cc-license-data.service.ts
index 976f2acf90..e92de06a6b 100644
--- a/src/app/core/submission/submission-cc-license-data.service.ts
+++ b/src/app/core/submission/submission-cc-license-data.service.ts
@@ -6,7 +6,7 @@ import { RequestService } from '../data/request.service';
 import { SUBMISSION_CC_LICENSE } from './models/submission-cc-licence.resource-type';
 import { SubmissionCcLicence } from './models/submission-cc-license.model';
 import { BaseDataService } from '../data/base/base-data.service';
-import { FindAllData } from '../data/base/find-all-data';
+import {FindAllData, FindAllDataImpl} from '../data/base/find-all-data';
 import { FindListOptions } from '../data/find-list-options.model';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { Observable } from 'rxjs';
@@ -19,6 +19,7 @@ import { dataService } from '../data/base/data-service.decorator';
 export class SubmissionCcLicenseDataService extends BaseDataService<SubmissionCcLicence> implements FindAllData<SubmissionCcLicence> {
 
   protected linkPath = 'submissioncclicenses';
+  private findAllData: FindAllData<SubmissionCcLicence>;
 
   constructor(
     protected requestService: RequestService,
@@ -27,6 +28,8 @@ export class SubmissionCcLicenseDataService extends BaseDataService<SubmissionCc
     protected halService: HALEndpointService,
   ) {
     super('submissioncclicenses', requestService, rdbService, objectCache, halService);
+
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
@@ -44,6 +47,6 @@ export class SubmissionCcLicenseDataService extends BaseDataService<SubmissionCc
    *    Return an observable that emits object list
    */
   public findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<SubmissionCcLicence>[]): Observable<RemoteData<PaginatedList<SubmissionCcLicence>>> {
-    return undefined;
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 }

From 043b92fbc7b91157c98b8b230d2033ba13cfec30 Mon Sep 17 00:00:00 2001
From: "Mark H. Wood" <mwood@iu.edu>
Date: Mon, 19 Sep 2022 13:17:04 -0400
Subject: [PATCH 58/73] Make sure pagination is initialized in derived classes.

---
 .../browse-by-metadata-page.component.ts                    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
index 70408d3a85..20817d9675 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -115,14 +115,14 @@ export class BrowseByMetadataPageComponent implements OnInit {
                      protected paginationService: PaginationService,
                      protected router: Router,
                      @Inject(APP_CONFIG) protected appConfig: AppConfig) {
-  }
-
-  ngOnInit(): void {
     this.paginationConfig = Object.assign(new PaginationComponentOptions(), {
         id: BBM_PAGINATION_ID,
         currentPage: 1,
         pageSize: this.appConfig.browseBy.pageSize,
         });
+    }
+
+  ngOnInit(): void {
     const sortConfig = new SortOptions('default', SortDirection.ASC);
     this.updatePage(new BrowseEntrySearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);

From 3e803e8411789d66c6472455ed5d87f4c97d94b0 Mon Sep 17 00:00:00 2001
From: Mark Cooper <mark.c.cooper@outlook.com>
Date: Tue, 30 Aug 2022 15:40:43 -0700
Subject: [PATCH 59/73] Make no. of communities per pagination / expansion
 configurable

Adds new config settings for no. of communities to display on the
home page & community-list page.

Resolves #1749, resolves #1750
---
 config/config.example.yml                            |  4 ++++
 .../community-list-page/community-list-service.ts    |  3 ++-
 .../top-level-community-list.component.ts            |  3 ++-
 src/config/app-config.interface.ts                   |  1 +
 src/config/browse-communities-config.interface.ts    | 12 ++++++++++++
 src/config/default-app-config.ts                     |  5 +++++
 src/environments/environment.test.ts                 |  4 ++++
 7 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 src/config/browse-communities-config.interface.ts

diff --git a/config/config.example.yml b/config/config.example.yml
index 83ca64819a..19129f93ee 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -175,6 +175,10 @@ browseBy:
   # The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
   defaultLowerLimit: 1900
 
+browseCommunities:
+  communityListPageSize: 20
+  topLevelPageSize: 5
+
 # Item Config
 item:
   edit:
diff --git a/src/app/community-list-page/community-list-service.ts b/src/app/community-list-page/community-list-service.ts
index 89b68812ae..07080d712f 100644
--- a/src/app/community-list-page/community-list-service.ts
+++ b/src/app/community-list-page/community-list-service.ts
@@ -23,6 +23,7 @@ import { followLink } from '../shared/utils/follow-link-config.model';
 import { FlatNode } from './flat-node.model';
 import { ShowMoreFlatNode } from './show-more-flat-node.model';
 import { FindListOptions } from '../core/data/find-list-options.model';
+import { environment } from 'src/environments/environment';
 
 // Helper method to combine an flatten an array of observables of flatNode arrays
 export const combineAndFlatten = (obsList: Observable<FlatNode[]>[]): Observable<FlatNode[]> =>
@@ -80,7 +81,7 @@ const communityListStateSelector = (state: AppState) => state.communityList;
 const expandedNodesSelector = createSelector(communityListStateSelector, (communityList: CommunityListState) => communityList.expandedNodes);
 const loadingNodeSelector = createSelector(communityListStateSelector, (communityList: CommunityListState) => communityList.loadingNode);
 
-export const MAX_COMCOLS_PER_PAGE = 20;
+export const MAX_COMCOLS_PER_PAGE = environment.browseCommunities.communityListPageSize;
 
 /**
  * Service class for the community list, responsible for the creating of the flat list used by communityList dataSource
diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.ts b/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
index 5f6306649f..662e9361de 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
@@ -12,6 +12,7 @@ import { PaginationComponentOptions } from '../../shared/pagination/pagination-c
 import { hasValue } from '../../shared/empty.util';
 import { switchMap } from 'rxjs/operators';
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { environment } from 'src/environments/environment';
 
 /**
  * this component renders the Top-Level Community list
@@ -54,7 +55,7 @@ export class TopLevelCommunityListComponent implements OnInit, OnDestroy {
               private paginationService: PaginationService) {
     this.config = new PaginationComponentOptions();
     this.config.id = this.pageId;
-    this.config.pageSize = 5;
+    this.config.pageSize = environment.browseCommunities.topLevelPageSize;
     this.config.currentPage = 1;
     this.sortConfig = new SortOptions('dc.title', SortDirection.ASC);
   }
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index 6bca828a91..5794fe3ac1 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -31,6 +31,7 @@ interface AppConfig extends Config {
   defaultLanguage: string;
   languages: LangConfig[];
   browseBy: BrowseByConfig;
+  browseCommunities: BrowseCommunitiesConfig;
   item: ItemConfig;
   collection: CollectionPageConfig;
   themes: ThemeConfig[];
diff --git a/src/config/browse-communities-config.interface.ts b/src/config/browse-communities-config.interface.ts
new file mode 100644
index 0000000000..201a8235e0
--- /dev/null
+++ b/src/config/browse-communities-config.interface.ts
@@ -0,0 +1,12 @@
+import { Config } from './config.interface';
+
+export interface BrowseCommunitiesConfig extends Config {
+  /**
+   * Number of entries in the expandable community list (per show more).
+   */
+   communityListPageSize: number;
+  /**
+   * Number of entries in the paginated (home page) top level community list.
+   */
+   topLevelPageSize: number;
+}
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 5eb4a4ee6b..81bb1b1ab5 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -210,6 +210,11 @@ export class DefaultAppConfig implements AppConfig {
     defaultLowerLimit: 1900
   };
 
+  browseCommunities: BrowseCommunitiesConfig = {
+    communityListPageSize: 20,
+    topLevelPageSize: 5
+  }
+
   // Item Config
   item: ItemConfig = {
     edit: {
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 6d4545f21b..a0b382ec7c 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -204,6 +204,10 @@ export const environment: BuildConfig = {
     // The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
     defaultLowerLimit: 1900,
   },
+  browseCommunities: {
+    communityListPageSize: 20,
+    topLevelPageSize: 5
+  },
   item: {
     edit: {
       undoTimeout: 10000 // 10 seconds

From 086bd4723b0a8c58a5c6b99c77c326023fb89b48 Mon Sep 17 00:00:00 2001
From: Mark Cooper <mark.c.cooper@outlook.com>
Date: Thu, 8 Sep 2022 11:06:44 -0700
Subject: [PATCH 60/73] Resolve feedback

Inject environment rather than importing it
Redo the configuration for better consistency across pages
---
 config/config.example.yml                     | 24 ++++++++-------
 .../community-list-service.spec.ts            |  5 +++-
 .../community-list-service.ts                 | 23 ++++++++------
 ...top-level-community-list.component.spec.ts |  3 ++
 .../top-level-community-list.component.ts     | 13 ++++----
 src/config/app-config.interface.ts            |  6 ++--
 .../browse-communities-config.interface.ts    | 12 --------
 src/config/community-list-config.interface.ts |  5 ++++
 src/config/default-app-config.ts              | 30 +++++++++++--------
 src/config/homepage-config.interface.ts       |  4 ++-
 src/environments/environment.test.ts          | 23 +++++++-------
 11 files changed, 84 insertions(+), 64 deletions(-)
 delete mode 100644 src/config/browse-communities-config.interface.ts
 create mode 100644 src/config/community-list-config.interface.ts

diff --git a/config/config.example.yml b/config/config.example.yml
index 19129f93ee..7a878094d2 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -175,9 +175,20 @@ browseBy:
   # The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
   defaultLowerLimit: 1900
 
-browseCommunities:
-  communityListPageSize: 20
-  topLevelPageSize: 5
+communityList:
+  # No. of communities to list per expansion (show more)
+  pageSize: 20
+
+homePage:
+  recentSubmissions:
+    # The number of item showing in recent submission components
+    pageSize: 5
+    # Sort record of recent submission
+    sortField: 'dc.date.accessioned'
+  topLevelCommunityList:
+    # No. of communities to list per page on the home page
+    # This will always round to the nearest number from the list of page sizes. e.g. if you set it to 7 it'll use 10
+    pageSize: 5
 
 # Item Config
 item:
@@ -268,10 +279,3 @@ mediaViewer:
 info:
   enableEndUserAgreement: true
   enablePrivacyStatement: true
-# Home Page
-homePage:
-  recentSubmissions:
-	# The number of item showing in recent submission components
-      pageSize: 5
-	# Sort record of recent submission
-      sortField: 'dc.date.accessioned'
diff --git a/src/app/community-list-page/community-list-service.spec.ts b/src/app/community-list-page/community-list-service.spec.ts
index 401ffe0b11..410dd9f804 100644
--- a/src/app/community-list-page/community-list-service.spec.ts
+++ b/src/app/community-list-page/community-list-service.spec.ts
@@ -15,6 +15,8 @@ import { Collection } from '../core/shared/collection.model';
 import { PageInfo } from '../core/shared/page-info.model';
 import { FlatNode } from './flat-node.model';
 import { FindListOptions } from '../core/data/find-list-options.model';
+import { APP_CONFIG } from 'src/config/app-config.interface';
+import { environment } from 'src/environments/environment.test';
 
 describe('CommunityListService', () => {
   let store: StoreMock<AppState>;
@@ -191,13 +193,14 @@ describe('CommunityListService', () => {
     };
     TestBed.configureTestingModule({
       providers: [CommunityListService,
+        { provide: APP_CONFIG, useValue: environment },
         { provide: CollectionDataService, useValue: collectionDataServiceStub },
         { provide: CommunityDataService, useValue: communityDataServiceStub },
         { provide: Store, useValue: StoreMock },
       ],
     });
     store = TestBed.inject(Store as any);
-    service = new CommunityListService(communityDataServiceStub, collectionDataServiceStub, store);
+    service = new CommunityListService(environment, communityDataServiceStub, collectionDataServiceStub, store);
   });
 
   it('should create', inject([CommunityListService], (serviceIn: CommunityListService) => {
diff --git a/src/app/community-list-page/community-list-service.ts b/src/app/community-list-page/community-list-service.ts
index 07080d712f..99e9dbeb0d 100644
--- a/src/app/community-list-page/community-list-service.ts
+++ b/src/app/community-list-page/community-list-service.ts
@@ -1,5 +1,5 @@
 /* eslint-disable max-classes-per-file */
-import { Injectable } from '@angular/core';
+import { Inject, Injectable } from '@angular/core';
 import { createSelector, Store } from '@ngrx/store';
 
 import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
@@ -23,7 +23,7 @@ import { followLink } from '../shared/utils/follow-link-config.model';
 import { FlatNode } from './flat-node.model';
 import { ShowMoreFlatNode } from './show-more-flat-node.model';
 import { FindListOptions } from '../core/data/find-list-options.model';
-import { environment } from 'src/environments/environment';
+import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface';
 
 // Helper method to combine an flatten an array of observables of flatNode arrays
 export const combineAndFlatten = (obsList: Observable<FlatNode[]>[]): Observable<FlatNode[]> =>
@@ -81,8 +81,6 @@ const communityListStateSelector = (state: AppState) => state.communityList;
 const expandedNodesSelector = createSelector(communityListStateSelector, (communityList: CommunityListState) => communityList.expandedNodes);
 const loadingNodeSelector = createSelector(communityListStateSelector, (communityList: CommunityListState) => communityList.loadingNode);
 
-export const MAX_COMCOLS_PER_PAGE = environment.browseCommunities.communityListPageSize;
-
 /**
  * Service class for the community list, responsible for the creating of the flat list used by communityList dataSource
  *  and connection to the store to retrieve and save the state of the community list
@@ -90,8 +88,15 @@ export const MAX_COMCOLS_PER_PAGE = environment.browseCommunities.communityListP
 @Injectable()
 export class CommunityListService {
 
-  constructor(private communityDataService: CommunityDataService, private collectionDataService: CollectionDataService,
-              private store: Store<any>) {
+  private pageSize: number;
+
+  constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    private communityDataService: CommunityDataService,
+    private collectionDataService: CollectionDataService,
+    private store: Store<any>
+  ) {
+    this.pageSize = appConfig.communityList.pageSize;
   }
 
   private configOnePage: FindListOptions = Object.assign(new FindListOptions(), {
@@ -146,7 +151,7 @@ export class CommunityListService {
   private getTopCommunities(options: FindListOptions): Observable<PaginatedList<Community>> {
     return this.communityDataService.findTop({
         currentPage: options.currentPage,
-        elementsPerPage: MAX_COMCOLS_PER_PAGE,
+        elementsPerPage: this.pageSize,
         sort: {
           field: options.sort.field,
           direction: options.sort.direction
@@ -217,7 +222,7 @@ export class CommunityListService {
       let subcoms = [];
       for (let i = 1; i <= currentCommunityPage; i++) {
         const nextSetOfSubcommunitiesPage = this.communityDataService.findByParent(community.uuid, {
-            elementsPerPage: MAX_COMCOLS_PER_PAGE,
+            elementsPerPage: this.pageSize,
             currentPage: i
           },
           followLink('subcommunities', { findListOptions: this.configOnePage }),
@@ -242,7 +247,7 @@ export class CommunityListService {
       let collections = [];
       for (let i = 1; i <= currentCollectionPage; i++) {
         const nextSetOfCollectionsPage = this.collectionDataService.findByParent(community.uuid, {
-          elementsPerPage: MAX_COMCOLS_PER_PAGE,
+          elementsPerPage: this.pageSize,
           currentPage: i
         })
           .pipe(
diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts b/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts
index 17feaa9bbf..fcddccd89e 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts
@@ -32,6 +32,8 @@ import { SearchConfigurationService } from '../../core/shared/search/search-conf
 import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub';
+import { APP_CONFIG } from 'src/config/app-config.interface';
+import { environment } from 'src/environments/environment.test';
 
 describe('TopLevelCommunityList Component', () => {
   let comp: TopLevelCommunityListComponent;
@@ -151,6 +153,7 @@ describe('TopLevelCommunityList Component', () => {
       ],
       declarations: [TopLevelCommunityListComponent],
       providers: [
+        { provide: APP_CONFIG, useValue: environment },
         { provide: CommunityDataService, useValue: communityDataServiceStub },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: PaginationService, useValue: paginationService },
diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.ts b/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
index 662e9361de..7d58f57196 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, OnInit, OnDestroy } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit, OnDestroy, Inject } from '@angular/core';
 
 import { BehaviorSubject, combineLatest as observableCombineLatest, Subscription } from 'rxjs';
 
@@ -12,7 +12,7 @@ import { PaginationComponentOptions } from '../../shared/pagination/pagination-c
 import { hasValue } from '../../shared/empty.util';
 import { switchMap } from 'rxjs/operators';
 import { PaginationService } from '../../core/pagination/pagination.service';
-import { environment } from 'src/environments/environment';
+import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface';
 
 /**
  * this component renders the Top-Level Community list
@@ -51,11 +51,14 @@ export class TopLevelCommunityListComponent implements OnInit, OnDestroy {
    */
   currentPageSubscription: Subscription;
 
-  constructor(private cds: CommunityDataService,
-              private paginationService: PaginationService) {
+  constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    private cds: CommunityDataService,
+    private paginationService: PaginationService
+  ) {
     this.config = new PaginationComponentOptions();
     this.config.id = this.pageId;
-    this.config.pageSize = environment.browseCommunities.topLevelPageSize;
+    this.config.pageSize = appConfig.homePage.topLevelCommunityList.pageSize;
     this.config.currentPage = 1;
     this.sortConfig = new SortOptions('dc.title', SortDirection.ASC);
   }
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index 5794fe3ac1..6fe55aa328 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -17,7 +17,9 @@ import { BrowseByConfig } from './browse-by-config.interface';
 import { BundleConfig } from './bundle-config.interface';
 import { ActuatorsConfig } from './actuators.config';
 import { InfoConfig } from './info-config.interface';
+import { CommunityListConfig } from './community-list-config.interface';
 import { HomeConfig } from './homepage-config.interface';
+
 interface AppConfig extends Config {
   ui: UIServerConfig;
   rest: ServerConfig;
@@ -31,7 +33,8 @@ interface AppConfig extends Config {
   defaultLanguage: string;
   languages: LangConfig[];
   browseBy: BrowseByConfig;
-  browseCommunities: BrowseCommunitiesConfig;
+  communityList: CommunityListConfig;
+  homePage: HomeConfig;
   item: ItemConfig;
   collection: CollectionPageConfig;
   themes: ThemeConfig[];
@@ -39,7 +42,6 @@ interface AppConfig extends Config {
   bundle: BundleConfig;
   actuators: ActuatorsConfig
   info: InfoConfig;
-  homePage: HomeConfig;
 }
 
 /**
diff --git a/src/config/browse-communities-config.interface.ts b/src/config/browse-communities-config.interface.ts
deleted file mode 100644
index 201a8235e0..0000000000
--- a/src/config/browse-communities-config.interface.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Config } from './config.interface';
-
-export interface BrowseCommunitiesConfig extends Config {
-  /**
-   * Number of entries in the expandable community list (per show more).
-   */
-   communityListPageSize: number;
-  /**
-   * Number of entries in the paginated (home page) top level community list.
-   */
-   topLevelPageSize: number;
-}
diff --git a/src/config/community-list-config.interface.ts b/src/config/community-list-config.interface.ts
new file mode 100644
index 0000000000..5263e9e748
--- /dev/null
+++ b/src/config/community-list-config.interface.ts
@@ -0,0 +1,5 @@
+import { Config } from './config.interface';
+
+export interface CommunityListConfig extends Config {
+  pageSize: number;
+}
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 81bb1b1ab5..9bb16250fb 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -17,7 +17,9 @@ import { UIServerConfig } from './ui-server-config.interface';
 import { BundleConfig } from './bundle-config.interface';
 import { ActuatorsConfig } from './actuators.config';
 import { InfoConfig } from './info-config.interface';
+import { CommunityListConfig } from './community-list-config.interface';
 import { HomeConfig } from './homepage-config.interface';
+
 export class DefaultAppConfig implements AppConfig {
   production = false;
 
@@ -210,10 +212,21 @@ export class DefaultAppConfig implements AppConfig {
     defaultLowerLimit: 1900
   };
 
-  browseCommunities: BrowseCommunitiesConfig = {
-    communityListPageSize: 20,
-    topLevelPageSize: 5
-  }
+  communityList: CommunityListConfig = {
+    pageSize: 20
+  };
+
+  homePage: HomeConfig = {
+    recentSubmissions: {
+      //The number of item showing in recent submission components
+      pageSize: 5,
+      //sort record of recent submission
+      sortField: 'dc.date.accessioned',
+    },
+    topLevelCommunityList: {
+      pageSize: 5
+    }
+  };
 
   // Item Config
   item: ItemConfig = {
@@ -345,13 +358,4 @@ export class DefaultAppConfig implements AppConfig {
     enableEndUserAgreement: true,
     enablePrivacyStatement: true
   };
-  // Home Pages
-  homePage: HomeConfig = {
-    recentSubmissions: {
-      //The number of item showing in recent submission components
-      pageSize: 5,
-      //sort record of recent submission
-      sortField: 'dc.date.accessioned',
-    }
-  };
 }
diff --git a/src/config/homepage-config.interface.ts b/src/config/homepage-config.interface.ts
index 1f955358e0..df5d29cfe0 100644
--- a/src/config/homepage-config.interface.ts
+++ b/src/config/homepage-config.interface.ts
@@ -16,5 +16,7 @@ export interface HomeConfig extends Config {
     sortField: string;
   }
 
-
+  topLevelCommunityList: {
+    pageSize: number;
+  };
 }
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index a0b382ec7c..733c4b308c 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -204,9 +204,18 @@ export const environment: BuildConfig = {
     // The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
     defaultLowerLimit: 1900,
   },
-  browseCommunities: {
-    communityListPageSize: 20,
-    topLevelPageSize: 5
+  communityList: {
+    pageSize: 20
+  },
+  homePage: {
+    recentSubmissions: {
+      pageSize: 5,
+      //sort record of recent submission
+      sortField: 'dc.date.accessioned',
+    },
+    topLevelCommunityList: {
+      pageSize: 5
+    }
   },
   item: {
     edit: {
@@ -256,12 +265,4 @@ export const environment: BuildConfig = {
     enableEndUserAgreement: true,
     enablePrivacyStatement: true,
   },
-  //Home Page
-  homePage: {
-    recentSubmissions: {
-      pageSize: 5,
-      //sort record of recent submission
-      sortField: 'dc.date.accessioned',
-    }
-  }
 };

From 86364ad375c84bff603fc8cf4218effef755a5e4 Mon Sep 17 00:00:00 2001
From: Toni Prieto <antonio.juan.prieto@upc.edu>
Date: Tue, 20 Sep 2022 09:28:16 +0200
Subject: [PATCH 61/73] Add test for SubmissionCcLicenseDataService

---
 .../submission-cc-license-data.service.spec.ts  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 src/app/core/submission/submission-cc-license-data.service.spec.ts

diff --git a/src/app/core/submission/submission-cc-license-data.service.spec.ts b/src/app/core/submission/submission-cc-license-data.service.spec.ts
new file mode 100644
index 0000000000..b3650bac0a
--- /dev/null
+++ b/src/app/core/submission/submission-cc-license-data.service.spec.ts
@@ -0,0 +1,17 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+import { SubmissionCcLicenseDataService } from './submission-cc-license-data.service';
+import { testFindAllDataImplementation } from '../data/base/find-all-data.spec';
+
+describe('SubmissionCcLicenseDataService', () => {
+
+  describe('composition', () => {
+    const initService = () => new SubmissionCcLicenseDataService(null, null, null, null);
+    testFindAllDataImplementation(initService);
+  });
+});

From c844423fc3329e63f3f7de8a1b930d293e15cd47 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Tue, 20 Sep 2022 16:15:13 +0200
Subject: [PATCH 62/73] 94485: Fix initialization deadlock when backend is
 unavailable

When the REST server can't be found, `getEndpoint` errors out, no request gets sent, which causes `fetchRequest` to never emit.

Because of this the `checkTokenCookie$` effect would get deadlocked and initialization would never complete.
---
 src/app/core/auth/auth-request.service.spec.ts |  2 --
 src/app/core/auth/auth-request.service.ts      | 16 ++++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/app/core/auth/auth-request.service.spec.ts b/src/app/core/auth/auth-request.service.spec.ts
index 2afeb26b02..704922c5b5 100644
--- a/src/app/core/auth/auth-request.service.spec.ts
+++ b/src/app/core/auth/auth-request.service.spec.ts
@@ -111,7 +111,6 @@ describe(`AuthRequestService`, () => {
             body: undefined,
             options,
           }));
-          expect((service as any).fetchRequest).toHaveBeenCalledWith(requestID);
         });
       });
     });
@@ -151,7 +150,6 @@ describe(`AuthRequestService`, () => {
             body: { content: 'something' },
             options,
           }));
-          expect((service as any).fetchRequest).toHaveBeenCalledWith(requestID);
         });
       });
     });
diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts
index 7fd93fb014..5c0c3340c7 100644
--- a/src/app/core/auth/auth-request.service.ts
+++ b/src/app/core/auth/auth-request.service.ts
@@ -58,7 +58,9 @@ export abstract class AuthRequestService {
   public postToEndpoint(method: string, body?: any, options?: HttpOptions): Observable<RemoteData<AuthStatus>> {
     const requestId = this.requestService.generateRequestId();
 
-    this.halService.getEndpoint(this.linkName).pipe(
+    const endpoint$ = this.halService.getEndpoint(this.linkName);
+
+    endpoint$.pipe(
       filter((href: string) => isNotEmpty(href)),
       map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
       distinctUntilChanged(),
@@ -68,7 +70,9 @@ export abstract class AuthRequestService {
       this.requestService.send(request);
     });
 
-    return this.fetchRequest(requestId);
+    return endpoint$.pipe(
+      switchMap(() => this.fetchRequest(requestId)),
+    );
   }
 
   /**
@@ -79,7 +83,9 @@ export abstract class AuthRequestService {
   public getRequest(method: string, options?: HttpOptions, ...linksToFollow: FollowLinkConfig<any>[]): Observable<RemoteData<AuthStatus>> {
     const requestId = this.requestService.generateRequestId();
 
-    this.halService.getEndpoint(this.linkName).pipe(
+    const endpoint$ = this.halService.getEndpoint(this.linkName);
+
+    endpoint$.pipe(
       filter((href: string) => isNotEmpty(href)),
       map((endpointURL) => this.getEndpointByMethod(endpointURL, method, ...linksToFollow)),
       distinctUntilChanged(),
@@ -89,7 +95,9 @@ export abstract class AuthRequestService {
       this.requestService.send(request);
     });
 
-    return this.fetchRequest(requestId, ...linksToFollow);
+    return endpoint$.pipe(
+      switchMap(() => this.fetchRequest(requestId, ...linksToFollow)),
+    );
   }
   /**
    * Factory function to create the request object to send. This needs to be a POST client side and

From 594b6d61c3742a3fcf5ef02dd80c9ab4b562cd0b Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Tue, 20 Sep 2022 16:21:01 +0200
Subject: [PATCH 63/73] 94485: Use relative path for theme CSS

This bug was originally fixed in #1642 but reintroduced in #1805
---
 src/app/shared/theme-support/theme.service.spec.ts | 2 +-
 src/app/shared/theme-support/theme.service.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/theme-support/theme.service.spec.ts b/src/app/shared/theme-support/theme.service.spec.ts
index 43b5964b8c..f56fb86cbc 100644
--- a/src/app/shared/theme-support/theme.service.spec.ts
+++ b/src/app/shared/theme-support/theme.service.spec.ts
@@ -413,7 +413,7 @@ describe('ThemeService', () => {
       link.setAttribute('rel', 'stylesheet');
       link.setAttribute('type', 'text/css');
       link.setAttribute('class', 'theme-css');
-      link.setAttribute('href', '/custom-theme.css');
+      link.setAttribute('href', 'custom-theme.css');
 
       expect(headSpy.appendChild).toHaveBeenCalledWith(link);
     });
diff --git a/src/app/shared/theme-support/theme.service.ts b/src/app/shared/theme-support/theme.service.ts
index c0b04cd6b3..6d2939a5f8 100644
--- a/src/app/shared/theme-support/theme.service.ts
+++ b/src/app/shared/theme-support/theme.service.ts
@@ -182,7 +182,7 @@ export class ThemeService {
     link.setAttribute('rel', 'stylesheet');
     link.setAttribute('type', 'text/css');
     link.setAttribute('class', 'theme-css');
-    link.setAttribute('href', `/${encodeURIComponent(themeName)}-theme.css`);
+    link.setAttribute('href', `${encodeURIComponent(themeName)}-theme.css`);
     // wait for the new css to download before removing the old one to prevent a
     // flash of unstyled content
     link.onload = () => {

From b9ac08eba3775f9d1c726614a7814d20e9dea612 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Tue, 20 Sep 2022 16:17:00 +0200
Subject: [PATCH 64/73] 94485: Fix selectors for themed error pages

---
 src/app/page-error/themed-page-error.component.ts               | 2 +-
 .../themed-page-internal-server-error.component.ts              | 2 +-
 src/app/pagenotfound/themed-pagenotfound.component.ts           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/page-error/themed-page-error.component.ts b/src/app/page-error/themed-page-error.component.ts
index 34d29fb2a9..3bfc6bf1a1 100644
--- a/src/app/page-error/themed-page-error.component.ts
+++ b/src/app/page-error/themed-page-error.component.ts
@@ -6,7 +6,7 @@ import { PageErrorComponent } from './page-error.component';
  * Themed wrapper for PageErrorComponent
  */
 @Component({
-  selector: 'ds-themed-search-page',
+  selector: 'ds-themed-page-error',
   styleUrls: [],
   templateUrl: '../shared/theme-support/themed.component.html',
 })
diff --git a/src/app/page-internal-server-error/themed-page-internal-server-error.component.ts b/src/app/page-internal-server-error/themed-page-internal-server-error.component.ts
index e8792c4789..a5f9101b69 100644
--- a/src/app/page-internal-server-error/themed-page-internal-server-error.component.ts
+++ b/src/app/page-internal-server-error/themed-page-internal-server-error.component.ts
@@ -6,7 +6,7 @@ import { PageInternalServerErrorComponent } from './page-internal-server-error.c
  * Themed wrapper for PageInternalServerErrorComponent
  */
 @Component({
-  selector: 'ds-themed-search-page',
+  selector: 'ds-themed-page-internal-server-error',
   styleUrls: [],
   templateUrl: '../shared/theme-support/themed.component.html',
 })
diff --git a/src/app/pagenotfound/themed-pagenotfound.component.ts b/src/app/pagenotfound/themed-pagenotfound.component.ts
index e6ef9eb700..3d284b1d6d 100644
--- a/src/app/pagenotfound/themed-pagenotfound.component.ts
+++ b/src/app/pagenotfound/themed-pagenotfound.component.ts
@@ -6,7 +6,7 @@ import { PageNotFoundComponent } from './pagenotfound.component';
  * Themed wrapper for PageNotFoundComponent
  */
 @Component({
-  selector: 'ds-themed-search-page',
+  selector: 'ds-themed-pagenotfound',
   styleUrls: [],
   templateUrl: '../shared/theme-support/themed.component.html',
 })

From 4be09885a23aeb01fca0cb765c7fe243e87eaad7 Mon Sep 17 00:00:00 2001
From: Andrea Bollini <andrea.bollini@4science.it>
Date: Wed, 21 Sep 2022 00:02:30 +0200
Subject: [PATCH 65/73] Add label for the citation page curation task

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

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index e7f31350be..828740c215 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1266,6 +1266,7 @@
 
   "cookies.consent.purpose.statistical": "Statistical",
 
+  "curation-task.task.citationpage.label":  "Generate Citation Page",
 
   "curation-task.task.checklinks.label":  "Check Links in Metadata",
 

From 1ebaa65161e4247a7e17f822a07f3d5dcde076ad Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Tue, 20 Sep 2022 16:22:31 -0700
Subject: [PATCH 66/73] Fixed path for collection list.

---
 .../themed-community-page-sub-collection-list.component.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts b/src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts
index 95d9968819..f1f49f204c 100644
--- a/src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts
+++ b/src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts
@@ -18,7 +18,7 @@ export class ThemedCollectionPageSubCollectionListComponent extends ThemedCompon
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/community-page/sub-community-list/community-page-sub-collection-list.component`);
+    return import(`../../../themes/${themeName}/app/community-page/sub-collection-list/community-page-sub-collection-list.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {

From 4d43a34cb31cafe561a8bfb24c284c1fd8d17a36 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Tue, 20 Sep 2022 17:08:57 -0700
Subject: [PATCH 67/73] Revised pageSize input to override the value provided
 via configuration.

---
 .../community-page-sub-collection-list.component.ts        | 7 +++++--
 .../community-page-sub-community-list.component.ts         | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
index f72405ce13..9a7950f77d 100644
--- a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
+++ b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -12,6 +12,7 @@ import { SortDirection, SortOptions } from '../../core/cache/models/sort-options
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { switchMap } from 'rxjs/operators';
+import { hasValue } from '../../shared/empty.util';
 
 @Component({
   selector: 'ds-community-page-sub-collection-list',
@@ -23,7 +24,7 @@ export class CommunityPageSubCollectionListComponent implements OnInit, OnDestro
   @Input() community: Community;
 
   /**
-   * Optional page size (defaults to 5)
+   * Optional page size. Overrides communityList.pageSize configuration for this component.
    */
   @Input() pageSize: number;
 
@@ -55,7 +56,9 @@ export class CommunityPageSubCollectionListComponent implements OnInit, OnDestro
   ngOnInit(): void {
     this.config = new PaginationComponentOptions();
     this.config.id = this.pageId;
-    this.pageSize ? this.config.pageSize = this.pageSize : this.config.pageSize = 5;
+    if(hasValue(this.pageSize)) {
+      this.config.pageSize = this.pageSize
+    }
     this.config.currentPage = 1;
     this.sortConfig = new SortOptions('dc.title', SortDirection.ASC);
     this.initPage();
diff --git a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
index 5ba89490b9..aeb5efab6a 100644
--- a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
+++ b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
@@ -12,6 +12,7 @@ import { CommunityDataService } from '../../core/data/community-data.service';
 import { takeUntilCompletedRemoteData } from '../../core/shared/operators';
 import { switchMap } from 'rxjs/operators';
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { hasValue } from '../../shared/empty.util';
 
 @Component({
   selector: 'ds-community-page-sub-community-list',
@@ -26,7 +27,7 @@ export class CommunityPageSubCommunityListComponent implements OnInit, OnDestroy
   @Input() community: Community;
 
   /**
-   * Optional page size (defaults to 5).
+   * Optional page size. Overrides communityList.pageSize configuration for this component.
    */
   @Input() pageSize: number;
 
@@ -58,7 +59,9 @@ export class CommunityPageSubCommunityListComponent implements OnInit, OnDestroy
   ngOnInit(): void {
     this.config = new PaginationComponentOptions();
     this.config.id = this.pageId;
-    this.pageSize ? this.config.pageSize = this.pageSize : this.config.pageSize = 5;
+    if(hasValue(this.pageSize)) {
+      this.config.pageSize = this.pageSize
+    }
     this.config.currentPage = 1;
     this.sortConfig = new SortOptions('dc.title', SortDirection.ASC);
     this.initPage();

From 5a815da5f266a2e09d09b2ee35c3e7ed4fcdd549 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Tue, 20 Sep 2022 17:17:15 -0700
Subject: [PATCH 68/73] Updated comments.

---
 .../community-page-sub-collection-list.component.ts          | 5 +++--
 .../community-page-sub-community-list.component.ts           | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
index 9a7950f77d..181ee7cd6f 100644
--- a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
+++ b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -25,6 +25,7 @@ export class CommunityPageSubCollectionListComponent implements OnInit, OnDestro
 
   /**
    * Optional page size. Overrides communityList.pageSize configuration for this component.
+   * Value can be added in the themed version of the parent component.
    */
   @Input() pageSize: number;
 
@@ -56,8 +57,8 @@ export class CommunityPageSubCollectionListComponent implements OnInit, OnDestro
   ngOnInit(): void {
     this.config = new PaginationComponentOptions();
     this.config.id = this.pageId;
-    if(hasValue(this.pageSize)) {
-      this.config.pageSize = this.pageSize
+    if (hasValue(this.pageSize)) {
+      this.config.pageSize = this.pageSize;
     }
     this.config.currentPage = 1;
     this.sortConfig = new SortOptions('dc.title', SortDirection.ASC);
diff --git a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
index aeb5efab6a..e9da10bfa1 100644
--- a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
+++ b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
@@ -28,6 +28,7 @@ export class CommunityPageSubCommunityListComponent implements OnInit, OnDestroy
 
   /**
    * Optional page size. Overrides communityList.pageSize configuration for this component.
+   * Value can be added in the themed version of the parent component.
    */
   @Input() pageSize: number;
 
@@ -59,8 +60,8 @@ export class CommunityPageSubCommunityListComponent implements OnInit, OnDestroy
   ngOnInit(): void {
     this.config = new PaginationComponentOptions();
     this.config.id = this.pageId;
-    if(hasValue(this.pageSize)) {
-      this.config.pageSize = this.pageSize
+    if (hasValue(this.pageSize)) {
+      this.config.pageSize = this.pageSize;
     }
     this.config.currentPage = 1;
     this.sortConfig = new SortOptions('dc.title', SortDirection.ASC);

From 53b5d27eeafe063df2313e94213024d7a4135e61 Mon Sep 17 00:00:00 2001
From: Nikunj Sharma <nikunj.sharma@4science.com>
Date: Wed, 21 Sep 2022 16:39:58 +0530
Subject: [PATCH 69/73] CST-6110 removed key i18 not used

---
 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 a78a094d8f..619b086ea0 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3086,8 +3086,6 @@
 
   "profile.security.form.notifications.error.title": "Error changing passwords",
 
-  "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 8 characters long.",
-
   "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
 
   "profile.security.form.notifications.error.general": "Please fill required fields of security form.",

From dda15e998ad88681f099dff32eb7155415685723 Mon Sep 17 00:00:00 2001
From: "David P. Steelman" <dsteelma@umd.edu>
Date: Wed, 21 Sep 2022 07:50:38 -0400
Subject: [PATCH 70/73] Issue 1843 - Fix default bundles example in
 config.example.yml

Provides the correct YAML configuration for configuring
the default bundles configuration.
---
 config/config.example.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 7a878094d2..afddb82a36 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -264,7 +264,7 @@ themes:
 
 # The default bundles that should always be displayed as suggestions when you upload a new bundle
 bundle:
-  - standardBundles: [ ORIGINAL, THUMBNAIL, LICENSE ]
+  standardBundles: [ ORIGINAL, THUMBNAIL, LICENSE ]
 
 # Whether to enable media viewer for image and/or video Bitstreams (i.e. Bitstreams whose MIME type starts with 'image' or 'video').
 # For images, this enables a gallery viewer where you can zoom or page through images.

From 7f696b24d65cf9bd2217b3a24a1ac0eccffaf92e Mon Sep 17 00:00:00 2001
From: "Mark H. Wood" <mwood@iu.edu>
Date: Wed, 21 Sep 2022 08:21:54 -0400
Subject: [PATCH 71/73] Add to example configuration.

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

diff --git a/config/config.example.yml b/config/config.example.yml
index ae733e0be5..214fc241b5 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -168,6 +168,10 @@ browseBy:
   fiveYearLimit: 30
   # The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
   defaultLowerLimit: 1900
+  # The number of entries in a paginated browse results list.
+  # Rounded to the nearest size in the list of selectable sizes on the
+  # settings menu.
+  pageSize: 20
 
 # Item Config
 item:

From 3717c661cae09a432273b08fa0b66499d0dcfc06 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Thu, 22 Sep 2022 12:29:13 +0200
Subject: [PATCH 72/73] Fix button layout in ds-resource-policies

---
 .../shared/resource-policies/resource-policies.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index 1db068aa1d..277f6e4998 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -11,7 +11,7 @@
                 ({{resourceUUID}})
               </ng-container>
             </span>
-            <div class="space-children-mr">
+            <div class="space-children-mr flex-shrink-0">
               <button class="btn btn-danger p-1"
                       [disabled]="(!(canDelete() | async)) || (isProcessingDelete() | async)"
                       [title]="'resource-policies.delete.btn.title' | translate"

From a269817fe361e7c9fd7f8ac26b06ec0b2ad11aea Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Thu, 22 Sep 2022 16:57:28 -0700
Subject: [PATCH 73/73] Added platform detection for placeholder classes.

---
 .../related-items/related-items-component.ts  | 16 ++++++---
 .../object-collection.component.html          |  2 +-
 .../object-collection.component.ts            | 35 +++++++++++--------
 src/app/shared/utils/object-list-utils.ts     |  2 +-
 src/styles/_global-styles.scss                | 26 ++++++++------
 5 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/src/app/item-page/simple/related-items/related-items-component.ts b/src/app/item-page/simple/related-items/related-items-component.ts
index 4c76bb3828..2746670abe 100644
--- a/src/app/item-page/simple/related-items/related-items-component.ts
+++ b/src/app/item-page/simple/related-items/related-items-component.ts
@@ -1,4 +1,4 @@
-import { Component, ElementRef, Inject, Input } from '@angular/core';
+import { Component, ElementRef, Inject, Input, PLATFORM_ID } from '@angular/core';
 import { Item } from '../../../core/shared/item.model';
 import { Observable } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
@@ -7,8 +7,9 @@ import { ViewMode } from '../../../core/shared/view-mode.model';
 import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
 import { FindListOptions } from '../../../core/data/find-list-options.model';
-import { setPlaceHolderFontSize } from '../../../shared/utils/object-list-utils';
+import { setPlaceHolderAttributes } from '../../../shared/utils/object-list-utils';
 import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
+import { isPlatformBrowser } from '@angular/common';
 
 @Component({
   selector: 'ds-related-items',
@@ -63,15 +64,20 @@ export class RelatedItemsComponent extends AbstractIncrementalListComponent<Obse
 
   constructor(public relationshipService: RelationshipDataService,
               protected elementRef: ElementRef,
-              @Inject(APP_CONFIG) protected appConfig: AppConfig
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
+              @Inject(PLATFORM_ID) private platformId: Object
               ) {
     super();
     this.fetchThumbnail = this.appConfig.browseBy.showThumbnails;
   }
 
   ngOnInit(): void {
-    const width = this.elementRef.nativeElement.offsetWidth;
-    this.placeholderFontClass = setPlaceHolderFontSize(width);
+    if (isPlatformBrowser(this.platformId)) {
+      const width = this.elementRef.nativeElement.offsetWidth;
+      this.placeholderFontClass = setPlaceHolderAttributes(width);
+    } else {
+      this.placeholderFontClass = 'hide-placeholder-text';
+    }
     super.ngOnInit();
   }
 
diff --git a/src/app/shared/object-collection/object-collection.component.html b/src/app/shared/object-collection/object-collection.component.html
index 2b0df677d6..eb72d07fe5 100644
--- a/src/app/shared/object-collection/object-collection.component.html
+++ b/src/app/shared/object-collection/object-collection.component.html
@@ -1,4 +1,4 @@
-<ds-object-list [ngClass]="placeholderFontClass" #objectList [config]="config"
+<ds-object-list [ngClass]="placeholderFontClass" [config]="config"
                 [sortConfig]="sortConfig"
                 [objects]="objects"
                 [hasBorder]="hasBorder"
diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts
index 809d956c72..3c3de72d21 100644
--- a/src/app/shared/object-collection/object-collection.component.ts
+++ b/src/app/shared/object-collection/object-collection.component.ts
@@ -1,10 +1,10 @@
 import {
   ChangeDetectorRef,
   Component, ElementRef,
-  EventEmitter,
+  EventEmitter, Inject,
   Input,
   OnInit,
-  Output,
+  Output, PLATFORM_ID,
 } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 
@@ -21,7 +21,8 @@ import { ViewMode } from '../../core/shared/view-mode.model';
 import { CollectionElementLinkType } from './collection-element-link.type';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { Context } from '../../core/shared/context.model';
-import { setPlaceHolderFontSize } from '../utils/object-list-utils';
+import { setPlaceHolderAttributes } from '../utils/object-list-utils';
+import { isPlatformBrowser } from '@angular/common';
 
 /**
  * Component that can render a list of listable objects in different view modes
@@ -161,17 +162,7 @@ export class ObjectCollectionComponent implements OnInit {
   placeholderFontClass: string;
 
 
-  ngOnInit(): void {
-    this.currentMode$ = this.route
-      .queryParams
-      .pipe(
-        map((params) => isEmpty(params?.view) ? ViewMode.ListElement : params.view),
-        distinctUntilChanged()
-      );
-    const width = this.elementRef.nativeElement.offsetWidth;
-    this.placeholderFontClass = setPlaceHolderFontSize(width);
 
-  }
 
   /**
    * @param cdRef
@@ -187,7 +178,23 @@ export class ObjectCollectionComponent implements OnInit {
     private cdRef: ChangeDetectorRef,
     private route: ActivatedRoute,
     private router: Router,
-    private elementRef: ElementRef) {
+    private elementRef: ElementRef,
+    @Inject(PLATFORM_ID) private platformId: Object) {
+  }
+
+  ngOnInit(): void {
+    this.currentMode$ = this.route
+      .queryParams
+      .pipe(
+        map((params) => isEmpty(params?.view) ? ViewMode.ListElement : params.view),
+        distinctUntilChanged()
+      );
+    if (isPlatformBrowser(this.platformId)) {
+      const width = this.elementRef.nativeElement.offsetWidth;
+      this.placeholderFontClass = setPlaceHolderAttributes(width);
+    } else {
+      this.placeholderFontClass = 'hide-placeholder-text';
+    }
   }
 
   /**
diff --git a/src/app/shared/utils/object-list-utils.ts b/src/app/shared/utils/object-list-utils.ts
index 6aa9f18510..cb7b6b739a 100644
--- a/src/app/shared/utils/object-list-utils.ts
+++ b/src/app/shared/utils/object-list-utils.ts
@@ -2,7 +2,7 @@
  * Sets the class to be used for the "no thumbnail"
  * placeholder font size in lists.
  */
-export function  setPlaceHolderFontSize(width: number): string {
+export function  setPlaceHolderAttributes(width: number): string {
   if (width < 400) {
     return 'thumb-font-0';
   } else if (width < 750) {
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index 9426aa4a4c..486b09bc70 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -142,43 +142,47 @@ ds-dynamic-form-control-container.d-none {
 .thumb-font-0 {
   .thumbnail-placeholder {
     @media screen and (max-width: map-get($grid-breakpoints, lg)) {
-      font-size: 0.7rem !important;
+      font-size: 0.7rem;
       padding: 0.2rem;
     }
     @media screen and (max-width: map-get($grid-breakpoints, sm)) {
-      font-size: 0.6rem !important;
+      font-size: 0.6rem;
       padding: 0.1rem;
     }
-    font-size: 0.4rem !important;
+    font-size: 0.4rem;
     padding: 0.1rem;
   }
 }
+
+.hide-placeholder-text {
+  .thumbnail-placeholder {
+    color: transparent !important;
+  }
+}
+
 .thumb-font-1 {
   .thumbnail-placeholder {
     @media screen and (max-width: map-get($grid-breakpoints, sm)) {
-      font-size: 0.9rem !important;
+      font-size: 0.9rem;
       padding: 0.1rem;
     }
     @media screen and (max-width: 950px) {
-      font-size: 0.4rem !important;
+      font-size: 0.4rem;
       padding: 0.1rem;
     }
-    font-size: 0.6rem !important;
+    font-size: 0.6rem;
     padding: 0.125rem;
-    visibility: inherit;
   }
 }
 .thumb-font-2 {
   .thumbnail-placeholder {
-    font-size: 0.9rem !important;
+    font-size: 0.9rem;
     padding: 0.125rem;
-    visibility: inherit;
   }
 }
 .thumb-font-3 {
   .thumbnail-placeholder {
-    font-size: 1.25rem !important;
+    font-size: 1.25rem;
     padding: 0.5rem;
-    visibility: inherit;
   }
 }