From 9336e793de56ea5b4f5b9c71f1c944a21e178d2e Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 19 Feb 2024 12:34:48 +0100
Subject: [PATCH] FIx issues from main alignment, remove leftover removed in
 Suggestion PR

---
 .../ldn-service-form.component.html           |  10 +-
 .../ldn-service-form.component.spec.ts        | 181 ++++-
 .../ldn-service-form.component.ts             |   3 +-
 .../ldn-services-directory.component.html     |  11 +-
 .../ldn-services-model/ldn-services.model.ts  |   4 +
 .../ldn-service-coar-patterns.ts              |   5 +
 .../notify-info/notify-info.component.html    |   5 +-
 .../notify-info/notify-info.service.ts        |   6 +-
 src/app/core/data/data.service.ts             | 747 ------------------
 src/app/core/data/update-data.service.ts      |   2 -
 .../simple/item-page.component.spec.ts        |   2 +-
 .../notify-requests-status.component.ts       |   5 +
 src/app/shared/mocks/active-router.mock.ts    |  19 +-
 src/assets/i18n/en.json5                      |  29 +-
 .../home-news/home-news.component.html        |  49 +-
 .../dspace/app/navbar/navbar.component.html   |   7 +-
 16 files changed, 278 insertions(+), 807 deletions(-)
 delete mode 100644 src/app/core/data/data.service.ts

diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
index dbfe5b49fdd..f3daab9f3eb 100644
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
@@ -1,7 +1,7 @@
 <div class="container">
   <form (ngSubmit)="onSubmit()" [formGroup]="formModel">
     <div class="d-flex">
-      <h2 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translate) : ('ldn-edit-registered-service.title' | translate) }}</h2>
+      <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translate) : ('ldn-edit-registered-service.title' | translate) }}</h1>
     </div>
     <!-- In the toggle section -->
     <div class="toggle-switch-container" *ngIf="!isNewService">
@@ -139,7 +139,7 @@ <h2 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
               <div #inboundPatternDropdown="ngbDropdown" class="w-80" display="dynamic"
                    id="additionalInboundPattern{{i}}"
                    ngbDropdown placement="top-start">
-                <div class="position-relative right-addon" role="combobox">
+                <div class="position-relative right-addon" role="combobox"  aria-expanded="false" aria-controls="inboundPatternDropdownButton">
                   <i aria-hidden="true" class="position-absolute scrollable-dropdown-toggle"
                      ngbDropdownToggle></i>
                   <input
@@ -151,6 +151,7 @@ <h2 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
                     id="inboundPatternDropdownButton"
                     ngbDropdownAnchor
                     type="text"
+                    [attr.aria-label]="'ldn-service-input-inbound-pattern-dropdown' | translate"
                   />
                   <div aria-labelledby="inboundPatternDropdownButton"
                        class="dropdown-menu dropdown-menu-top w-100 "
@@ -175,7 +176,7 @@ <h2 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
                 *ngIf="formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern">
                 <div #inboundItemfilterDropdown="ngbDropdown" class="w-100" id="constraint{{i}}" ngbDropdown
                      placement="top-start">
-                  <div class="position-relative right-addon" role="combobox">
+                  <div class="position-relative right-addon" aria-expanded="false" aria-controls="inboundItemfilterDropdown" role="combobox">
                     <i aria-hidden="true" class="position-absolute scrollable-dropdown-toggle"
                        ngbDropdownToggle></i>
                     <input
@@ -187,6 +188,7 @@ <h2 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
                       id="inboundItemfilterDropdown"
                       ngbDropdownAnchor
                       type="text"
+                      [attr.aria-label]="'ldn-service-input-inbound-item-filter-dropdown' | translate"
                     />
                     <div aria-labelledby="inboundItemfilterDropdownButton"
                          class="dropdown-menu scrollable-dropdown-menu w-100 "
@@ -226,6 +228,7 @@ <h2 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
             <div class="col-sm-2">
               <div class="btn-group">
                 <button (click)="markForInboundPatternDeletion(i)" class="btn btn-outline-dark trash-button"
+                        [title]="'ldn-service-button-mark-inbound-deletion' | translate"
                         type="button">
                   <i class="fas fa-trash"></i>
                 </button>
@@ -233,6 +236,7 @@ <h2 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
 
                 <button (click)="unmarkForInboundPatternDeletion(i)"
                         *ngIf="markedForDeletionInboundPattern.includes(i)"
+                        [title]="'ldn-service-button-unmark-inbound-deletion' | translate"
                         class="btn btn-warning "
                         type="button">
                   <i class="fas fa-undo"></i>
diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts
index 73b45c14551..de66b1e2dd1 100644
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts
@@ -1,9 +1,9 @@
-import {ComponentFixture, TestBed} from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 
 import {NgbDropdownModule, NgbModal} from '@ng-bootstrap/ng-bootstrap';
 import {LdnServiceFormComponent} from './ldn-service-form.component';
 import {ChangeDetectorRef, EventEmitter} from '@angular/core';
-import {FormBuilder, ReactiveFormsModule} from '@angular/forms';
+import { FormArray, FormBuilder, FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
 import {ActivatedRoute, Router} from '@angular/router';
 import {TranslateModule, TranslateService} from '@ngx-translate/core';
 import {PaginationService} from 'ngx-pagination';
@@ -13,18 +13,50 @@ import {LdnServicesService} from '../ldn-services-data/ldn-services-data.service
 import {RouterStub} from '../../../shared/testing/router.stub';
 import {MockActivatedRoute} from '../../../shared/mocks/active-router.mock';
 import {NotificationsServiceStub} from '../../../shared/testing/notifications-service.stub';
-import {of} from 'rxjs';
+import { of as observableOf, of } from 'rxjs';
 import {RouteService} from '../../../core/services/route.service';
 import {provideMockStore} from '@ngrx/store/testing';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { By } from '@angular/platform-browser';
 
 describe('LdnServiceFormEditComponent', () => {
   let component: LdnServiceFormComponent;
   let fixture: ComponentFixture<LdnServiceFormComponent>;
 
-  let ldnServicesService: any;
+  let ldnServicesService: LdnServicesService;
   let ldnItemfiltersService: any;
   let cdRefStub: any;
   let modalService: any;
+  let activatedRoute: MockActivatedRoute;
+
+  const testId = '1234';
+  const routeParams = {
+    serviceId: testId,
+  };
+  const routeUrlSegments = [{path: 'path'}];
+  const formMockValue = {
+    'id': '',
+    'name': 'name',
+    'description': 'description',
+    'url': 'www.test.com',
+    'ldnUrl': 'https://test.com',
+    'lowerIp': '127.0.0.1',
+    'upperIp': '100.100.100.100',
+    'score': 1,
+    'inboundPattern': '',
+    'constraintPattern': '',
+    'enabled': '',
+    'type': 'ldnservice',
+    'notifyServiceInboundPatterns': [
+      {
+        'pattern': '',
+        'patternLabel': 'Select a pattern',
+        'constraint': '',
+        'automatic': false
+      }
+    ]
+  };
+
 
   const translateServiceStub = {
     get: () => of('translated-text'),
@@ -35,9 +67,12 @@ describe('LdnServiceFormEditComponent', () => {
   };
 
   beforeEach(async () => {
-    ldnServicesService = {
-      update: () => ({}),
-    };
+    ldnServicesService = jasmine.createSpyObj('ldnServicesService', {
+      create: observableOf(null),
+      update: observableOf(null),
+      findById: createSuccessfulRemoteDataObject$({}),
+    });
+
     ldnItemfiltersService = {
       findAll: () => of(['item1', 'item2']),
     };
@@ -49,6 +84,9 @@ describe('LdnServiceFormEditComponent', () => {
       }
     };
 
+
+    activatedRoute = new MockActivatedRoute(routeParams, routeUrlSegments);
+
     await TestBed.configureTestingModule({
       imports: [ReactiveFormsModule, TranslateModule.forRoot(), NgbDropdownModule],
       declarations: [LdnServiceFormComponent],
@@ -56,10 +94,10 @@ describe('LdnServiceFormEditComponent', () => {
         {provide: LdnServicesService, useValue: ldnServicesService},
         {provide: LdnItemfiltersService, useValue: ldnItemfiltersService},
         {provide: Router, useValue: new RouterStub()},
-        {provide: ActivatedRoute, useValue: new MockActivatedRoute()},
+        {provide: ActivatedRoute, useValue: activatedRoute},
         {provide: ChangeDetectorRef, useValue: cdRefStub},
         {provide: NgbModal, useValue: modalService},
-        {provide: NotificationsService, useValue: NotificationsServiceStub},
+        {provide: NotificationsService, useValue: new NotificationsServiceStub()},
         {provide: TranslateService, useValue: translateServiceStub},
         {provide: PaginationService, useValue: {}},
         FormBuilder,
@@ -71,10 +109,135 @@ describe('LdnServiceFormEditComponent', () => {
 
     fixture = TestBed.createComponent(LdnServiceFormComponent);
     component = fixture.componentInstance;
+    spyOn(component, 'filterPatternObjectsAndAssignLabel').and.callFake((a) => a);
     fixture.detectChanges();
   });
 
   it('should create', () => {
     expect(component).toBeTruthy();
+    expect(component.formModel instanceof FormGroup).toBeTruthy();
+  });
+
+  it('should init properties correctly', fakeAsync(() => {
+    spyOn(component, 'fetchServiceData');
+    spyOn(component, 'setItemfilters');
+    component.ngOnInit();
+    tick(100);
+    expect((component as any).serviceId).toEqual(testId);
+    expect(component.isNewService).toBeFalsy();
+    expect(component.areControlsInitialized).toBeTruthy();
+    expect(component.formModel.controls.notifyServiceInboundPatterns).toBeDefined();
+    expect(component.fetchServiceData).toHaveBeenCalledWith(testId);
+    expect(component.setItemfilters).toHaveBeenCalled();
+  }));
+
+  it('should unsubscribe on destroy', () => {
+    spyOn((component as any).routeSubscription, 'unsubscribe');
+    component.ngOnDestroy();
+    expect((component as any).routeSubscription.unsubscribe).toHaveBeenCalled();
+  });
+
+  it('should handle create service with valid form', () => {
+    spyOn(component, 'fetchServiceData').and.callFake((a) => a);
+    component.formModel.addControl('notifyServiceInboundPatterns', (component as any).formBuilder.array([{pattern: 'patternValue'}]));
+    const nameInput = fixture.debugElement.query(By.css('#name'));
+    const descriptionInput = fixture.debugElement.query(By.css('#description'));
+    const urlInput = fixture.debugElement.query(By.css('#url'));
+    const scoreInput = fixture.debugElement.query(By.css('#score'));
+    const lowerIpInput = fixture.debugElement.query(By.css('#lowerIp'));
+    const upperIpInput = fixture.debugElement.query(By.css('#upperIp'));
+    const ldnUrlInput = fixture.debugElement.query(By.css('#ldnUrl'));
+    component.formModel.patchValue(formMockValue);
+
+    nameInput.nativeElement.value = 'testName';
+    descriptionInput.nativeElement.value = 'testDescription';
+    urlInput.nativeElement.value = 'tetsUrl.com';
+    ldnUrlInput.nativeElement.value = 'tetsLdnUrl.com';
+    scoreInput.nativeElement.value = 1;
+    lowerIpInput.nativeElement.value = '127.0.0.1';
+    upperIpInput.nativeElement.value = '127.0.0.1';
+
+    fixture.detectChanges();
+
+    expect(component.formModel.valid).toBeTruthy();
+  });
+
+  it('should handle create service with invalid form', () => {
+    const nameInput = fixture.debugElement.query(By.css('#name'));
+
+    nameInput.nativeElement.value = 'testName';
+    fixture.detectChanges();
+
+    expect(component.formModel.valid).toBeFalsy();
+  });
+
+  it('should not create service with invalid form', () => {
+    spyOn(component.formModel, 'markAllAsTouched');
+    spyOn(component, 'closeModal');
+    component.createService();
+
+    expect(component.formModel.markAllAsTouched).toHaveBeenCalled();
+    expect(component.closeModal).toHaveBeenCalled();
+  });
+
+  it('should create service with valid form', () => {
+    spyOn(component.formModel, 'markAllAsTouched');
+    spyOn(component, 'closeModal');
+    spyOn(component, 'checkPatterns').and.callFake(() => true);
+    component.formModel.addControl('notifyServiceInboundPatterns', (component as any).formBuilder.array([{pattern: 'patternValue'}]));
+    component.formModel.patchValue(formMockValue);
+    component.createService();
+
+    expect(component.formModel.markAllAsTouched).toHaveBeenCalled();
+    expect(component.closeModal).not.toHaveBeenCalled();
+    expect(ldnServicesService.create).toHaveBeenCalled();
+  });
+
+  it('should check patterns', () => {
+    const arrValid = new FormArray([
+      new FormGroup({
+        pattern: new FormControl('pattern')
+      }),
+    ]);
+
+    const arrInvalid = new FormArray([
+      new FormGroup({
+        pattern: new FormControl('')
+      }),
+    ]);
+
+    expect(component.checkPatterns(arrValid)).toBeTruthy();
+    expect(component.checkPatterns(arrInvalid)).toBeFalsy();
+  });
+
+  it('should fetch service data', () => {
+    component.fetchServiceData(testId);
+    expect(ldnServicesService.findById).toHaveBeenCalledWith(testId);
+    expect(component.filterPatternObjectsAndAssignLabel).toHaveBeenCalled();
+    expect((component as any).ldnService).toEqual({});
+  });
+
+  it('should generate patch operations', () => {
+    spyOn(component as any, 'createReplaceOperation');
+    spyOn(component as any, 'handlePatterns');
+    component.generatePatchOperations();
+    expect((component as any).createReplaceOperation).toHaveBeenCalledTimes(7);
+    expect((component as any).handlePatterns).toHaveBeenCalled();
+  });
+
+  it('should open modal on submit', () => {
+    spyOn(component, 'openConfirmModal');
+    component.onSubmit();
+    expect(component.openConfirmModal).toHaveBeenCalled();
+  });
+
+
+  it('should reset form and leave', () => {
+    spyOn(component as any, 'sendBack');
+    spyOn(component as any, 'closeModal');
+
+    component.resetFormAndLeave();
+    expect((component as any).closeModal).toHaveBeenCalled();
+    expect((component as any).sendBack).toHaveBeenCalled();
   });
 });
diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
index 41fdd71160c..34cc6ea7993 100644
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
@@ -130,7 +130,8 @@ export class LdnServiceFormComponent implements OnInit, OnDestroy {
    */
   createService() {
     this.formModel.markAllAsTouched();
-    const hasInboundPattern = this.checkPatterns(this.formModel.get('notifyServiceInboundPatterns') as FormArray);
+    const notifyServiceInboundPatterns = this.formModel.get('notifyServiceInboundPatterns') as FormArray;
+    const hasInboundPattern = notifyServiceInboundPatterns?.length > 0 ? this.checkPatterns(notifyServiceInboundPatterns) : false;
 
     if (this.formModel.invalid) {
       this.closeModal();
diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
index 52cb7f47507..0aaa39bda21 100644
--- a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
+++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
@@ -1,6 +1,6 @@
 <div class="container">
   <div class="d-flex">
-    <h2 class="flex-grow-1">{{ 'ldn-registered-services.title' | translate }}</h2>
+    <h1 class="flex-grow-1">{{ 'ldn-registered-services.title' | translate }}</h1>
   </div>
   <div class="d-flex justify-content-end">
     <button class="btn btn-success" routerLink="/admin/ldn/services/new"><i
@@ -44,10 +44,14 @@ <h2 class="flex-grow-1">{{ 'ldn-registered-services.title' | translate }}</h2>
           </td>
           <td>
             <div class="btn-group">
-              <button (click)="selectServiceToDelete(ldnService.id)" class="btn btn-outline-danger">
+              <button
+                (click)="selectServiceToDelete(ldnService.id)"
+                [attr.aria-label]="'ldn-service-overview-select-delete' | translate"
+                class="btn btn-outline-danger">
                 <i class="fas fa-trash"></i>
               </button>
               <button [routerLink]="['/admin/ldn/services/edit/', ldnService.id]"
+                      [attr.aria-label]="'ldn-service-overview-select-edit' | translate"
                       class="btn btn-outline-dark">
                 <i class="fas fa-edit"></i>
               </button>
@@ -69,6 +73,7 @@ <h2 class="flex-grow-1">{{ 'ldn-registered-services.title' | translate }}</h2>
         <h4>{{'service.overview.delete.header' | translate }}</h4>
       </div>
       <button (click)="closeModal()" aria-label="Close"
+              [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
               class="close" type="button">
         <span aria-hidden="true">×</span>
       </button>
@@ -80,9 +85,11 @@ <h4>{{'service.overview.delete.header' | translate }}</h4>
       </div>
       <div class="mt-4">
         <button (click)="closeModal()"
+                [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
                 class="btn btn-primary mr-2">{{ 'service.detail.delete.cancel' | translate }}</button>
         <button (click)="deleteSelected(this.selectedServiceId.toString(), ldnServicesService)"
                 class="btn btn-danger"
+                [attr.aria-label]="'ldn-service-overview-select-delete' | translate"
                 id="delete-confirm">{{ 'service.overview.delete' | translate }}
         </button>
       </div>
diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-services.model.ts b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-services.model.ts
index 8beb7fda687..9e803fbc013 100644
--- a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-services.model.ts
+++ b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-services.model.ts
@@ -7,6 +7,10 @@ import {typedObject} from '../../../core/cache/builders/build-decorators';
 import {NotifyServicePattern} from './ldn-service-patterns.model';
 
 
+/**
+ * LDN Services bounded to each selected pattern, relation set in service creation
+ */
+
 export interface LdnServiceByPattern {
   allowsMultipleRequests: boolean;
   services: LdnService[];
diff --git a/src/app/admin/admin-ldn-services/ldn-services-patterns/ldn-service-coar-patterns.ts b/src/app/admin/admin-ldn-services/ldn-services-patterns/ldn-service-coar-patterns.ts
index 8620bfc80c5..1c63d0cf786 100644
--- a/src/app/admin/admin-ldn-services/ldn-services-patterns/ldn-service-coar-patterns.ts
+++ b/src/app/admin/admin-ldn-services/ldn-services-patterns/ldn-service-coar-patterns.ts
@@ -1,3 +1,8 @@
+/**
+ * All available patterns for LDN service creation.
+ * They are used to populate a dropdown in the LDN service form creation
+ */
+
 export const notifyPatterns = [
 
   'ack-accept',
diff --git a/src/app/core/coar-notify/notify-info/notify-info.component.html b/src/app/core/coar-notify/notify-info/notify-info.component.html
index b60c989028a..3370f83d03c 100644
--- a/src/app/core/coar-notify/notify-info/notify-info.component.html
+++ b/src/app/core/coar-notify/notify-info/notify-info.component.html
@@ -10,6 +10,9 @@ <h2>{{ 'coar-notify-support.ldn-inbox.title' | translate }}</h2>
     <p [innerHTML]="('coar-notify-support.ldn-inbox.content' | translate).replace('{ldnInboxUrl}', generateCoarRestApiLinksHTML() | async)"></p>
 
     <h2>{{ 'coar-notify-support.message-moderation.title' | translate }}</h2>
-    <p [innerHTML]="('coar-notify-support.message-moderation.content' | translate)"></p>
+    <p>
+      {{ 'coar-notify-support.message-moderation.content' | translate }}
+      <a routerLink="/info/feedback" >{{ 'coar-notify-support.message-moderation.feedback-form' | translate }}</a>
+    </p>
     </body>
 </div>
diff --git a/src/app/core/coar-notify/notify-info/notify-info.service.ts b/src/app/core/coar-notify/notify-info/notify-info.service.ts
index 8690a075654..3db39e08795 100644
--- a/src/app/core/coar-notify/notify-info/notify-info.service.ts
+++ b/src/app/core/coar-notify/notify-info/notify-info.service.ts
@@ -4,6 +4,9 @@ import { ConfigurationDataService } from '../../data/configuration-data.service'
 import { map, Observable } from 'rxjs';
 import { ConfigurationProperty } from '../../shared/configuration-property.model';
 
+/**
+ * Service to check COAR availability and LDN services information for the COAR Notify functionalities
+ */
 @Injectable({
     providedIn: 'root'
 })
@@ -23,8 +26,7 @@ export class NotifyInfoService {
             getFirstSucceededRemoteData(),
             map(response => {
                 const booleanArrayValue = response.payload.values;
-                const coarConfigEnabled = booleanArrayValue.length > 0 ? booleanArrayValue[0] === 'true' : false;
-                return coarConfigEnabled;
+                return booleanArrayValue.length > 0 ? booleanArrayValue[0] === 'true' : false;
             })
         );
     }
diff --git a/src/app/core/data/data.service.ts b/src/app/core/data/data.service.ts
deleted file mode 100644
index 43b60f874d0..00000000000
--- a/src/app/core/data/data.service.ts
+++ /dev/null
@@ -1,747 +0,0 @@
-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 {
-  distinctUntilChanged,
-  filter,
-  find,
-  map,
-  mergeMap,
-  skipWhile,
-  switchMap,
-  take,
-  takeWhile,
-  tap,
-  toArray
-} from 'rxjs/operators';
-import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
-import { NotificationOptions } from '../../shared/notifications/models/notification-options.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { getClassForType } from '../cache/builders/build-decorators';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { RequestParam } from '../cache/models/request-param.model';
-import { ObjectCacheEntry } from '../cache/object-cache.reducer';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
-import { URLCombiner } from '../url-combiner/url-combiner';
-import { ChangeAnalyzer } from './change-analyzer';
-import { PaginatedList } from './paginated-list.model';
-import { RemoteData } from './remote-data';
-import {
-  CreateRequest,
-  DeleteByIDRequest,
-  DeleteRequest,
-  GetRequest,
-  PatchRequest,
-  PostRequest,
-  PutRequest
-} from './request.models';
-import { RequestService } from './request.service';
-import { RestRequestMethod } from './rest-request-method';
-import { UpdateDataService } from './update-data.service';
-import { GenericConstructor } from '../shared/generic-constructor';
-import { NoContent } from '../shared/NoContent.model';
-import { CacheableObject } from '../cache/cacheable-object.model';
-import { CoreState } from '../core-state.model';
-import { FindListOptions } from './find-list-options.model';
-
-export abstract class DataService<T extends CacheableObject> implements UpdateDataService<T> {
-  protected abstract requestService: RequestService;
-  protected abstract rdbService: RemoteDataBuildService;
-  protected abstract store: Store<CoreState>;
-  protected abstract linkPath: string;
-  protected abstract halService: HALEndpointService;
-  protected abstract objectCache: ObjectCacheService;
-  protected abstract notificationsService: NotificationsService;
-  protected abstract http: HttpClient;
-  protected abstract comparator: ChangeAnalyzer<T>;
-
-  /**
-   * Allows subclasses to reset the response cache time.
-   */
-  protected responseMsToLive: number;
-
-  /**
-   * Get the endpoint for browsing
-   * @param options The [[FindListOptions]] object
-   * @param linkPath The link path for the object
-   * @returns {Observable<string>}
-   */
-  getBrowseEndpoint(options: FindListOptions = {}, linkPath?: string): Observable<string> {
-    return this.getEndpoint();
-  }
-
-  /**
-   * Get the base endpoint for all requests
-   */
-  protected getEndpoint(): Observable<string> {
-    return this.halService.getEndpoint(this.linkPath);
-  }
-
-  /**
-   * Create the HREF with given options object
-   *
-   * @param options The [[FindListOptions]] object
-   * @param linkPath The link path for the object
-   * @return {Observable<string>}
-   *    Return an observable that emits created HREF
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
-   */
-  public getFindAllHref(options: FindListOptions = {}, linkPath?: string, ...linksToFollow: FollowLinkConfig<T>[]): Observable<string> {
-    let endpoint$: Observable<string>;
-    const args = [];
-
-    endpoint$ = this.getBrowseEndpoint(options).pipe(
-      filter((href: string) => isNotEmpty(href)),
-      map((href: string) => isNotEmpty(linkPath) ? `${href}/${linkPath}` : href),
-      distinctUntilChanged()
-    );
-
-    return endpoint$.pipe(map((result: string) => this.buildHrefFromFindOptions(result, options, args, ...linksToFollow)));
-  }
-
-  /**
-   * Create the HREF for a specific object's search method with given options object
-   *
-   * @param searchMethod The search method for the object
-   * @param options The [[FindListOptions]] object
-   * @return {Observable<string>}
-   *    Return an observable that emits created HREF
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
-   */
-  public getSearchByHref(searchMethod: string, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<T>[]): Observable<string> {
-    let result$: Observable<string>;
-    const args = [];
-
-    result$ = this.getSearchEndpoint(searchMethod);
-
-    return result$.pipe(map((result: string) => this.buildHrefFromFindOptions(result, options, args, ...linksToFollow)));
-  }
-
-  /**
-   * Turn an options object into a query string and combine it with the given HREF
-   *
-   * @param href The HREF to which the query string should be appended
-   * @param options The [[FindListOptions]] object
-   * @param extraArgs Array with additional params to combine with query string
-   * @return {Observable<string>}
-   *    Return an observable that emits created HREF
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
-   */
-  public buildHrefFromFindOptions(href: string, options: FindListOptions, extraArgs: string[] = [], ...linksToFollow: FollowLinkConfig<T>[]): string {
-    let args = [...extraArgs];
-
-    if (hasValue(options.currentPage) && typeof options.currentPage === 'number') {
-      /* TODO: this is a temporary fix for the pagination start index (0 or 1) discrepancy between the rest and the frontend respectively */
-      args = this.addHrefArg(href, args, `page=${options.currentPage - 1}`);
-    }
-    if (hasValue(options.elementsPerPage)) {
-      args = this.addHrefArg(href, args, `size=${options.elementsPerPage}`);
-    }
-    if (hasValue(options.sort)) {
-      args = this.addHrefArg(href, args, `sort=${options.sort.field},${options.sort.direction}`);
-    }
-    if (hasValue(options.startsWith)) {
-      args = this.addHrefArg(href, args, `startsWith=${options.startsWith}`);
-    }
-    if (hasValue(options.searchParams)) {
-      options.searchParams.forEach((param: RequestParam) => {
-        args = this.addHrefArg(href, args, `${param.fieldName}=${param.fieldValue}`);
-      });
-    }
-    args = this.addEmbedParams(href, args, ...linksToFollow);
-    if (isNotEmpty(args)) {
-      return new URLCombiner(href, `?${args.join('&')}`).toString();
-    } else {
-      return href;
-    }
-  }
-
-  /**
-   * Turn an array of RequestParam into a query string and combine it with the given HREF
-   *
-   * @param href The HREF to which the query string should be appended
-   * @param params Array with additional params to combine with query string
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
-   *
-   * @return {Observable<string>}
-   * Return an observable that emits created HREF
-   */
-  buildHrefWithParams(href: string, params: RequestParam[], ...linksToFollow: FollowLinkConfig<T>[]): string {
-
-    let  args = [];
-    if (hasValue(params)) {
-      params.forEach((param: RequestParam) => {
-        args = this.addHrefArg(href, args, `${param.fieldName}=${param.fieldValue}`);
-      });
-    }
-
-    args = this.addEmbedParams(href, args, ...linksToFollow);
-
-    if (isNotEmpty(args)) {
-      return new URLCombiner(href, `?${args.join('&')}`).toString();
-    } else {
-      return href;
-    }
-  }
-  /**
-   * Adds the embed options to the link for the request
-   * @param href            The href the params are to be added to
-   * @param args            params for the query string
-   * @param linksToFollow   links we want to embed in query string if shouldEmbed is true
-   */
-  protected addEmbedParams(href: string, args: string[], ...linksToFollow: FollowLinkConfig<T>[]) {
-    linksToFollow.forEach((linkToFollow: FollowLinkConfig<T>) => {
-      if (hasValue(linkToFollow) && linkToFollow.shouldEmbed) {
-        const embedString = 'embed=' + String(linkToFollow.name);
-        // Add the embeds size if given in the FollowLinkConfig.FindListOptions
-        if (hasValue(linkToFollow.findListOptions) && hasValue(linkToFollow.findListOptions.elementsPerPage)) {
-          args = this.addHrefArg(href, args,
-            'embed.size=' + String(linkToFollow.name) + '=' + linkToFollow.findListOptions.elementsPerPage);
-        }
-        // Adds the nested embeds and their size if given
-        if (isNotEmpty(linkToFollow.linksToFollow)) {
-          args = this.addNestedEmbeds(embedString, href, args, ...linkToFollow.linksToFollow);
-        } else {
-          args = this.addHrefArg(href, args, embedString);
-        }
-      }
-    });
-    return args;
-  }
-
-  /**
-   * Add a new argument to the list of arguments, only if it doesn't already exist in the given href,
-   * or the current list of arguments
-   *
-   * @param href        The href the arguments are to be added to
-   * @param currentArgs The current list of arguments
-   * @param newArg      The new argument to add
-   * @return            The next list of arguments, with newArg included if it wasn't already.
-   *                    Note this function will not modify any of the input params.
-   */
-  protected addHrefArg(href: string, currentArgs: string[], newArg: string): string[] {
-    if (href.includes(newArg) || currentArgs.includes(newArg)) {
-      return [...currentArgs];
-    } else {
-      return [...currentArgs, newArg];
-    }
-  }
-
-  /**
-   * Add the nested followLinks to the embed param, separated by a /, and their sizes, recursively
-   * @param embedString     embedString so far (recursive)
-   * @param href            The href the params are to be added to
-   * @param args            params for the query string
-   * @param linksToFollow   links we want to embed in query string if shouldEmbed is true
-   */
-  protected addNestedEmbeds(embedString: string, href: string, args: string[], ...linksToFollow: FollowLinkConfig<T>[]): string[] {
-    let nestEmbed = embedString;
-    linksToFollow.forEach((linkToFollow: FollowLinkConfig<T>) => {
-      if (hasValue(linkToFollow) && linkToFollow.shouldEmbed) {
-        nestEmbed = nestEmbed + '/' + String(linkToFollow.name);
-        // Add the nested embeds size if given in the FollowLinkConfig.FindListOptions
-        if (hasValue(linkToFollow.findListOptions) && hasValue(linkToFollow.findListOptions.elementsPerPage)) {
-          const nestedEmbedSize = 'embed.size=' + nestEmbed.split('=')[1] + '=' + linkToFollow.findListOptions.elementsPerPage;
-          args = this.addHrefArg(href, args, nestedEmbedSize);
-        }
-        if (hasValue(linkToFollow.linksToFollow) && isNotEmpty(linkToFollow.linksToFollow)) {
-          args = this.addNestedEmbeds(nestEmbed, href, args, ...linkToFollow.linksToFollow);
-        } else {
-          args = this.addHrefArg(href, args, nestEmbed);
-        }
-      }
-    });
-    return args;
-  }
-
-  /**
-   * Returns {@link RemoteData} of all object with a list of {@link FollowLinkConfig}, to indicate which embedded
-   * info should be added to the objects
-   *
-   * @param options                     Find list options object
-   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
-   *                                    no valid cached version. Defaults to true
-   * @param reRequestOnStale            Whether or not the request should automatically be re-
-   *                                    requested after the response becomes stale
-   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
-   *                                    {@link HALLink}s should be automatically resolved
-   * @return {Observable<RemoteData<PaginatedList<T>>>}
-   *    Return an observable that emits object list
-   */
-  findAll(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>> {
-    return this.findAllByHref(this.getFindAllHref(options), options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-  }
-
-  /**
-   * Create the HREF for a specific object based on its identifier; with possible embed query params based on linksToFollow
-   * @param endpoint The base endpoint for the type of object
-   * @param resourceID The identifier for the object
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
-   */
-  getIDHref(endpoint, resourceID, ...linksToFollow: FollowLinkConfig<T>[]): string {
-    return this.buildHrefFromFindOptions(endpoint + '/' + resourceID, {}, [], ...linksToFollow);
-  }
-
-  /**
-   * Create an observable for the HREF of a specific object based on its identifier
-   * @param resourceID The identifier for the object
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
-   */
-  getIDHrefObs(resourceID: string, ...linksToFollow: FollowLinkConfig<T>[]): Observable<string> {
-    return this.getEndpoint().pipe(
-      map((endpoint: string) => this.getIDHref(endpoint, resourceID, ...linksToFollow)));
-  }
-
-  /**
-   * Returns an observable of {@link RemoteData} of an object, based on its ID, with a list of
-   * {@link FollowLinkConfig}, to automatically resolve {@link HALLink}s of the object
-   * @param id                          ID of object we want to retrieve
-   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
-   *                                    no valid cached version. Defaults to true
-   * @param reRequestOnStale            Whether or not the request should automatically be re-
-   *                                    requested after the response becomes stale
-   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
-   *                                    {@link HALLink}s should be automatically resolved
-   */
-  findById(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<T>> {
-    const href$ = this.getIDHrefObs(encodeURIComponent(id), ...linksToFollow);
-    return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-  }
-
-  /**
-   * An operator that will call the given function if the incoming RemoteData is stale and
-   * shouldReRequest is true
-   *
-   * @param shouldReRequest  Whether or not to call the re-request function if the RemoteData is stale
-   * @param requestFn        The function to call if the RemoteData is stale and shouldReRequest is
-   *                         true
-   */
-  protected reRequestStaleRemoteData<O>(shouldReRequest: boolean, requestFn: () => Observable<RemoteData<O>>) {
-    return (source: Observable<RemoteData<O>>): Observable<RemoteData<O>> => {
-      if (shouldReRequest === true) {
-        return source.pipe(
-          tap((remoteData: RemoteData<O>) => {
-            if (hasValue(remoteData) && remoteData.isStale) {
-              requestFn();
-            }
-          })
-        );
-      } else {
-        return source;
-      }
-    };
-  }
-
-  /**
-   * Returns an observable of {@link RemoteData} of an object, based on an href, with a list of
-   * {@link FollowLinkConfig}, to automatically resolve {@link HALLink}s of the object
-   * @param href$                       The url of object we want to retrieve. Can be a string or
-   *                                    an Observable<string>
-   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
-   *                                    no valid cached version. Defaults to true
-   * @param reRequestOnStale            Whether or not the request should automatically be re-
-   *                                    requested after the response becomes stale
-   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
-   *                                    {@link HALLink}s should be automatically resolved
-   */
-  findByHref(href$: string | Observable<string>, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<T>> {
-    if (typeof href$ === 'string') {
-      href$ = observableOf(href$);
-    }
-
-    const requestHref$ = href$.pipe(
-      isNotEmptyOperator(),
-      take(1),
-      map((href: string) => this.buildHrefFromFindOptions(href, {}, [], ...linksToFollow))
-    );
-
-    this.createAndSendGetRequest(requestHref$, useCachedVersionIfAvailable);
-
-    return this.rdbService.buildSingle<T>(requestHref$, ...linksToFollow).pipe(
-      // This skip ensures that if a stale object is present in the cache when you do a
-      // call it isn't immediately returned, but we wait until the remote data for the new request
-      // is created. If useCachedVersionIfAvailable is false it also ensures you don't get a
-      // cached completed object
-      skipWhile((rd: RemoteData<T>) => useCachedVersionIfAvailable ? rd.isStale : rd.hasCompleted),
-      this.reRequestStaleRemoteData(reRequestOnStale, () =>
-        this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow))
-    );
-  }
-
-  /**
-   * Returns a list of observables of {@link RemoteData} of objects, based on an href, with a list
-   * of {@link FollowLinkConfig}, to automatically resolve {@link HALLink}s of the object
-   * @param href$                       The url of object we want to retrieve. Can be a string or
-   *                                    an Observable<string>
-   * @param findListOptions             Find list options object
-   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
-   *                                    no valid cached version. Defaults to true
-   * @param reRequestOnStale            Whether or not the request should automatically be re-
-   *                                    requested after the response becomes stale
-   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
-   *                                    {@link HALLink}s should be automatically resolved
-   */
-  findAllByHref(href$: string | Observable<string>, findListOptions: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>> {
-    if (typeof href$ === 'string') {
-      href$ = observableOf(href$);
-    }
-
-    const requestHref$ = href$.pipe(
-      isNotEmptyOperator(),
-      take(1),
-      map((href: string) => this.buildHrefFromFindOptions(href, findListOptions, [], ...linksToFollow))
-    );
-
-    this.createAndSendGetRequest(requestHref$, useCachedVersionIfAvailable);
-
-    return this.rdbService.buildList<T>(requestHref$, ...linksToFollow).pipe(
-      // This skip ensures that if a stale object is present in the cache when you do a
-      // call it isn't immediately returned, but we wait until the remote data for the new request
-      // is created. If useCachedVersionIfAvailable is false it also ensures you don't get a
-      // cached completed object
-      skipWhile((rd: RemoteData<PaginatedList<T>>) => useCachedVersionIfAvailable ? rd.isStale : rd.hasCompleted),
-      this.reRequestStaleRemoteData(reRequestOnStale, () =>
-        this.findAllByHref(href$, findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow))
-    );
-  }
-
-  /**
-   * Create a GET request for the given href, and send it.
-   *
-   * @param href$                       The url of object we want to retrieve. Can be a string or
-   *                                    an Observable<string>
-   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
-   *                                    no valid cached version. Defaults to true
-   */
-  protected createAndSendGetRequest(href$: string | Observable<string>, useCachedVersionIfAvailable = true): void {
-    if (isNotEmpty(href$)) {
-      if (typeof href$ === 'string') {
-        href$ = observableOf(href$);
-      }
-
-      href$.pipe(
-        isNotEmptyOperator(),
-        take(1)
-      ).subscribe((href: string) => {
-        const requestId = this.requestService.generateRequestId();
-        const request = new GetRequest(requestId, href);
-        if (hasValue(this.responseMsToLive)) {
-          request.responseMsToLive = this.responseMsToLive;
-        }
-        this.requestService.send(request, useCachedVersionIfAvailable);
-      });
-    }
-  }
-
-  /**
-   * Return object search endpoint by given search method
-   *
-   * @param searchMethod The search method for the object
-   */
-  protected getSearchEndpoint(searchMethod: string): Observable<string> {
-    return this.halService.getEndpoint(this.linkPath).pipe(
-      filter((href: string) => isNotEmpty(href)),
-      map((href: string) => `${href}/search/${searchMethod}`));
-  }
-
-  /**
-   * Make a new FindListRequest with given search method
-   *
-   * @param searchMethod                The search method for the object
-   * @param options                     The [[FindListOptions]] object
-   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
-   *                                    no valid cached version. Defaults to true
-   * @param reRequestOnStale            Whether or not the request should automatically be re-
-   *                                    requested after the response becomes stale
-   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
-   *                                    {@link HALLink}s should be automatically resolved
-   * @return {Observable<RemoteData<PaginatedList<T>>}
-   *    Return an observable that emits response from the server
-   */
-  searchBy(searchMethod: string, options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>> {
-    const hrefObs = this.getSearchByHref(searchMethod, options, ...linksToFollow);
-
-    return this.findAllByHref(hrefObs, undefined, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-  }
-
-  /**
-   * Send a patch request for a specified object
-   * @param {T} object The object to send a patch request for
-   * @param {Operation[]} operations The patch operations to be performed
-   */
-  patch(object: T, operations: Operation[]): Observable<RemoteData<T>> {
-    const requestId = this.requestService.generateRequestId();
-
-    const hrefObs = this.halService.getEndpoint(this.linkPath).pipe(
-      map((endpoint: string) => this.getIDHref(endpoint, object.uuid)));
-
-    hrefObs.pipe(
-      find((href: string) => hasValue(href)),
-    ).subscribe((href: string) => {
-      const request = new PatchRequest(requestId, href, operations);
-      if (hasValue(this.responseMsToLive)) {
-        request.responseMsToLive = this.responseMsToLive;
-      }
-      this.requestService.send(request);
-    });
-
-    return this.rdbService.buildFromRequestUUID(requestId);
-  }
-
-  createPatchFromCache(object: T): Observable<Operation[]> {
-    const oldVersion$ = this.findByHref(object._links.self.href, true,  false);
-    return oldVersion$.pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-      map((oldVersion: T) => this.comparator.diff(oldVersion, object)));
-  }
-
-  /**
-   * Send a PUT request for the specified object
-   *
-   * @param object The object to send a put request for.
-   */
-  put(object: T): Observable<RemoteData<T>> {
-    const requestId = this.requestService.generateRequestId();
-    const serializedObject = new DSpaceSerializer(object.constructor as GenericConstructor<{}>).serialize(object);
-    const request = new PutRequest(requestId, object._links.self.href, serializedObject);
-
-    if (hasValue(this.responseMsToLive)) {
-      request.responseMsToLive = this.responseMsToLive;
-    }
-
-    this.requestService.send(request);
-
-    return this.rdbService.buildFromRequestUUID(requestId);
-  }
-
-  /**
-   * Add a new patch to the object cache
-   * The patch is derived from the differences between the given object and its version in the object cache
-   * @param {DSpaceObject} object The given object
-   */
-  update(object: T): Observable<RemoteData<T>> {
-    return this.createPatchFromCache(object)
-      .pipe(
-        mergeMap((operations: Operation[]) => {
-            if (isNotEmpty(operations)) {
-              this.objectCache.addPatch(object._links.self.href, operations);
-            }
-            return this.findByHref(object._links.self.href, true, true);
-          }
-        )
-      );
-  }
-
-  /**
-   * Create a new DSpaceObject on the server, and store the response
-   * in the object cache
-   *
-   * @param {CacheableObject} object
-   *    The object to create
-   * @param {RequestParam[]} params
-   *    Array with additional params to combine with query string
-   */
-  create(object: T, ...params: RequestParam[]): Observable<RemoteData<T>> {
-    const requestId = this.requestService.generateRequestId();
-    const endpoint$ = this.getEndpoint().pipe(
-      isNotEmptyOperator(),
-      distinctUntilChanged(),
-      map((endpoint: string) => this.buildHrefWithParams(endpoint, params))
-    );
-
-    const serializedObject = new DSpaceSerializer(getClassForType(object.type)).serialize(object);
-
-    endpoint$.pipe(
-      take(1)
-    ).subscribe((endpoint: string) => {
-      const request = new CreateRequest(requestId, endpoint, JSON.stringify(serializedObject));
-      if (hasValue(this.responseMsToLive)) {
-        request.responseMsToLive = this.responseMsToLive;
-      }
-      this.requestService.send(request);
-    });
-
-    const result$ = this.rdbService.buildFromRequestUUID<T>(requestId);
-
-    // TODO a dataservice is not the best place to show a notification,
-    // this should move up to the components that use this method
-    result$.pipe(
-      takeWhile((rd: RemoteData<T>) => rd.isLoading, true)
-    ).subscribe((rd: RemoteData<T>) => {
-      if (rd.hasFailed) {
-        this.notificationsService.error('Server Error:', rd.errorMessage, new NotificationOptions(-1));
-      }
-    });
-
-    return result$;
-  }
-
-  /**
-   <<<<<<< HEAD
-   * Perform a post on an endpoint related item with ID. Ex.: endpoint/<itemId>/related?item=<relatedItemId>
-   * @param itemId The item id
-   * @param relatedItemId The related item Id
-   * @param body The optional POST body
-   * @return the RestResponse as an Observable
-   */
-  public postOnRelated(itemId: string, relatedItemId: string, body?: any) {
-    const requestId = this.requestService.generateRequestId();
-    const hrefObs = this.getIDHrefObs(itemId);
-
-    hrefObs.pipe(
-      take(1)
-    ).subscribe((href: string) => {
-      const request = new PostRequest(requestId, href + '/related?item=' + relatedItemId, body);
-      if (hasValue(this.responseMsToLive)) {
-        request.responseMsToLive = this.responseMsToLive;
-      }
-      this.requestService.send(request);
-    });
-
-    return this.rdbService.buildFromRequestUUID<T>(requestId);
-  }
-
-  /**
-   * Perform a delete on an endpoint related item. Ex.: endpoint/<itemId>/related
-   * @param itemId The item id
-   * @return the RestResponse as an Observable
-   */
-  public deleteOnRelated(itemId: string): Observable<RemoteData<NoContent>> {
-    const requestId = this.requestService.generateRequestId();
-    const hrefObs = this.getIDHrefObs(itemId);
-
-    hrefObs.pipe(
-      find((href: string) => hasValue(href)),
-      map((href: string) => {
-        const request = new DeleteByIDRequest(requestId, href + '/related', itemId);
-        if (hasValue(this.responseMsToLive)) {
-          request.responseMsToLive = this.responseMsToLive;
-        }
-        this.requestService.send(request);
-      })
-    ).subscribe();
-
-    return this.rdbService.buildFromRequestUUID(requestId);
-  }
-
-  /*
-   * Invalidate an existing DSpaceObject by marking all requests it is included in as stale
-   * @param   objectId The id of the object to be invalidated
-   * @return  An Observable that will emit `true` once all requests are stale
-   */
-  invalidate(objectId: string): Observable<boolean> {
-    return this.getIDHrefObs(objectId).pipe(
-      switchMap((href: string) => this.invalidateByHref(href))
-    );
-  }
-
-  /**
-   * Invalidate an existing DSpaceObject by marking all requests it is included in as stale
-   * @param   href The self link of the object to be invalidated
-   * @return  An Observable that will emit `true` once all requests are stale
-   */
-  invalidateByHref(href: string): Observable<boolean> {
-    const done$ = new AsyncSubject<boolean>();
-
-    this.objectCache.getByHref(href).pipe(
-      switchMap((oce: ObjectCacheEntry) => observableFrom(oce.requestUUIDs).pipe(
-        mergeMap((requestUUID: string) => this.requestService.setStaleByUUID(requestUUID)),
-        toArray(),
-      )),
-    ).subscribe(() => {
-      done$.next(true);
-      done$.complete();
-    });
-
-    return done$;
-  }
-
-  /**
-   * Delete an existing DSpace Object on the server
-   * @param   objectId The id of the object to be removed
-   * @param   copyVirtualMetadata (optional parameter) the identifiers of the relationship types for which the virtual
-   *                            metadata should be saved as real metadata
-   * @return  A RemoteData observable with an empty payload, but still representing the state of the request: statusCode,
-   *          errorMessage, timeCompleted, etc
-   */
-  delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
-    return this.getIDHrefObs(objectId).pipe(
-      switchMap((href: string) => this.deleteByHref(href, copyVirtualMetadata))
-    );
-  }
-
-  /**
-   * Delete an existing DSpace Object on the server
-   * @param   href The self link of the object to be removed
-   * @param   copyVirtualMetadata (optional parameter) the identifiers of the relationship types for which the virtual
-   *                            metadata should be saved as real metadata
-   * @return  A RemoteData observable with an empty payload, but still representing the state of the request: statusCode,
-   *          errorMessage, timeCompleted, etc
-   *          Only emits once all request related to the DSO has been invalidated.
-   */
-  deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
-    const requestId = this.requestService.generateRequestId();
-
-    if (copyVirtualMetadata) {
-      copyVirtualMetadata.forEach((id) =>
-        href += (href.includes('?') ? '&' : '?')
-          + 'copyVirtualMetadata='
-          + id
-      );
-    }
-
-    const request = new DeleteRequest(requestId, href);
-    if (hasValue(this.responseMsToLive)) {
-      request.responseMsToLive = this.responseMsToLive;
-    }
-    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),
-    );
-  }
-
-  /**
-   * Commit current object changes to the server
-   * @param method The RestRequestMethod for which de server sync buffer should be committed
-   */
-  commitUpdates(method?: RestRequestMethod) {
-    this.requestService.commit(method);
-  }
-
-  /**
-   * Return the links to traverse from the root of the api to the
-   * endpoint this DataService represents
-   *
-   * e.g. if the api root links to 'foo', and the endpoint at 'foo'
-   * links to 'bar' the linkPath for the BarDataService would be
-   * 'foo/bar'
-   */
-  getLinkPath(): string {
-    return this.linkPath;
-  }
-}
diff --git a/src/app/core/data/update-data.service.ts b/src/app/core/data/update-data.service.ts
index 715b2ee413c..664e2dcabc9 100644
--- a/src/app/core/data/update-data.service.ts
+++ b/src/app/core/data/update-data.service.ts
@@ -201,9 +201,7 @@ export class UpdateDataServiceImpl<T extends CacheableObject> extends Identifiab
   create(object: T, ...params: RequestParam[]): Observable<RemoteData<T>> {
     return this.createData.create(object, ...params);
   }
-
   /**
-   <<<<<<< HEAD
    * Perform a post on an endpoint related item with ID. Ex.: endpoint/<itemId>/related?item=<relatedItemId>
    * @param itemId The item id
    * @param relatedItemId The related item Id
diff --git a/src/app/item-page/simple/item-page.component.spec.ts b/src/app/item-page/simple/item-page.component.spec.ts
index 433b950cee2..d4a83fbf852 100644
--- a/src/app/item-page/simple/item-page.component.spec.ts
+++ b/src/app/item-page/simple/item-page.component.spec.ts
@@ -225,7 +225,7 @@ describe('ItemPageComponent', () => {
       expect(objectLoader.nativeElement).toBeDefined();
     });
 
-    it('should add the signposti`ng links`', () => {
+    it('should add the signposting links', () => {
       expect(serverResponseService.setHeader).toHaveBeenCalled();
       expect(linkHeadService.addTag).toHaveBeenCalledTimes(4);
     });
diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
index 18061ee292c..381a3751a99 100644
--- a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
+++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
@@ -22,6 +22,11 @@ import { hasValue } from '../../../../shared/empty.util';
   styleUrls: ['./notify-requests-status.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
+
+/**
+ * Component to show an alert box for each update in th Notify feature (e.g. COAR updates)
+ */
+
 export class NotifyRequestsStatusComponent implements OnInit {
   /**
    * The UUID of the item.
diff --git a/src/app/shared/mocks/active-router.mock.ts b/src/app/shared/mocks/active-router.mock.ts
index 672cdcd8f6c..00bfced12c8 100644
--- a/src/app/shared/mocks/active-router.mock.ts
+++ b/src/app/shared/mocks/active-router.mock.ts
@@ -5,19 +5,29 @@ import { BehaviorSubject } from 'rxjs';
 export class MockActivatedRoute {
 
   private _testParams?: any;
+  private _testUrl?: any;
 
   // ActivatedRoute.params is Observable
   private subject?: BehaviorSubject<any> = new BehaviorSubject(this.testParams);
+  // ActivatedRoute.url is Observable
+  private urlSubject?: BehaviorSubject<any> = new BehaviorSubject(this.testUrl);
 
   params = this.subject.asObservable();
   queryParams = this.subject.asObservable();
+  url = this.urlSubject.asObservable();
 
-  constructor(params?: Params) {
+  constructor(params?: Params, url?: any) {
     if (params) {
       this.testParams = params;
     } else {
       this.testParams = {};
     }
+
+    if (url) {
+      this.testUrl = url;
+    } else {
+      this.testUrl = {};
+    }
   }
 
   // Test parameters
@@ -31,4 +41,11 @@ export class MockActivatedRoute {
   get snapshot() {
     return { params: this.testParams, queryParams: this.testParams };
   }
+
+  //ActivatedRoute.url
+  get testUrl() { return this._testUrl; }
+  set testUrl(url: any) {
+    this._testUrl = url;
+    this.urlSubject.next(url);
+  }
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 89c53543ab5..8314d546e12 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3138,8 +3138,6 @@
 
   "mydspace.view-btn": "View",
 
-  "mydspace.import": "Import",
-
   "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
 
   "notification.suggestion.review": "review the suggestions",
@@ -3212,8 +3210,6 @@
 
   "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
 
-  "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic.",
-
   "quality-assurance.loading": "Loading ...",
 
   "quality-assurance.events.topic": "Topic:",
@@ -5642,7 +5638,7 @@
 
   "coar-notify-support.title": "COAR Notify Protocol",
 
-  "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, you can visit their official website <a href=\"https://notify.coar-repositories.org/\">here</a>.",
+  "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\\\"https://notify.coar-repositories.org/\\\">COAR Notify website</a>.",
 
   "coar-notify-support.ldn-inbox.title": "LDN InBox",
 
@@ -5650,7 +5646,9 @@
 
   "coar-notify-support.message-moderation.title": "Message Moderation",
 
-  "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated Feedback form. You can access the Feedback form by clicking <a href=\"info/feedback\">here</a>.",
+  "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+
+  "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
 
   "service.overview.delete.header": "Delete Service",
 
@@ -5835,10 +5833,6 @@
 
   "mydspace.import": "Import",
 
-  "mydspace.notification.suggestion": "We found <b>{{count}} publications</b><br> in the {{source}} that seems to be related to your profile.<br> Please <a href='/suggestions/{{suggestionId}}'>review the suggestions</a>",
-
-  "mydspace.notification.suggestion.page": "We found <b>{{count}} {{type}}</b> in the {{source}} that seems to be related to your profile. Please <a href='/suggestions/{{suggestionId}}'>review the suggestions.</a>",
-
   "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
   "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
 
@@ -5967,4 +5961,19 @@
   "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
 
   "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+
+  "ldn-service-button-mark-inbound-deletion": "Mark inbound pattern for deletion",
+
+  "ldn-service-button-unmark-inbound-deletion": "Unmark inbound pattern for deletion",
+
+  "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for inbound pattern",
+
+  "ldn-service-input-inbound-pattern-dropdown": "Select inbound pattern for service",
+
+  "ldn-service-overview-select-delete": "Select service for deletion",
+
+  "ldn-service-overview-select-edit": "Edit LDN service",
+
+  "ldn-service-overview-close-modal": "Close modal",
+
 }
diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.html b/src/themes/dspace/app/home-page/home-news/home-news.component.html
index 9c9758aa174..29711c1bf63 100644
--- a/src/themes/dspace/app/home-page/home-news/home-news.component.html
+++ b/src/themes/dspace/app/home-page/home-news/home-news.component.html
@@ -3,34 +3,37 @@
     <div class="jumbotron jumbotron-fluid">
       <div class="d-flex flex-wrap">
         <div>
-          <h1 class="display-3">Demo of COAR Notify in DSpace 7
-          </h1>
+          <h1 class="display-3">DSpace 7</h1>
+          <p class="lead">DSpace is the world leading open source repository platform that enables
+            organisations to:</p>
         </div>
       </div>
-      <p>The Arcadia-funded <a href="https://www.coar-repositories.org/notify/" target="_blank">COAR Notify Project</a>
-        is developing and accelerating community adoption of a standard, interoperable, and decentralised approach to
-        linking research outputs hosted in the distributed network of repositories with resources from external services
-        such as overlay-journals and open peer review services, using linked data notifications.
-      </p>
-      <p>As part of this project, <a href="https://www.coar-repositories.org/" target="_blank">COAR</a> is funding the
-        development of platforms and systems to support the exchange of linked data notifications across partner
-        organisations and the workflows to manage notifications in those platforms and systems.
-      </p>
-      <p>As the largest adopted repository platform in the World one of the first platforms to be addressed is DSpace
-        the implementation of which has been entrusted to <a href="https://www.4science.com"
-                                                             target="_blank">4Science</a>.
-      </p>
+      <ul>
+        <li>easily ingest documents, audio, video, datasets and their corresponding Dublin Core
+          metadata
+        </li>
+        <li>open up this content to local and global audiences, thanks to the OAI-PMH interface and
+          Google Scholar optimizations
+        </li>
+        <li>issue permanent urls and trustworthy identifiers, including optional integrations with
+          handle.net and DataCite DOI
+        </li>
+      </ul>
+      <p>Join an international community of <a href="https://wiki.lyrasis.org/display/DSPACE/DSpace+Positioning" target="_blank">leading institutions using DSpace</a>.</p>
+      <p>The test user accounts below have their password set to the name of this
+        software in lowercase.</p>
+      <ul>
+        <li>Demo Site Administrator = dspacedemo+admin@gmail.com</li>
+        <li>Demo Community Administrator = dspacedemo+commadmin@gmail.com</li>
+        <li>Demo Collection Administrator = dspacedemo+colladmin@gmail.com</li>
+        <li>Demo Submitter = dspacedemo+submit@gmail.com</li>
+      </ul>
     </div>
   </div>
   <picture class="background-image">
-    <source
-      srcset="assets/dspace/images/banner.webp 2000w, assets/dspace/images/banner-half.webp 1200w, assets/dspace/images/banner-tall.webp 768w"
-      type="image/webp">
-    <source
-      srcset="assets/dspace/images/banner.jpg 2000w, assets/dspace/images/banner-half.jpg 1200w, assets/dspace/images/banner-tall.jpg 768w"
-      type="image/jpg">
-    <img [src]="'assets/dspace/images/banner.jpg'" alt=""/>
-    <!-- without the []="''" Firefox downloads both the fallback and the resolved image -->
+    <source type="image/webp" srcset="assets/dspace/images/banner.webp 2000w, assets/dspace/images/banner-half.webp 1200w, assets/dspace/images/banner-tall.webp 768w">
+    <source type="image/jpg" srcset="assets/dspace/images/banner.jpg 2000w, assets/dspace/images/banner-half.jpg 1200w, assets/dspace/images/banner-tall.jpg 768w">
+    <img alt="" [src]="'assets/dspace/images/banner.jpg'"/><!-- without the []="''" Firefox downloads both the fallback and the resolved image -->
   </picture>
   <small class="credits">Photo by <a href="https://www.pexels.com/@inspiredimages">@inspiredimages</a></small>
 </div>
diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html
index fbcdb6ac68d..852b2e8056d 100644
--- a/src/themes/dspace/app/navbar/navbar.component.html
+++ b/src/themes/dspace/app/navbar/navbar.component.html
@@ -1,9 +1,6 @@
 <nav [ngClass]="{'open': !(menuCollapsed | async)}" [@slideMobileNav]="!(windowService.isXsOrSm() | async) ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
-  class="navbar navbar-expand-md navbar-light p-0 navbar-container" role="navigation" [attr.aria-label]="'nav.main.description' | translate">
+     class="navbar navbar-expand-md navbar-light p-0 navbar-container" role="navigation" [attr.aria-label]="'nav.main.description' | translate">
   <div class="navbar-inner-container w-100 h-100" [class.container]="!(isXsOrSm$ | async)">
-    <a class="navbar-brand my-2" href="https://www.coar-repositories.org/notify/">
-      <img src="assets/images/notify-coar-icon.png" [attr.alt]="'menu.header.image.logo' | translate" />
-    </a>
     <a class="navbar-brand my-2" routerLink="/home">
       <img src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate" />
     </a>
@@ -11,7 +8,7 @@
     <div id="collapsingNav" class="w-100 h-100">
       <ul class="navbar-nav me-auto mb-2 mb-lg-0 h-100">
         <li *ngIf="(isXsOrSm$ | async) && (isAuthenticated$ | async)">
-            <ds-themed-user-menu [inExpandableNavbar]="true"></ds-themed-user-menu>
+          <ds-themed-user-menu [inExpandableNavbar]="true"></ds-themed-user-menu>
         </li>
         <li *ngFor="let section of (sections | async)">
           <ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>