From 967f4a99b9262642c77ca2d3ba295e67f7b9c059 Mon Sep 17 00:00:00 2001
From: nikunj59 <nikunj.sharma@4science.com>
Date: Mon, 4 Jul 2022 18:29:42 +0200
Subject: [PATCH 01/48] CST-6035 handled import query error

---
 .../submission-import-external.component.html |   5 +-
 ...bmission-import-external.component.spec.ts | 332 +++++++++++++++++-
 src/assets/i18n/en.json5                      |   1 +
 3 files changed, 335 insertions(+), 3 deletions(-)

diff --git a/src/app/submission/import-external/submission-import-external.component.html b/src/app/submission/import-external/submission-import-external.component.html
index 19499b4be8..dc46e6758f 100644
--- a/src/app/submission/import-external/submission-import-external.component.html
+++ b/src/app/submission/import-external/submission-import-external.component.html
@@ -24,9 +24,12 @@
         </ds-viewable-collection>
         <ds-themed-loading *ngIf="(isLoading$ | async)"
                     message="{{'loading.search-results' | translate}}"></ds-themed-loading>
-        <div *ngIf="!(isLoading$ | async) && entriesRD?.payload?.page?.length === 0" id="empty-external-entry-list">
+        <div *ngIf="!(isLoading$ | async) && entriesRD?.payload?.page?.length === 0" data-test="empty-external-entry-list">
           <ds-alert [type]="'alert-info'">{{ 'search.results.empty' | translate }}</ds-alert>
         </div>
+        <div *ngIf="!(isLoading$ | async) && entriesRD.statusCode === 500" data-test="empty-external-error-500">
+          <ds-alert [type]="'alert-info'">{{ 'search.results.response.500' | translate }}</ds-alert>
+        </div>
       </ng-container>
     </div>
     <div *ngIf="reload$.value.sourceId === ''" class="col-md-12">
diff --git a/src/app/submission/import-external/submission-import-external.component.spec.ts b/src/app/submission/import-external/submission-import-external.component.spec.ts
index dc53b2e45f..dbf665e297 100644
--- a/src/app/submission/import-external/submission-import-external.component.spec.ts
+++ b/src/app/submission/import-external/submission-import-external.component.spec.ts
@@ -19,9 +19,15 @@ import { VarDirective } from '../../shared/utils/var.directive';
 import { routeServiceStub } from '../../shared/testing/route-service.stub';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../shared/remote-data.utils';
 import { ExternalSourceEntry } from '../../core/shared/external-source-entry.model';
 import { SubmissionImportExternalPreviewComponent } from './import-external-preview/submission-import-external-preview.component';
+import { By } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
 describe('SubmissionImportExternalComponent test suite', () => {
   let comp: SubmissionImportExternalComponent;
@@ -44,7 +50,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
   beforeEach(waitForAsync (() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
+        BrowserAnimationsModule
       ],
       declarations: [
         SubmissionImportExternalComponent,
@@ -177,6 +184,327 @@ describe('SubmissionImportExternalComponent test suite', () => {
     });
   });
 
+  describe('handle BE response for search query', () => {
+    const paginatedData: any = {
+      'timeCompleted': 1657009282990,
+      'msToLive': 900000,
+      'lastUpdated': 1657009282990,
+      'state': 'Success',
+      'errorMessage': null,
+      'payload': {
+        'type': {
+          'value': 'paginated-list'
+        },
+        'pageInfo': {
+          'elementsPerPage': 10,
+          'totalElements': 11971608,
+          'totalPages': 1197161,
+          'currentPage': 1
+        },
+        '_links': {
+          'first': {
+            'href': 'https://dspacecris7.4science.cloud/server/api/integration/externalsources/scopus/entries?query=test&page=0&size=10&sort=id,asc'
+          },
+          'self': {
+            'href': 'https://dspacecris7.4science.cloud/server/api/integration/externalsources/scopus/entries?sort=id,ASC&page=0&size=10&query=test'
+          },
+          'next': {
+            'href': 'https://dspacecris7.4science.cloud/server/api/integration/externalsources/scopus/entries?query=test&page=1&size=10&sort=id,asc'
+          },
+          'last': {
+            'href': 'https://dspacecris7.4science.cloud/server/api/integration/externalsources/scopus/entries?query=test&page=1197160&size=10&sort=id,asc'
+          },
+          'page': [
+            {
+              'href': 'https://dspacecris7.4science.cloud/server/api/integration/externalsources/scopus/entryValues/2-s2.0-85130258665'
+            }
+          ]
+        },
+        'page': [
+          {
+            'id': '2-s2.0-85130258665',
+            'type': 'externalSourceEntry',
+            'display': 'Biological activities of endophytic fungi isolated from Annona muricata Linnaeus: a systematic review',
+            'value': 'Biological activities of endophytic fungi isolated from Annona muricata Linnaeus: a systematic review',
+            'externalSource': 'scopus',
+            'metadata': {
+              'dc.contributor.author': [
+                {
+                  'uuid': 'cbceba09-4c12-4968-ab02-2f77a985b422',
+                  'language': null,
+                  'value': 'Silva I.M.M.',
+                  'place': -1,
+                  'authority': null,
+                  'confidence': -1
+                }
+              ],
+              'dc.date.issued': [
+                {
+                  'uuid': 'e8d3c306-ce21-43e2-8a80-5f257cc3b7ea',
+                  'language': null,
+                  'value': '2024-01-01',
+                  'place': -1,
+                  'authority': null,
+                  'confidence': -1
+                }
+              ],
+              'dc.description.abstract': [
+                {
+                  'uuid': 'c9ee4076-c602-4c1d-ab1a-60bbdd0dd511',
+                  'language': null,
+                  'value': 'This systematic review integrates the data available in the literature regarding the biological activities of the extracts of endophytic fungi isolated from Annona muricata and their secondary metabolites. The search was performed using four electronic databases, and studies’ quality was evaluated using an adapted assessment tool. The initial database search yielded 436 results; ten studies were selected for inclusion. The leaf was the most studied part of the plant (in nine studies); Periconia sp. was the most tested fungus (n = 4); the most evaluated biological activity was anticancer (n = 6), followed by antiviral (n = 3). Antibacterial, antifungal, and antioxidant activities were also tested. Terpenoids or terpenoid hybrid compounds were the most abundant chemical metabolites. Phenolic compounds, esters, alkaloids, saturated and unsaturated fatty acids, aromatic compounds, and peptides were also reported. The selected studies highlighted the biotechnological potentiality of the endophytic fungi extracts from A. muricata. Consequently, it can be considered a promising source of biological compounds with antioxidant effects and active against different microorganisms and cancer cells. Further research is needed involving different plant tissues, other microorganisms, such as SARS-CoV-2, and different cancer cells.',
+                  'place': -1,
+                  'authority': null,
+                  'confidence': -1
+                }
+              ],
+              'dc.identifier.doi': [
+                {
+                  'uuid': '95ec26be-c1b4-4c4a-b12d-12421a4f181d',
+                  'language': null,
+                  'value': '10.1590/1519-6984.259525',
+                  'place': -1,
+                  'authority': null,
+                  'confidence': -1
+                }
+              ],
+              'dc.identifier.pmid': [
+                {
+                  'uuid': 'd6913cd6-1007-4013-b486-3f07192bc739',
+                  'language': null,
+                  'value': '35588520',
+                  'place': -1,
+                  'authority': null,
+                  'confidence': -1
+                }
+              ],
+              'dc.identifier.scopus': [
+                {
+                  'uuid': '6386a1f6-84ba-431d-a583-e16d19af8db0',
+                  'language': null,
+                  'value': '2-s2.0-85130258665',
+                  'place': -1,
+                  'authority': null,
+                  'confidence': -1
+                }
+              ],
+              'dc.relation.grantno': [
+                {
+                  'uuid': 'bcafd7b0-827d-4abb-8608-95dc40a8e58a',
+                  'language': null,
+                  'value': 'undefined',
+                  'place': -1,
+                  'authority': null,
+                  'confidence': -1
+                }
+              ],
+              'dc.relation.ispartof': [
+                {
+                  'uuid': '680819c8-c143-405f-9d09-f84d2d5cd338',
+                  'language': null,
+                  'value': 'Brazilian Journal of Biology',
+                  'place': -1,
+                  'authority': null,
+                  'confidence': -1
+                }
+              ],
+              'dc.relation.ispartofseries': [
+                {
+                  'uuid': '06634104-127b-44f6-9dcc-efae24b74bd1',
+                  'language': null,
+                  'value': 'Brazilian Journal of Biology',
+                  'place': -1,
+                  'authority': null,
+                  'confidence': -1
+                }
+              ],
+              'dc.relation.issn': [
+                {
+                  'uuid': '5f6cce46-2538-49e9-8ed0-a3988dcac6c5',
+                  'language': null,
+                  'value': '15196984',
+                  'place': -1,
+                  'authority': null,
+                  'confidence': -1
+                }
+              ],
+              'dc.subject': [
+                {
+                  'uuid': '0b6fbc77-de54-4f4a-b317-3d74a429f22a',
+                  'language': null,
+                  'value': 'biological products | biotechnology | mycology | soursop',
+                  'place': -1,
+                  'authority': null,
+                  'confidence': -1
+                }
+              ],
+              'dc.title': [
+                {
+                  'uuid': '4c0fa3d3-1a8c-4302-a772-4a4d0408df35',
+                  'language': null,
+                  'value': 'Biological activities of endophytic fungi isolated from Annona muricata Linnaeus: a systematic review',
+                  'place': -1,
+                  'authority': null,
+                  'confidence': -1
+                }
+              ],
+              'dc.type': [
+                {
+                  'uuid': '5b6e0337-6f79-4574-a720-536816d1dc6e',
+                  'language': null,
+                  'value': 'Journal',
+                  'place': -1,
+                  'authority': null,
+                  'confidence': -1
+                }
+              ],
+              'oaire.citation.volume': [
+                {
+                  'uuid': 'b88b0246-61a9-4aca-917f-68afc8ead7d8',
+                  'language': null,
+                  'value': '84',
+                  'place': -1,
+                  'authority': null,
+                  'confidence': -1
+                }
+              ],
+              'oairecerif.affiliation.orgunit': [
+                {
+                  'uuid': '487c0fbc-3622-4cc7-a5fa-4edf780c6a21',
+                  'language': null,
+                  'value': 'Universidade Federal do Reconcavo da Bahia',
+                  'place': -1,
+                  'authority': null,
+                  'confidence': -1
+                }
+              ],
+              'oairecerif.citation.number': [
+                {
+                  'uuid': '90808bdd-f456-4ba3-91aa-b82fb3c453f6',
+                  'language': null,
+                  'value': 'e259525',
+                  'place': -1,
+                  'authority': null,
+                  'confidence': -1
+                }
+              ],
+              'person.identifier.orcid': [
+                {
+                  'uuid': 'e533d0d2-cf26-4c3e-b5ae-cabf497dfb6b',
+                  'language': null,
+                  'value': '#PLACEHOLDER_PARENT_METADATA_VALUE#',
+                  'place': -1,
+                  'authority': null,
+                  'confidence': -1
+                }
+              ],
+              'person.identifier.scopus-author-id': [
+                {
+                  'uuid': '4faf0be5-0226-4d4f-92a0-938397c4ec02',
+                  'language': null,
+                  'value': '42561627000',
+                  'place': -1,
+                  'authority': null,
+                  'confidence': -1
+                }
+              ]
+            },
+            '_links': {
+              'self': {
+                'href': 'https://dspacecris7.4science.cloud/server/api/integration/externalsources/scopus/entryValues/2-s2.0-85130258665'
+              }
+            }
+          }
+        ]
+      },
+      'statusCode': 200
+    };
+    const errorObj = {
+      errorMessage: 'Http failure response for ' +
+        'https://dspacecris7.4science.cloud/server/api/integration/externalsources/pubmed/entries?sort=id,ASC&page=0&size=10&query=test: 500 OK',
+      statusCode: 500,
+      timeCompleted: 1656950434666,
+      errors: [{
+        'message': 'Internal Server Error', 'paths': ['/server/api/integration/externalsources/pubmed/entries']
+      }]
+    };
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SubmissionImportExternalComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+      scheduler = getTestScheduler();
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+
+    it('REST endpoint returns a 200 response with valid content', () => {
+      mockExternalSourceService.getExternalSourceEntries.and.returnValue(createSuccessfulRemoteDataObject$(paginatedData.payload));
+      const expectedEntries = createSuccessfulRemoteDataObject(paginatedData.payload);
+      spyOn(routeServiceStub, 'getQueryParameterValue').and.callFake((param) => {
+        if (param === 'entity') {
+          return observableOf('Publication');
+        } else if (param === 'sourceId') {
+          return observableOf('scopus');
+        } else if (param === 'query') {
+          return observableOf('test');
+        }
+        return observableOf({});
+      });
+      fixture.detectChanges();
+
+      expect(comp.isLoading$.value).toBe(false);
+      expect(comp.entriesRD$.value).toEqual(expectedEntries);
+      const viewableCollection = fixture.debugElement.query(By.css('ds-viewable-collection'));
+      expect(viewableCollection).toBeTruthy();
+    });
+
+    it('REST endpoint returns a 200 response with no results', () => {
+      mockExternalSourceService.getExternalSourceEntries.and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([])));
+      const expectedEntries = createSuccessfulRemoteDataObject(createPaginatedList([]));
+      spyOn(routeServiceStub, 'getQueryParameterValue').and.callFake((param) => {
+        if (param === 'entity') {
+          return observableOf('Publication');
+        }
+        return observableOf({});
+      });
+      fixture.detectChanges();
+
+      expect(comp.isLoading$.value).toBe(false);
+      expect(comp.entriesRD$.value).toEqual(expectedEntries);
+      const noDataAlert = fixture.debugElement.query(By.css('[data-test="empty-external-entry-list"]'));
+      expect(noDataAlert).toBeTruthy();
+    });
+
+    it('REST endpoint returns a 500 error', () => {
+      mockExternalSourceService.getExternalSourceEntries.and.returnValue(createFailedRemoteDataObject$(
+        errorObj.errorMessage,
+        errorObj.statusCode,
+        errorObj.timeCompleted,
+        errorObj.errors
+      ));
+      spyOn(routeServiceStub, 'getQueryParameterValue').and.callFake((param) => {
+        if (param === 'entity') {
+          return observableOf('Publication');
+        } else if (param === 'sourceId') {
+          return observableOf('pubmed');
+        } else if (param === 'query') {
+          return observableOf('test');
+        }
+        return observableOf({});
+      });
+      fixture.detectChanges();
+
+      expect(comp.isLoading$.value).toBe(false);
+      expect(comp.entriesRD$.value.statusCode).toEqual(500);
+      const noDataAlert = fixture.debugElement.query(By.css('[data-test="empty-external-error-500"]'));
+      expect(noDataAlert).toBeTruthy();
+    });
+  });
+
 });
 
 // declare a test component
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 57863b3a69..02fbf9dabe 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3583,6 +3583,7 @@
 
   "search.results.view-result": "View",
 
+  "search.results.response.500": "An error occurred during query execution, please try again later",
 
   "default.search.results.head": "Search Results",
 

From a2e8b2a61c059415669e9686b6e0df1e92a22441 Mon Sep 17 00:00:00 2001
From: corrado lombardi <corrado.lombardi@4science.com>
Date: Wed, 10 Aug 2022 18:49:01 +0200
Subject: [PATCH 02/48] CST-6035 updated test

---
 .../submission-import-external.component.spec.ts               | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/submission/import-external/submission-import-external.component.spec.ts b/src/app/submission/import-external/submission-import-external.component.spec.ts
index dbf665e297..7a9c71f342 100644
--- a/src/app/submission/import-external/submission-import-external.component.spec.ts
+++ b/src/app/submission/import-external/submission-import-external.component.spec.ts
@@ -483,8 +483,7 @@ describe('SubmissionImportExternalComponent test suite', () => {
       mockExternalSourceService.getExternalSourceEntries.and.returnValue(createFailedRemoteDataObject$(
         errorObj.errorMessage,
         errorObj.statusCode,
-        errorObj.timeCompleted,
-        errorObj.errors
+        errorObj.timeCompleted
       ));
       spyOn(routeServiceStub, 'getQueryParameterValue').and.callFake((param) => {
         if (param === 'entity') {

From f8e1db49874762455041974391be3ccc51c1a5d3 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Thu, 18 Aug 2022 14:04:59 +0200
Subject: [PATCH 03/48] 93914: Add the ability to delete processes

---
 .../detail/process-detail.component.html      |  92 ++++++++---
 .../detail/process-detail.component.spec.ts   |  60 ++++++-
 .../detail/process-detail.component.ts        |  51 +++++-
 .../process-bulk-delete.service.spec.ts       | 149 ++++++++++++++++++
 .../overview/process-bulk-delete.service.ts   | 118 ++++++++++++++
 .../overview/process-overview.component.html  |  58 ++++++-
 .../process-overview.component.spec.ts        | 104 +++++++++++-
 .../overview/process-overview.component.ts    |  60 ++++++-
 src/assets/i18n/en.json5                      |  35 ++++
 9 files changed, 685 insertions(+), 42 deletions(-)
 create mode 100644 src/app/process-page/overview/process-bulk-delete.service.spec.ts
 create mode 100644 src/app/process-page/overview/process-bulk-delete.service.ts

diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html
index 995e56e081..ae3418eafa 100644
--- a/src/app/process-page/detail/process-detail.component.html
+++ b/src/app/process-page/detail/process-detail.component.html
@@ -1,53 +1,99 @@
 <div class="container" *ngVar="(processRD$ | async)?.payload as process">
     <div class="d-flex">
-        <h2 class="flex-grow-1">{{'process.detail.title' | translate:{id: process?.processId, name: process?.scriptName} }}</h2>
-        <div>
-            <button class="btn btn-lg btn-success " routerLink="/processes/new" [queryParams]="{id: process?.processId}"><i class="fas fa-plus pr-2"></i>{{'process.detail.create' | translate}}</button>
-        </div>
+        <h2 class="flex-grow-1">{{'process.detail.title' | translate:{
+            id: process?.processId,
+            name: process?.scriptName
+        } }}</h2>
     </div>
     <ds-process-detail-field id="process-name" [title]="'process.detail.script'">
         <div>{{ process?.scriptName }}</div>
     </ds-process-detail-field>
 
-    <ds-process-detail-field *ngIf="process?.parameters && process?.parameters?.length > 0" id="process-arguments" [title]="'process.detail.arguments'">
+    <ds-process-detail-field *ngIf="process?.parameters && process?.parameters?.length > 0" id="process-arguments"
+                             [title]="'process.detail.arguments'">
         <div *ngFor="let argument of process?.parameters">{{ argument?.name }} {{ argument?.value }}</div>
     </ds-process-detail-field>
 
     <div *ngVar="(filesRD$ | async)?.payload?.page as files">
-        <ds-process-detail-field *ngIf="files && files?.length > 0" id="process-files" [title]="'process.detail.output-files'">
-          <ds-file-download-link *ngFor="let file of files; let last=last;" [bitstream]="file">
-            <span>{{getFileName(file)}}</span>
-            <span>({{(file?.sizeBytes) | dsFileSize }})</span>
-          </ds-file-download-link>
+        <ds-process-detail-field *ngIf="files && files?.length > 0" id="process-files"
+                                 [title]="'process.detail.output-files'">
+            <ds-file-download-link *ngFor="let file of files; let last=last;" [bitstream]="file">
+                <span>{{getFileName(file)}}</span>
+                <span>({{(file?.sizeBytes) | dsFileSize }})</span>
+            </ds-file-download-link>
         </ds-process-detail-field>
     </div>
 
-    <ds-process-detail-field *ngIf="process && process.startTime" id="process-start-time" [title]="'process.detail.start-time' | translate">
+    <ds-process-detail-field *ngIf="process && process.startTime" id="process-start-time"
+                             [title]="'process.detail.start-time' | translate">
         <div>{{ process.startTime | date:dateFormat:'UTC' }}</div>
     </ds-process-detail-field>
 
-    <ds-process-detail-field *ngIf="process && process.endTime" id="process-end-time" [title]="'process.detail.end-time' | translate">
+    <ds-process-detail-field *ngIf="process && process.endTime" id="process-end-time"
+                             [title]="'process.detail.end-time' | translate">
         <div>{{ process.endTime | date:dateFormat:'UTC' }}</div>
     </ds-process-detail-field>
 
-    <ds-process-detail-field *ngIf="process && process.processStatus" id="process-status" [title]="'process.detail.status' | translate">
+    <ds-process-detail-field *ngIf="process && process.processStatus" id="process-status"
+                             [title]="'process.detail.status' | translate">
         <div>{{ process.processStatus }}</div>
     </ds-process-detail-field>
 
     <ds-process-detail-field *ngIf="isProcessFinished(process)" id="process-output" [title]="'process.detail.output'">
-      <button *ngIf="!showOutputLogs && process?._links?.output?.href != undefined" id="showOutputButton" class="btn btn-primary" (click)="showProcessOutputLogs()">
-        {{ 'process.detail.logs.button' | translate }}
-      </button>
-      <ds-themed-loading *ngIf="retrievingOutputLogs$ | async" class="ds-themed-loading" message="{{ 'process.detail.logs.loading' | translate }}"></ds-themed-loading>
-      <pre class="font-weight-bold text-secondary bg-light p-3"
-           *ngIf="showOutputLogs && (outputLogs$ | async)?.length > 0">{{ (outputLogs$ | async) }}</pre>
-      <p id="no-output-logs-message" *ngIf="(!(retrievingOutputLogs$ | async) && showOutputLogs)
+        <button *ngIf="!showOutputLogs && process?._links?.output?.href != undefined" id="showOutputButton"
+                class="btn btn-primary" (click)="showProcessOutputLogs()">
+            {{ 'process.detail.logs.button' | translate }}
+        </button>
+        <ds-themed-loading *ngIf="retrievingOutputLogs$ | async" class="ds-themed-loading"
+                           message="{{ 'process.detail.logs.loading' | translate }}"></ds-themed-loading>
+        <pre class="font-weight-bold text-secondary bg-light p-3"
+             *ngIf="showOutputLogs && (outputLogs$ | async)?.length > 0">{{ (outputLogs$ | async) }}</pre>
+        <p id="no-output-logs-message" *ngIf="(!(retrievingOutputLogs$ | async) && showOutputLogs)
       && !(outputLogs$ | async) || (outputLogs$ | async)?.length == 0 || !process._links.output">
-        {{ 'process.detail.logs.none' | translate }}
-      </p>
+            {{ 'process.detail.logs.none' | translate }}
+        </p>
+    </ds-process-detail-field>
+
+    <ds-process-detail-field id="process-actions" [title]="'process.detail.actions'">
+        <button class="btn btn-success mr-2" routerLink="/processes/new" [queryParams]="{id: process?.processId}"><i
+                class="fas fa-plus pr-2"></i>{{'process.detail.create' | translate}}</button>
+        <button *ngIf="isProcessFinished(process)" id="delete" class="btn btn-danger"
+                (click)="openDeleteModal(deleteModal)">
+            <i class="fas fa-trash pr-2"></i>{{ 'process.detail.delete.button' | translate }}
+        </button>
     </ds-process-detail-field>
 
     <div style="text-align: right;">
-      <a class="btn btn-outline-secondary mt-3" [routerLink]="'/processes'">{{'process.detail.back' | translate}}</a>
+        <a class="btn btn-outline-secondary mt-3" [routerLink]="'/processes'">{{'process.detail.back' | translate}}</a>
     </div>
 </div>
+
+<ng-template #deleteModal >
+
+    <div *ngVar="(processRD$ | async)?.payload as process">
+
+        <div class="modal-header">
+            <div>
+                <h4>{{'process.detail.delete.header' | translate }}</h4>
+            </div>
+            <button type="button" class="close"
+                    (click)="closeModal()" aria-label="Close">
+                <span aria-hidden="true">×</span>
+            </button>
+        </div>
+
+        <div class="modal-body">
+            <div>{{'process.detail.delete.body' | translate }}</div>
+            <div class="mt-4">
+                <button class="btn btn-primary mr-2" (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
+                <button id="delete-confirm" class="btn btn-danger"
+                        (click)="deleteProcess(process)">{{ 'process.detail.delete.confirm' | translate }}
+                </button>
+            </div>
+        </div>
+
+
+    </div>
+
+</ng-template>
+
diff --git a/src/app/process-page/detail/process-detail.component.spec.ts b/src/app/process-page/detail/process-detail.component.spec.ts
index 4a85c75f81..53e65e62eb 100644
--- a/src/app/process-page/detail/process-detail.component.spec.ts
+++ b/src/app/process-page/detail/process-detail.component.spec.ts
@@ -19,15 +19,23 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { ProcessDetailFieldComponent } from './process-detail-field/process-detail-field.component';
 import { Process } from '../processes/process.model';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { of as observableOf } from 'rxjs';
 import { By } from '@angular/platform-browser';
 import { FileSizePipe } from '../../shared/utils/file-size-pipe';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { ProcessDataService } from '../../core/data/processes/process-data.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { getProcessListRoute } from '../process-page-routing.paths';
 
 describe('ProcessDetailComponent', () => {
   let component: ProcessDetailComponent;
@@ -44,6 +52,11 @@ describe('ProcessDetailComponent', () => {
 
   let processOutput;
 
+  let modalService;
+  let notificationsService;
+
+  let router;
+
   function init() {
     processOutput = 'Process Started';
     process = Object.assign(new Process(), {
@@ -93,7 +106,8 @@ describe('ProcessDetailComponent', () => {
       }
     });
     processService = jasmine.createSpyObj('processService', {
-      getFiles: createSuccessfulRemoteDataObject$(createPaginatedList(files))
+      getFiles: createSuccessfulRemoteDataObject$(createPaginatedList(files)),
+      delete: createSuccessfulRemoteDataObject$(null)
     });
     bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', {
       findByHref: createSuccessfulRemoteDataObject$(logBitstream)
@@ -104,13 +118,23 @@ describe('ProcessDetailComponent', () => {
     httpClient = jasmine.createSpyObj('httpClient', {
       get: observableOf(processOutput)
     });
+
+    modalService = jasmine.createSpyObj('modalService', {
+      open: {}
+    });
+
+    notificationsService = new NotificationsServiceStub();
+
+    router = jasmine.createSpyObj('router', {
+      navigateByUrl:{}
+    });
   }
 
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({
       declarations: [ProcessDetailComponent, ProcessDetailFieldComponent, VarDirective, FileSizePipe],
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      imports: [TranslateModule.forRoot()],
       providers: [
         {
           provide: ActivatedRoute,
@@ -121,6 +145,9 @@ describe('ProcessDetailComponent', () => {
         { provide: DSONameService, useValue: nameService },
         { provide: AuthService, useValue: new AuthServiceMock() },
         { provide: HttpClient, useValue: httpClient },
+        { provide: NgbModal, useValue: modalService },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: Router, useValue: router },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
     }).compileComponents();
@@ -207,4 +234,29 @@ describe('ProcessDetailComponent', () => {
     });
   });
 
+  describe('openDeleteModal', () => {
+    it('should open the modal', () => {
+      component.openDeleteModal({});
+      expect(modalService.open).toHaveBeenCalledWith({});
+    });
+  });
+
+  describe('deleteProcess', () => {
+    it('should delete the process and navigate back to the overview page on success', () => {
+      component.deleteProcess(process);
+
+      expect(processService.delete).toHaveBeenCalledWith(process.processId);
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(router.navigateByUrl).toHaveBeenCalledWith(getProcessListRoute());
+    });
+    it('should delete the process and not navigate on error', () => {
+      (processService.delete as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$());
+      component.deleteProcess(process);
+
+      expect(processService.delete).toHaveBeenCalledWith(process.processId);
+      expect(notificationsService.error).toHaveBeenCalled();
+      expect(router.navigateByUrl).not.toHaveBeenCalled();
+    });
+  });
+
 });
diff --git a/src/app/process-page/detail/process-detail.component.ts b/src/app/process-page/detail/process-detail.component.ts
index 8a05288eb2..f9151d27b8 100644
--- a/src/app/process-page/detail/process-detail.component.ts
+++ b/src/app/process-page/detail/process-detail.component.ts
@@ -12,8 +12,9 @@ import { RemoteData } from '../../core/data/remote-data';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import {
-  getFirstSucceededRemoteDataPayload,
-  getFirstSucceededRemoteData
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+  getFirstSucceededRemoteDataPayload
 } from '../../core/shared/operators';
 import { URLCombiner } from '../../core/url-combiner/url-combiner';
 import { AlertType } from '../../shared/alert/aletr-type';
@@ -21,6 +22,10 @@ import { hasValue } from '../../shared/empty.util';
 import { ProcessStatus } from '../processes/process-status.model';
 import { Process } from '../processes/process.model';
 import { redirectOn4xx } from '../../core/shared/authorized.operators';
+import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import { getProcessListRoute } from '../process-page-routing.paths';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'ds-process-detail',
@@ -71,6 +76,11 @@ export class ProcessDetailComponent implements OnInit {
    */
   dateFormat = 'yyyy-MM-dd HH:mm:ss ZZZZ';
 
+  /**
+   * Reference to NgbModal
+   */
+  protected modalRef: NgbModalRef;
+
   constructor(protected route: ActivatedRoute,
               protected router: Router,
               protected processService: ProcessDataService,
@@ -78,7 +88,11 @@ export class ProcessDetailComponent implements OnInit {
               protected nameService: DSONameService,
               private zone: NgZone,
               protected authService: AuthService,
-              protected http: HttpClient) {
+              protected http: HttpClient,
+              protected modalService: NgbModal,
+              protected notificationsService: NotificationsService,
+              protected translateService: TranslateService
+  ) {
   }
 
   /**
@@ -172,4 +186,35 @@ export class ProcessDetailComponent implements OnInit {
         || process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()));
   }
 
+  /**
+   * Delete the current process
+   * @param process
+   */
+  deleteProcess(process: Process) {
+    this.processService.delete(process.processId).pipe(
+      getFirstCompletedRemoteData()
+    ).subscribe((rd) => {
+      if (rd.hasSucceeded) {
+        this.notificationsService.success(this.translateService.get('process.detail.delete.success'));
+        this.router.navigateByUrl(getProcessListRoute());
+      } else {
+        this.notificationsService.error(this.translateService.get('process.detail.delete.error'));
+      }
+    });
+  }
+
+  /**
+   * Open a given modal.
+   * @param content   - the modal content.
+   */
+  openDeleteModal(content) {
+    this.modalRef = this.modalService.open(content);
+  }
+  /**
+   * Close the modal.
+   */
+  closeModal() {
+    this.modalRef.close();
+  }
+
 }
diff --git a/src/app/process-page/overview/process-bulk-delete.service.spec.ts b/src/app/process-page/overview/process-bulk-delete.service.spec.ts
new file mode 100644
index 0000000000..5139048dd1
--- /dev/null
+++ b/src/app/process-page/overview/process-bulk-delete.service.spec.ts
@@ -0,0 +1,149 @@
+import { ProcessBulkDeleteService } from './process-bulk-delete.service';
+import { waitForAsync } from '@angular/core/testing';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
+
+describe('ProcessBulkDeleteService', () => {
+
+  let service: ProcessBulkDeleteService;
+  let processDataService;
+  let notificationsService;
+  let mockTranslateService;
+
+  beforeEach(waitForAsync(() => {
+    processDataService = jasmine.createSpyObj('processDataService', {
+      delete: createSuccessfulRemoteDataObject$(null)
+    });
+    notificationsService = new NotificationsServiceStub();
+    mockTranslateService = getMockTranslateService();
+    service = new ProcessBulkDeleteService(processDataService, notificationsService, mockTranslateService);
+  }));
+
+  describe('toggleDelete', () => {
+    it('should add a new value to the processesToDelete list when not yet present', () => {
+      service.toggleDelete('test-id-1');
+      service.toggleDelete('test-id-2');
+
+      expect(service.processesToDelete).toEqual(['test-id-1', 'test-id-2']);
+    });
+    it('should remove a value from the processesToDelete list when already present', () => {
+      service.toggleDelete('test-id-1');
+      service.toggleDelete('test-id-2');
+
+      expect(service.processesToDelete).toEqual(['test-id-1', 'test-id-2']);
+
+      service.toggleDelete('test-id-1');
+      expect(service.processesToDelete).toEqual(['test-id-2']);
+    });
+  });
+
+  describe('isToBeDeleted', () => {
+    it('should return true when the provided process id is present in the list', () => {
+      service.toggleDelete('test-id-1');
+      service.toggleDelete('test-id-2');
+
+      expect(service.isToBeDeleted('test-id-1')).toBeTrue();
+    });
+    it('should return false when the provided process id is not present in the list', () => {
+      service.toggleDelete('test-id-1');
+      service.toggleDelete('test-id-2');
+
+      expect(service.isToBeDeleted('test-id-3')).toBeFalse();
+    });
+  });
+
+  describe('clearAllProcesses', () => {
+    it('should clear the list of to be deleted processes', () => {
+      service.toggleDelete('test-id-1');
+      service.toggleDelete('test-id-2');
+
+      expect(service.processesToDelete).toEqual(['test-id-1', 'test-id-2']);
+
+      service.clearAllProcesses();
+      expect(service.processesToDelete).toEqual([]);
+    });
+  });
+  describe('getAmountOfSelectedProcesses', () => {
+    it('should return the amount of the currently selected processes for deletion', () => {
+      service.toggleDelete('test-id-1');
+      service.toggleDelete('test-id-2');
+
+      expect(service.getAmountOfSelectedProcesses()).toEqual(2);
+    });
+  });
+  describe('isProcessing$', () => {
+    it('should return a behavior subject containing whether a delete is currently processing or not', () => {
+      const result = service.isProcessing$();
+      expect(result.getValue()).toBeFalse();
+
+      result.next(true);
+      expect(result.getValue()).toBeTrue();
+    });
+  });
+  describe('hasSelected', () => {
+    it('should return if the list of selected processes has values', () => {
+      expect(service.hasSelected()).toBeFalse();
+
+      service.toggleDelete('test-id-1');
+      service.toggleDelete('test-id-2');
+
+      expect(service.hasSelected()).toBeTrue();
+    });
+  });
+  describe('deleteSelectedProcesses', () => {
+    it('should delete all selected processes, show an error for each failed one and a notification at the end with the amount of succeeded deletions', () => {
+      (processDataService.delete as jasmine.Spy).and.callFake((processId: string) => {
+        if (processId.includes('error')) {
+          return createFailedRemoteDataObject$();
+        } else {
+          return createSuccessfulRemoteDataObject$(null);
+        }
+      });
+
+      service.toggleDelete('test-id-1');
+      service.toggleDelete('test-id-2');
+      service.toggleDelete('error-id-3');
+      service.toggleDelete('test-id-4');
+      service.toggleDelete('error-id-5');
+      service.toggleDelete('error-id-6');
+      service.toggleDelete('test-id-7');
+
+
+      service.deleteSelectedProcesses();
+
+      expect(processDataService.delete).toHaveBeenCalledWith('test-id-1');
+
+
+      expect(processDataService.delete).toHaveBeenCalledWith('test-id-2');
+
+
+      expect(processDataService.delete).toHaveBeenCalledWith('error-id-3');
+      expect(notificationsService.error).toHaveBeenCalled();
+      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.error.body', {processId: 'error-id-3'});
+
+
+      expect(processDataService.delete).toHaveBeenCalledWith('test-id-4');
+
+
+      expect(processDataService.delete).toHaveBeenCalledWith('error-id-5');
+      expect(notificationsService.error).toHaveBeenCalled();
+      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.error.body', {processId: 'error-id-5'});
+
+
+      expect(processDataService.delete).toHaveBeenCalledWith('error-id-6');
+      expect(notificationsService.error).toHaveBeenCalled();
+      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.error.body', {processId: 'error-id-6'});
+
+
+      expect(processDataService.delete).toHaveBeenCalledWith('test-id-7');
+
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.success', {count: 4});
+
+      expect(service.processesToDelete).toEqual(['error-id-3', 'error-id-5', 'error-id-6']);
+
+
+    });
+  });
+});
diff --git a/src/app/process-page/overview/process-bulk-delete.service.ts b/src/app/process-page/overview/process-bulk-delete.service.ts
new file mode 100644
index 0000000000..c0943fb615
--- /dev/null
+++ b/src/app/process-page/overview/process-bulk-delete.service.ts
@@ -0,0 +1,118 @@
+import { Process } from '../processes/process.model';
+import { Injectable } from '@angular/core';
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { isNotEmpty } from '../../shared/empty.util';
+import { BehaviorSubject, count, from } from 'rxjs';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { concatMap, filter, tap } from 'rxjs/operators';
+import { RemoteData } from '../../core/data/remote-data';
+import { TranslateService } from '@ngx-translate/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+/**
+ * Service to facilitate removing processes in bulk.
+ */
+export class ProcessBulkDeleteService {
+
+  /**
+   * Array to track the processes to be deleted
+   */
+  processesToDelete: string[] = [];
+
+  /**
+   * Behavior subject to track whether the delete is processing
+   * @protected
+   */
+  protected isProcessingBehaviorSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
+  constructor(
+    protected processDataService: ProcessDataService,
+    protected notificationsService: NotificationsService,
+    protected translateService: TranslateService
+  ) {
+  }
+
+  /**
+   * Add or remove a process id to/from the list
+   * If the id is already present it will be removed, otherwise it will be added.
+   *
+   * @param processId - The process id to add or remove
+   */
+  toggleDelete(processId: string) {
+    if (this.isToBeDeleted(processId)) {
+      this.processesToDelete.splice(this.processesToDelete.indexOf(processId), 1);
+    } else {
+      this.processesToDelete.push(processId);
+    }
+  }
+
+  /**
+   * Checks if the provided process id is present in the to be deleted list
+   * @param processId
+   */
+  isToBeDeleted(processId: string) {
+    return this.processesToDelete.includes(processId);
+  }
+
+  /**
+   * Clear the list of processes to be deleted
+   */
+  clearAllProcesses() {
+    this.processesToDelete.splice(0);
+  }
+
+  /**
+   * Get the amount of processes selected for deletion
+   */
+  getAmountOfSelectedProcesses() {
+    return this.processesToDelete.length;
+  }
+
+  /**
+   * Returns a behavior subject to indicate whether the bulk delete is processing
+   */
+  isProcessing$() {
+    return this.isProcessingBehaviorSubject;
+  }
+
+  /**
+   * Returns whether there currently are values selected for deletion
+   */
+  hasSelected(): boolean {
+    return isNotEmpty(this.processesToDelete);
+  }
+
+  /**
+   * Delete all selected processes one by one
+   * When the deletion for a process fails, an error notification will be shown with the process id,
+   * but it will continue deleting the other processes.
+   * At the end it will show a notification stating the amount of successful deletes
+   * The successfully deleted processes will be removed from the list of selected values, the failed ones will be retained.
+   */
+  deleteSelectedProcesses() {
+    this.isProcessingBehaviorSubject.next(true);
+
+    from([...this.processesToDelete]).pipe(
+      concatMap((processId) => {
+        return this.processDataService.delete(processId).pipe(
+          getFirstCompletedRemoteData(),
+          tap((rd: RemoteData<Process>) => {
+            if (rd.hasFailed) {
+              this.notificationsService.error(this.translateService.get('process.bulk.delete.error.head'), this.translateService.get('process.bulk.delete.error.body', {processId: processId}));
+            } else {
+              this.toggleDelete(processId);
+            }
+          })
+        );
+      }),
+      filter((rd: RemoteData<Process>) => rd.hasSucceeded),
+      count(),
+    ).subscribe((value) => {
+      this.notificationsService.success(this.translateService.get('process.bulk.delete.success', {count: value}));
+      this.isProcessingBehaviorSubject.next(false);
+    });
+  }
+}
diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html
index 7d3f15f074..5bf5fee79f 100644
--- a/src/app/process-page/overview/process-overview.component.html
+++ b/src/app/process-page/overview/process-overview.component.html
@@ -1,7 +1,19 @@
 <div class="container">
     <div class="d-flex">
         <h2 class="flex-grow-1">{{'process.overview.title' | translate}}</h2>
-        <button class="btn btn-lg btn-success " routerLink="/processes/new"><i class="fas fa-plus pr-2"></i>{{'process.overview.new' | translate}}</button>
+    </div>
+    <div class="d-flex justify-content-end">
+        <button *ngIf="processBulkDeleteService.hasSelected()" class="btn btn-primary mr-2"
+                (click)="processBulkDeleteService.clearAllProcesses()"><i
+                class="fas fa-undo pr-2"></i>{{'process.overview.delete.clear' | translate }}
+        </button>
+        <button *ngIf="processBulkDeleteService.hasSelected()" class="btn btn-danger mr-2"
+                (click)="openDeleteModal(deleteModal)"><i
+                class="fas fa-trash pr-2"></i>{{'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}
+        </button>
+        <button class="btn btn-success" routerLink="/processes/new"><i
+                class="fas fa-plus pr-2"></i>{{'process.overview.new' | translate}}</button>
+
     </div>
     <ds-pagination *ngIf="(processesRD$ | async)?.payload?.totalElements > 0"
                    [paginationOptions]="pageConfig"
@@ -19,19 +31,61 @@
                     <th scope="col">{{'process.overview.table.start' | translate}}</th>
                     <th scope="col">{{'process.overview.table.finish' | translate}}</th>
                     <th scope="col">{{'process.overview.table.status' | translate}}</th>
+                    <th scope="col">{{'process.overview.table.actions' | translate}}</th>
                 </tr>
                 </thead>
                 <tbody>
-                <tr *ngFor="let process of (processesRD$ | async)?.payload?.page">
+                <tr *ngFor="let process of (processesRD$ | async)?.payload?.page"
+                    [class.table-danger]="processBulkDeleteService.isToBeDeleted(process.processId)">
                     <td><a [routerLink]="['/processes/', process.processId]">{{process.processId}}</a></td>
                     <td><a [routerLink]="['/processes/', process.processId]">{{process.scriptName}}</a></td>
                     <td *ngVar="(getEpersonName(process.userId) | async) as ePersonName">{{ePersonName}}</td>
                     <td>{{process.startTime | date:dateFormat:'UTC'}}</td>
                     <td>{{process.endTime | date:dateFormat:'UTC'}}</td>
                     <td>{{process.processStatus}}</td>
+                    <td>
+                        <button class="btn btn-outline-danger"
+                                (click)="processBulkDeleteService.toggleDelete(process.processId)"><i
+                                class="fas fa-trash"></i></button>
+                    </td>
                 </tr>
                 </tbody>
             </table>
         </div>
     </ds-pagination>
 </div>
+
+<ng-template #deleteModal>
+
+    <div>
+
+        <div class="modal-header">
+            <div>
+                <h4>{{'process.overview.delete.header' | translate }}</h4>
+            </div>
+            <button type="button" class="close"
+                    (click)="closeModal()" aria-label="Close">
+                <span aria-hidden="true">×</span>
+            </button>
+        </div>
+
+        <div class="modal-body">
+            <div *ngIf="!(processBulkDeleteService.isProcessing$() |async)">{{'process.overview.delete.body' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</div>
+            <div *ngIf="processBulkDeleteService.isProcessing$() |async" class="alert alert-info">
+                <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
+                <span> {{ 'process.overview.delete.processing' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</span>
+            </div>
+            <div class="mt-4">
+                <button class="btn btn-primary mr-2" [disabled]="processBulkDeleteService.isProcessing$() |async"
+                        (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
+                <button id="delete-confirm" class="btn btn-danger"
+                        [disabled]="processBulkDeleteService.isProcessing$() |async"
+                        (click)="deleteSelected()">{{ 'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()}  }}
+                </button>
+            </div>
+        </div>
+    </div>
+
+
+</ng-template>
+
diff --git a/src/app/process-page/overview/process-overview.component.spec.ts b/src/app/process-page/overview/process-overview.component.spec.ts
index c147ed00ca..94071c0e59 100644
--- a/src/app/process-page/overview/process-overview.component.spec.ts
+++ b/src/app/process-page/overview/process-overview.component.spec.ts
@@ -1,5 +1,5 @@
 import { ProcessOverviewComponent } from './process-overview.component';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { VarDirective } from '../../shared/utils/var.directive';
 import { TranslateModule } from '@ngx-translate/core';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -13,11 +13,11 @@ import { ProcessStatus } from '../processes/process-status.model';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { FindListOptions } from '../../core/data/find-list-options.model';
 import { DatePipe } from '@angular/common';
+import { BehaviorSubject } from 'rxjs';
+import { ProcessBulkDeleteService } from './process-bulk-delete.service';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
 describe('ProcessOverviewComponent', () => {
   let component: ProcessOverviewComponent;
@@ -30,6 +30,9 @@ describe('ProcessOverviewComponent', () => {
   let processes: Process[];
   let ePerson: EPerson;
 
+  let processBulkDeleteService;
+  let modalService;
+
   const pipe = new DatePipe('en-US');
 
   function init() {
@@ -80,6 +83,29 @@ describe('ProcessOverviewComponent', () => {
     });
 
     paginationService = new PaginationServiceStub();
+
+    processBulkDeleteService = jasmine.createSpyObj('processBulkDeleteService', {
+      clearAllProcesses: {},
+      deleteSelectedProcesses: {},
+      isProcessing$: new BehaviorSubject(false),
+      hasSelected: true,
+      isToBeDeleted: true,
+      toggleDelete: {},
+      getAmountOfSelectedProcesses: 5
+
+    });
+
+    (processBulkDeleteService.isToBeDeleted as jasmine.Spy).and.callFake((id) => {
+      if (id === 2) {
+        return true;
+      } else {
+        return false;
+      }
+    });
+
+    modalService = jasmine.createSpyObj('modalService', {
+      open: {}
+    });
   }
 
   beforeEach(waitForAsync(() => {
@@ -90,7 +116,9 @@ describe('ProcessOverviewComponent', () => {
       providers: [
         { provide: ProcessDataService, useValue: processService },
         { provide: EPersonDataService, useValue: ePersonService },
-        { provide: PaginationService, useValue: paginationService }
+        { provide: PaginationService, useValue: paginationService },
+        { provide: ProcessBulkDeleteService, useValue: processBulkDeleteService },
+        { provide: NgbModal, useValue: modalService },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -154,5 +182,71 @@ describe('ProcessOverviewComponent', () => {
         expect(el.textContent).toContain(processes[index].processStatus);
       });
     });
+    it('should display a delete button in the seventh column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(7)'));
+        expect(el.nativeElement.innerHTML).toContain('fas fa-trash');
+
+        el.query(By.css('button')).triggerEventHandler('click', null);
+        expect(processBulkDeleteService.toggleDelete).toHaveBeenCalledWith(processes[index].processId);
+      });
+    });
+    it('should indicate a row that has been selected for deletion', () => {
+      const deleteRow = fixture.debugElement.query(By.css('.table-danger'));
+      expect(deleteRow.nativeElement.innerHTML).toContain('/processes/' + processes[1].processId);
+    });
+  });
+
+  describe('overview buttons', () => {
+    it('should show a button to clear selected processes when there are selected processes', () => {
+      const clearButton = fixture.debugElement.query(By.css('.btn-primary'));
+      expect(clearButton.nativeElement.innerHTML).toContain('process.overview.delete.clear');
+
+      clearButton.triggerEventHandler('click', null);
+      expect(processBulkDeleteService.clearAllProcesses).toHaveBeenCalled();
+    });
+    it('should not show a button to clear selected processes when there are no selected processes', () => {
+      (processBulkDeleteService.hasSelected as jasmine.Spy).and.returnValue(false);
+      fixture.detectChanges();
+
+      const clearButton = fixture.debugElement.query(By.css('.btn-primary'));
+      expect(clearButton).toBeNull();
+    });
+    it('should show a button to open the delete modal when there are selected processes', () => {
+      spyOn(component, 'openDeleteModal');
+
+      const deleteButton = fixture.debugElement.query(By.css('.btn-danger'));
+      expect(deleteButton.nativeElement.innerHTML).toContain('process.overview.delete');
+
+      deleteButton.triggerEventHandler('click', null);
+      expect(component.openDeleteModal).toHaveBeenCalled();
+    });
+    it('should not show a button to clear selected processes when there are no selected processes', () => {
+      (processBulkDeleteService.hasSelected as jasmine.Spy).and.returnValue(false);
+      fixture.detectChanges();
+
+      const deleteButton = fixture.debugElement.query(By.css('.btn-danger'));
+      expect(deleteButton).toBeNull();
+    });
+  });
+
+  describe('openDeleteModal', () => {
+    it('should open the modal', () => {
+      component.openDeleteModal({});
+      expect(modalService.open).toHaveBeenCalledWith({});
+    });
+  });
+
+  describe('deleteSelected', () => {
+    it('should call the deleteSelectedProcesses method on the processBulkDeleteService and close the modal when processing is done', () => {
+      spyOn(component, 'closeModal');
+      spyOn(component, 'setProcesses');
+
+      component.deleteSelected();
+
+      expect(processBulkDeleteService.deleteSelectedProcesses).toHaveBeenCalled();
+      expect(component.closeModal).toHaveBeenCalled();
+      expect(component.setProcesses).toHaveBeenCalled();
+    });
   });
 });
diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts
index 7afcd9cb76..749f76b1a6 100644
--- a/src/app/process-page/overview/process-overview.component.ts
+++ b/src/app/process-page/overview/process-overview.component.ts
@@ -1,5 +1,5 @@
-import { Component, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { BehaviorSubject, Observable, skipWhile, Subscription } from 'rxjs';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { Process } from '../processes/process.model';
@@ -11,6 +11,9 @@ import { map, switchMap } from 'rxjs/operators';
 import { ProcessDataService } from '../../core/data/processes/process-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { FindListOptions } from '../../core/data/find-list-options.model';
+import { ProcessBulkDeleteService } from './process-bulk-delete.service';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { hasValue } from '../../shared/empty.util';
 
 @Component({
   selector: 'ds-process-overview',
@@ -19,7 +22,7 @@ import { FindListOptions } from '../../core/data/find-list-options.model';
 /**
  * Component displaying a list of all processes in a paginated table
  */
-export class ProcessOverviewComponent implements OnInit {
+export class ProcessOverviewComponent implements OnInit, OnDestroy {
 
   /**
    * List of all processes
@@ -46,13 +49,22 @@ export class ProcessOverviewComponent implements OnInit {
    */
   dateFormat = 'yyyy-MM-dd HH:mm:ss';
 
+  processesToDelete: string[] = [];
+  private modalRef: any;
+
+  isProcessingSub: Subscription;
+
   constructor(protected processService: ProcessDataService,
               protected paginationService: PaginationService,
-              protected ePersonService: EPersonDataService) {
+              protected ePersonService: EPersonDataService,
+              protected modalService: NgbModal,
+              public processBulkDeleteService: ProcessBulkDeleteService,
+  ) {
   }
 
   ngOnInit(): void {
     this.setProcesses();
+    this.processBulkDeleteService.clearAllProcesses();
   }
 
   /**
@@ -60,7 +72,7 @@ export class ProcessOverviewComponent implements OnInit {
    */
   setProcesses() {
     this.processesRD$ = this.paginationService.getFindListOptions(this.pageConfig.id, this.config).pipe(
-      switchMap((config) => this.processService.findAll(config))
+      switchMap((config) => this.processService.findAll(config, true, false))
     );
   }
 
@@ -74,8 +86,46 @@ export class ProcessOverviewComponent implements OnInit {
       map((eperson: EPerson) => eperson.name)
     );
   }
+
   ngOnDestroy(): void {
     this.paginationService.clearPagination(this.pageConfig.id);
+    if (hasValue(this.isProcessingSub)) {
+      this.isProcessingSub.unsubscribe();
+    }
   }
 
+  /**
+   * Open a given modal.
+   * @param content   - the modal content.
+   */
+  openDeleteModal(content) {
+    this.modalRef = this.modalService.open(content);
+  }
+
+  /**
+   * Close the modal.
+   */
+  closeModal() {
+    this.modalRef.close();
+  }
+
+  /**
+   * Delete the previously selected processes using the processBulkDeleteService
+   * After the deletion has started, subscribe to the isProcessing$ and when it is set
+   * to false after the processing is done, close the modal and reinitialise the processes
+   */
+  deleteSelected() {
+    this.processBulkDeleteService.deleteSelectedProcesses();
+
+    if (hasValue(this.isProcessingSub)) {
+      this.isProcessingSub.unsubscribe();
+    }
+    this.isProcessingSub = this.processBulkDeleteService.isProcessing$()
+      .subscribe((isProcessing) => {
+      if (!isProcessing) {
+        this.closeModal();
+        this.setProcesses();
+      }
+    });
+  }
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 57863b3a69..31a32e11b7 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2983,6 +2983,22 @@
 
   "process.detail.create" : "Create similar process",
 
+  "process.detail.actions": "Actions",
+  
+  "process.detail.delete.button": "Delete process",
+
+  "process.detail.delete.header": "Delete process",
+
+  "process.detail.delete.body": "Are you sure you want to delete the current process?",
+
+  "process.detail.delete.cancel": "Cancel",
+
+  "process.detail.delete.confirm": "Delete process",
+
+  "process.detail.delete.success": "The process was successfully deleted.",
+
+  "process.detail.delete.error": "Something went wrong when deleting the process",
+
 
 
   "process.overview.table.finish" : "Finish time (UTC)",
@@ -3003,6 +3019,25 @@
 
   "process.overview.new": "New",
 
+  "process.overview.table.actions": "Actions",
+
+  "process.overview.delete": "Delete {{count}} processes",
+
+  "process.overview.delete.clear": "Clear delete selection",
+
+  "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.",
+
+  "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+
+  "process.overview.delete.header": "Delete processes",
+
+  "process.bulk.delete.error.head": "Error on deleteing process",
+
+  "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ",
+
+  "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
+
+  
 
   "profile.breadcrumbs": "Update Profile",
 

From 5ed369d097e07aab0fd5a128005a57bde6d1b280 Mon Sep 17 00:00:00 2001
From: "Mark H. Wood" <mwood@IUPUI.Edu>
Date: Fri, 19 Aug 2022 16:23:20 -0400
Subject: [PATCH 04/48] Make create, edit community/collection/item dialogs
 theme-able.

---
 src/app/menu.resolver.ts                      | 36 +++++++++----------
 ...te-collection-parent-selector.component.ts | 28 +++++++++++++++
 ...ate-community-parent-selector.component.ts | 27 ++++++++++++++
 ...d-create-item-parent-selector.component.ts | 31 ++++++++++++++++
 ...emed-edit-collection-selector.component.ts | 27 ++++++++++++++
 ...hemed-edit-community-selector.component.ts | 27 ++++++++++++++
 .../themed-edit-item-selector.component.ts    | 27 ++++++++++++++
 7 files changed, 185 insertions(+), 18 deletions(-)
 create mode 100644 src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component.ts
 create mode 100644 src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component.ts
 create mode 100644 src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts
 create mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component.ts
 create mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component.ts
 create mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component.ts

diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts
index 4c97d3d1b3..f12079f737 100644
--- a/src/app/menu.resolver.ts
+++ b/src/app/menu.resolver.ts
@@ -16,24 +16,24 @@ import { filter, find, map, take } from 'rxjs/operators';
 import { hasValue } from './shared/empty.util';
 import { FeatureID } from './core/data/feature-authorization/feature-id';
 import {
-  CreateCommunityParentSelectorComponent
-} from './shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
+  ThemedCreateCommunityParentSelectorComponent
+} from './shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component';
 import { OnClickMenuItemModel } from './shared/menu/menu-item/models/onclick.model';
 import {
-  CreateCollectionParentSelectorComponent
-} from './shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
+  ThemedCreateCollectionParentSelectorComponent
+} from './shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component';
 import {
-  CreateItemParentSelectorComponent
-} from './shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
+  ThemedCreateItemParentSelectorComponent
+} from './shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
 import {
-  EditCommunitySelectorComponent
-} from './shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
+  ThemedEditCommunitySelectorComponent
+} from './shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component';
 import {
-  EditCollectionSelectorComponent
-} from './shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
+  ThemedEditCollectionSelectorComponent
+} from './shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component';
 import {
-  EditItemSelectorComponent
-} from './shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
+  ThemedEditItemSelectorComponent
+} from './shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component';
 import {
   ExportMetadataSelectorComponent
 } from './shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
@@ -188,7 +188,7 @@ export class MenuResolver implements Resolve<boolean> {
             type: MenuItemType.ONCLICK,
             text: 'menu.section.new_community',
             function: () => {
-              this.modalService.open(CreateCommunityParentSelectorComponent);
+              this.modalService.open(ThemedCreateCommunityParentSelectorComponent);
             }
           } as OnClickMenuItemModel,
         },
@@ -201,7 +201,7 @@ export class MenuResolver implements Resolve<boolean> {
             type: MenuItemType.ONCLICK,
             text: 'menu.section.new_collection',
             function: () => {
-              this.modalService.open(CreateCollectionParentSelectorComponent);
+              this.modalService.open(ThemedCreateCollectionParentSelectorComponent);
             }
           } as OnClickMenuItemModel,
         },
@@ -214,7 +214,7 @@ export class MenuResolver implements Resolve<boolean> {
             type: MenuItemType.ONCLICK,
             text: 'menu.section.new_item',
             function: () => {
-              this.modalService.open(CreateItemParentSelectorComponent);
+              this.modalService.open(ThemedCreateItemParentSelectorComponent);
             }
           } as OnClickMenuItemModel,
         },
@@ -263,7 +263,7 @@ export class MenuResolver implements Resolve<boolean> {
             type: MenuItemType.ONCLICK,
             text: 'menu.section.edit_community',
             function: () => {
-              this.modalService.open(EditCommunitySelectorComponent);
+              this.modalService.open(ThemedEditCommunitySelectorComponent);
             }
           } as OnClickMenuItemModel,
         },
@@ -276,7 +276,7 @@ export class MenuResolver implements Resolve<boolean> {
             type: MenuItemType.ONCLICK,
             text: 'menu.section.edit_collection',
             function: () => {
-              this.modalService.open(EditCollectionSelectorComponent);
+              this.modalService.open(ThemedEditCollectionSelectorComponent);
             }
           } as OnClickMenuItemModel,
         },
@@ -289,7 +289,7 @@ export class MenuResolver implements Resolve<boolean> {
             type: MenuItemType.ONCLICK,
             text: 'menu.section.edit_item',
             function: () => {
-              this.modalService.open(EditItemSelectorComponent);
+              this.modalService.open(ThemedEditItemSelectorComponent);
             }
           } as OnClickMenuItemModel,
         },
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component.ts
new file mode 100644
index 0000000000..f6598aec99
--- /dev/null
+++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component.ts
@@ -0,0 +1,28 @@
+import {Component} from "@angular/core";
+import {CreateCollectionParentSelectorComponent} from "./create-collection-parent-selector.component";
+import {ThemedComponent} from "src/app/shared/theme-support/themed.component";
+
+/**
+ * Themed wrapper for CreateCollectionParentSelectorComponent
+ */
+@Component({
+    selector: 'ds-themed-create-collection-parent-selector',
+    styleUrls: [],
+    templateUrl: '../../../theme-support/themed.component.html'
+})
+export class ThemedCreateCollectionParentSelectorComponent
+    extends ThemedComponent<CreateCollectionParentSelectorComponent> {
+
+    protected getComponentName(): string {
+        return 'CreateCollectionParentSelectorComponent';
+    }
+
+    protected importThemedComponent(themeName: string): Promise<any> {
+        return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component`);
+    }
+
+    protected importUnthemedComponent(): Promise<any> {
+        return import('./create-collection-parent-selector.component');
+    }
+
+}
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component.ts
new file mode 100644
index 0000000000..92621978b8
--- /dev/null
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component.ts
@@ -0,0 +1,27 @@
+import {Component} from "@angular/core";
+import {CreateCommunityParentSelectorComponent} from "./create-community-parent-selector.component";
+import {ThemedComponent} from "src/app/shared/theme-support/themed.component";
+
+/**
+ * Themed wrapper for CreateCommunityParentSelectorComponent
+ */
+@Component({
+    selector: 'ds-themed-create-community-parent-selector',
+    styleUrls: [],
+    templateUrl: '../../../theme-support/themed.component.html'
+})
+export class ThemedCreateCommunityParentSelectorComponent
+    extends ThemedComponent<CreateCommunityParentSelectorComponent> {
+    protected getComponentName(): string {
+        return 'CreateCommunityParentSelectorComponent';
+    }
+
+    protected importThemedComponent(themeName: string): Promise<any> {
+        return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component`);
+    }
+
+    protected importUnthemedComponent(): Promise<any> {
+        return import('./create-community-parent-selector.component');
+    }
+
+}
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts
new file mode 100644
index 0000000000..70ab0d76ee
--- /dev/null
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts
@@ -0,0 +1,31 @@
+import {Component, Input} from "@angular/core";
+import {CreateItemParentSelectorComponent} from "./create-item-parent-selector.component";
+import {ThemedComponent} from "src/app/shared/theme-support/themed.component";
+
+/**
+ * Themed wrapper for CreateItemParentSelectorComponent
+ */
+@Component({
+    selector: 'ds-themed-create-item-parent-selector',
+    styleUrls: [],
+    templateUrl: '../../../theme-support/themed.component.html'
+})
+export class ThemedCreateItemParentSelectorComponent
+    extends ThemedComponent<CreateItemParentSelectorComponent> {
+    @Input() entityType: string;
+
+    protected inAndOutputNames: (keyof CreateItemParentSelectorComponent & keyof this)[] = ['entityType'];
+
+    protected getComponentName(): string {
+        return 'CreateItemParentSelectorComponent';
+    }
+
+    protected importThemedComponent(themeName: string): Promise<any> {
+        return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component`);
+    }
+
+    protected importUnthemedComponent(): Promise<any> {
+        return import('./create-item-parent-selector.component');
+    }
+
+}
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component.ts
new file mode 100644
index 0000000000..4e3191d03b
--- /dev/null
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component.ts
@@ -0,0 +1,27 @@
+import {Component} from "@angular/core";
+import {EditCollectionSelectorComponent} from "./edit-collection-selector.component";
+import {ThemedComponent} from "src/app/shared/theme-support/themed.component";
+
+/**
+ * Themed wrapper for EditCollectionSelectorComponent
+ */
+@Component({
+    selector: 'ds-themed-edit-collection-selector',
+    styleUrls: [],
+    templateUrl: '../../../theme-support/themed.component.html'
+})
+export class ThemedEditCollectionSelectorComponent
+    extends ThemedComponent<EditCollectionSelectorComponent> {
+    protected getComponentName(): string {
+        return 'EditCollectionSelectorComponent';
+    }
+
+    protected importThemedComponent(themeName: string): Promise<any> {
+        return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component`);
+    }
+
+    protected importUnthemedComponent(): Promise<any> {
+        return import('./edit-collection-selector.component');
+    }
+
+}
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component.ts
new file mode 100644
index 0000000000..d8232abcdb
--- /dev/null
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component.ts
@@ -0,0 +1,27 @@
+import {Component} from "@angular/core";
+import {EditCommunitySelectorComponent} from "./edit-community-selector.component";
+import {ThemedComponent} from "src/app/shared/theme-support/themed.component";
+
+/**
+ * Themed wrapper for EditCommunitySelectorComponent
+ */
+@Component({
+    selector: 'ds-themed-edit-community-selector',
+    styleUrls: [],
+    templateUrl: '../../../theme-support/themed.component.html'
+})
+export class ThemedEditCommunitySelectorComponent
+    extends ThemedComponent<EditCommunitySelectorComponent> {
+    protected getComponentName(): string {
+        return 'EditCommunitySelectorComponent';
+    }
+
+    protected importThemedComponent(themeName: string): Promise<any> {
+        return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component`);
+    }
+
+    protected importUnthemedComponent(): Promise<any> {
+        return import('./edit-community-selector.component');
+    }
+
+}
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component.ts
new file mode 100644
index 0000000000..e1377e7fb4
--- /dev/null
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component.ts
@@ -0,0 +1,27 @@
+import {Component} from "@angular/core";
+import {EditItemSelectorComponent} from "./edit-item-selector.component";
+import {ThemedComponent} from "src/app/shared/theme-support/themed.component";
+
+/**
+ * Themed wrapper for EditItemSelectorComponent
+ */
+@Component({
+    selector: 'ds-themed-edit-item-selector',
+    styleUrls: [],
+    templateUrl: '../../../theme-support/themed.component.html'
+})
+export class ThemedEditItemSelectorComponent
+    extends ThemedComponent<EditItemSelectorComponent> {
+    protected getComponentName(): string {
+        return 'EditItemSelectorComponent';
+    }
+
+    protected importThemedComponent(themeName: string): Promise<any> {
+        return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component`);
+    }
+
+    protected importUnthemedComponent(): Promise<any> {
+        return import('./edit-item-selector.component');
+    }
+
+}

From b2feadc290c5b60dd45ac78b174902b187aae4e5 Mon Sep 17 00:00:00 2001
From: "Mark H. Wood" <mwood@IUPUI.Edu>
Date: Fri, 19 Aug 2022 16:47:10 -0400
Subject: [PATCH 05/48] Satisfy lint.

---
 .../themed-create-collection-parent-selector.component.ts   | 6 +++---
 .../themed-create-community-parent-selector.component.ts    | 6 +++---
 .../themed-create-item-parent-selector.component.ts         | 6 +++---
 .../themed-edit-collection-selector.component.ts            | 6 +++---
 .../themed-edit-community-selector.component.ts             | 6 +++---
 .../themed-edit-item-selector.component.ts                  | 6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component.ts
index f6598aec99..d90cd0ac0d 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component.ts
@@ -1,6 +1,6 @@
-import {Component} from "@angular/core";
-import {CreateCollectionParentSelectorComponent} from "./create-collection-parent-selector.component";
-import {ThemedComponent} from "src/app/shared/theme-support/themed.component";
+import {Component} from '@angular/core';
+import {CreateCollectionParentSelectorComponent} from './create-collection-parent-selector.component';
+import {ThemedComponent} from 'src/app/shared/theme-support/themed.component';
 
 /**
  * Themed wrapper for CreateCollectionParentSelectorComponent
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component.ts
index 92621978b8..24bff97254 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component.ts
@@ -1,6 +1,6 @@
-import {Component} from "@angular/core";
-import {CreateCommunityParentSelectorComponent} from "./create-community-parent-selector.component";
-import {ThemedComponent} from "src/app/shared/theme-support/themed.component";
+import {Component} from '@angular/core';
+import {CreateCommunityParentSelectorComponent} from './create-community-parent-selector.component';
+import {ThemedComponent} from 'src/app/shared/theme-support/themed.component';
 
 /**
  * Themed wrapper for CreateCommunityParentSelectorComponent
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts
index 70ab0d76ee..49209ea63b 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts
@@ -1,6 +1,6 @@
-import {Component, Input} from "@angular/core";
-import {CreateItemParentSelectorComponent} from "./create-item-parent-selector.component";
-import {ThemedComponent} from "src/app/shared/theme-support/themed.component";
+import {Component, Input} from '@angular/core';
+import {CreateItemParentSelectorComponent} from './create-item-parent-selector.component';
+import {ThemedComponent} from 'src/app/shared/theme-support/themed.component';
 
 /**
  * Themed wrapper for CreateItemParentSelectorComponent
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component.ts
index 4e3191d03b..999f466e75 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component.ts
@@ -1,6 +1,6 @@
-import {Component} from "@angular/core";
-import {EditCollectionSelectorComponent} from "./edit-collection-selector.component";
-import {ThemedComponent} from "src/app/shared/theme-support/themed.component";
+import {Component} from '@angular/core';
+import {EditCollectionSelectorComponent} from './edit-collection-selector.component';
+import {ThemedComponent} from 'src/app/shared/theme-support/themed.component';
 
 /**
  * Themed wrapper for EditCollectionSelectorComponent
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component.ts
index d8232abcdb..e067803444 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component.ts
@@ -1,6 +1,6 @@
-import {Component} from "@angular/core";
-import {EditCommunitySelectorComponent} from "./edit-community-selector.component";
-import {ThemedComponent} from "src/app/shared/theme-support/themed.component";
+import {Component} from '@angular/core';
+import {EditCommunitySelectorComponent} from './edit-community-selector.component';
+import {ThemedComponent} from 'src/app/shared/theme-support/themed.component';
 
 /**
  * Themed wrapper for EditCommunitySelectorComponent
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component.ts
index e1377e7fb4..6d3b5691c1 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component.ts
@@ -1,6 +1,6 @@
-import {Component} from "@angular/core";
-import {EditItemSelectorComponent} from "./edit-item-selector.component";
-import {ThemedComponent} from "src/app/shared/theme-support/themed.component";
+import {Component} from '@angular/core';
+import {EditItemSelectorComponent} from './edit-item-selector.component';
+import {ThemedComponent} from 'src/app/shared/theme-support/themed.component';
 
 /**
  * Themed wrapper for EditItemSelectorComponent

From 4b20b0cb8116a234c22fb48a79200eb0783b57a1 Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Tue, 23 Aug 2022 17:50:46 +0200
Subject: [PATCH 06/48] force initservices to wait until authentication is no
 longer blocking

---
 src/app/core/auth/auth-request.service.ts | 37 ++++++++++++++---------
 src/app/core/auth/auth.reducer.ts         |  6 ++++
 src/modules/app/browser-init.service.ts   |  7 +++++
 src/modules/app/server-init.service.ts    | 12 ++++++--
 4 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts
index 00a94822d3..bcaa5972ac 100644
--- a/src/app/core/auth/auth-request.service.ts
+++ b/src/app/core/auth/auth-request.service.ts
@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, map, mergeMap, switchMap, tap } from 'rxjs/operators';
+import { distinctUntilChanged, filter, map, mergeMap, switchMap, tap, take } from 'rxjs/operators';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RequestService } from '../data/request.service';
 import { isNotEmpty } from '../../shared/empty.util';
@@ -26,8 +26,8 @@ export abstract class AuthRequestService {
               ) {
   }
 
-  protected fetchRequest(request: RestRequest): Observable<RemoteData<AuthStatus>> {
-    return this.rdbService.buildFromRequestUUID<AuthStatus>(request.uuid).pipe(
+  protected fetchRequest(requestId: string): Observable<RemoteData<AuthStatus>> {
+    return this.rdbService.buildFromRequestUUID<AuthStatus>(requestId).pipe(
       getFirstCompletedRemoteData(),
     );
   }
@@ -37,27 +37,36 @@ export abstract class AuthRequestService {
   }
 
   public postToEndpoint(method: string, body?: any, options?: HttpOptions): Observable<RemoteData<AuthStatus>> {
-    return this.halService.getEndpoint(this.linkName).pipe(
+    const requestId = this.requestService.generateRequestId();
+
+    this.halService.getEndpoint(this.linkName).pipe(
       filter((href: string) => isNotEmpty(href)),
       map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
       distinctUntilChanged(),
-      map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL, body, options)),
-      tap((request: PostRequest) => this.requestService.send(request)),
-      mergeMap((request: PostRequest) => this.fetchRequest(request)),
-      distinctUntilChanged());
+      map((endpointURL: string) => new PostRequest(requestId, endpointURL, body, options)),
+      take(1)
+    ).subscribe((request: PostRequest) => {
+      this.requestService.send(request);
+    });
+
+    return this.fetchRequest(requestId);
   }
 
   public getRequest(method: string, options?: HttpOptions): Observable<RemoteData<AuthStatus>> {
-    return this.halService.getEndpoint(this.linkName).pipe(
+    const requestId = this.requestService.generateRequestId();
+
+    this.halService.getEndpoint(this.linkName).pipe(
       filter((href: string) => isNotEmpty(href)),
       map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
       distinctUntilChanged(),
-      map((endpointURL: string) => new GetRequest(this.requestService.generateRequestId(), endpointURL, undefined, options)),
-      tap((request: GetRequest) => this.requestService.send(request)),
-      mergeMap((request: GetRequest) => this.fetchRequest(request)),
-      distinctUntilChanged());
-  }
+      map((endpointURL: string) => new GetRequest(requestId, endpointURL, undefined, options)),
+      take(1)
+    ).subscribe((request: GetRequest) => {
+      this.requestService.send(request);
+    });
 
+    return this.fetchRequest(requestId);
+  }
   /**
    * Factory function to create the request object to send. This needs to be a POST client side and
    * a GET server side. Due to CSRF validation, the server isn't allowed to send a POST, so we allow
diff --git a/src/app/core/auth/auth.reducer.ts b/src/app/core/auth/auth.reducer.ts
index 6f47a3c20c..acdb8ef812 100644
--- a/src/app/core/auth/auth.reducer.ts
+++ b/src/app/core/auth/auth.reducer.ts
@@ -17,6 +17,7 @@ import {
 import { AuthTokenInfo } from './models/auth-token-info.model';
 import { AuthMethod } from './models/auth.method';
 import { AuthMethodType } from './models/auth.method-type';
+import { StoreActionTypes } from '../../store.actions';
 
 /**
  * The auth state.
@@ -251,6 +252,11 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         idle: false,
       });
 
+    case StoreActionTypes.REHYDRATE:
+      return Object.assign({}, state, {
+        blocking: true,
+      });
+
     default:
       return state;
   }
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index 3980b8bc28..2d49870d58 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -91,6 +91,13 @@ export class BrowserInitService extends InitService {
 
       this.initKlaro();
 
+      // wait for auth to be ready
+      await this.store.pipe(
+        select(isAuthenticationBlocking),
+        distinctUntilChanged(),
+        find((b: boolean) => b === false)
+      ).toPromise();
+
       return true;
     };
   }
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index 803dc7a75a..fb3539ecfa 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -6,7 +6,7 @@
  * http://www.dspace.org/license/
  */
 import { InitService } from '../../app/init.service';
-import { Store } from '@ngrx/store';
+import { Store, select } from '@ngrx/store';
 import { AppState } from '../../app/app.reducer';
 import { TransferState } from '@angular/platform-browser';
 import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
@@ -20,7 +20,8 @@ import { MetadataService } from '../../app/core/metadata/metadata.service';
 import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service';
 import { CSSVariableService } from '../../app/shared/sass-helper/sass-helper.service';
 import { ThemeService } from '../../app/shared/theme-support/theme.service';
-import { take } from 'rxjs/operators';
+import { take, distinctUntilChanged, find } from 'rxjs/operators';
+import { isAuthenticationBlocking } from '../../app/core/auth/selectors';
 
 /**
  * Performs server-side initialization.
@@ -66,6 +67,13 @@ export class ServerInitService extends InitService {
       this.initRouteListeners();
       this.themeService.listenForThemeChanges(false);
 
+      // wait for auth to be ready
+      await this.store.pipe(
+        select(isAuthenticationBlocking),
+        distinctUntilChanged(),
+        find((b: boolean) => b === false)
+      ).toPromise();
+
       return true;
     };
   }

From 50828e9c064965f6487270aa230e6ea277079bab Mon Sep 17 00:00:00 2001
From: Hardy Pottinger <hardy.pottinger@gmail.com>
Date: Tue, 23 Aug 2022 15:17:40 -0500
Subject: [PATCH 07/48] Enable responsive font sizes

- adds enable-responsive-font-sizes toggle to the main bootstrap
  variables scss file
- [docs available](https://getbootstrap.com/docs/4.4/content/typography/#responsive-font-sizes)
---
 src/styles/_bootstrap_variables.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss
index 20c0b3a679..3b06efb9d5 100644
--- a/src/styles/_bootstrap_variables.scss
+++ b/src/styles/_bootstrap_variables.scss
@@ -12,6 +12,9 @@ $fa-font-path: "^assets/fonts" !default;
 /* Images */
 $image-path: "../assets/images" !default;
 
+// enable-responsive-font-sizes allows text to scale more naturally across device and viewport sizes
+$enable-responsive-font-sizes: true;
+
 /** Bootstrap Variables **/
 /* Colors */
 $gray-700: #495057 !default;  // Bootstrap $gray-700

From 8f4b3b58fba9fa228e708543d8fe63e835f35cd7 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Wed, 24 Aug 2022 12:54:27 +0200
Subject: [PATCH 08/48] 93803: Make data services composable

Data services should extend BaseDataService (or IdentifiableDataService) for low-level functionality and optionally wrap "data service feature" classes for
- create
- findAll
- patch / update
- put
- delete
---
 .../core/data/base/base-data.service.spec.ts  | 627 ++++++++++++++++++
 src/app/core/data/base/base-data.service.ts   | 373 +++++++++++
 src/app/core/data/base/create-data.spec.ts    | 112 ++++
 src/app/core/data/base/create-data.ts         | 107 +++
 src/app/core/data/base/delete-data.spec.ts    | 208 ++++++
 src/app/core/data/base/delete-data.ts         | 108 +++
 src/app/core/data/base/find-all-data.spec.ts  | 306 +++++++++
 src/app/core/data/base/find-all-data.ts       | 112 ++++
 .../base/identifiable-data.service.spec.ts    | 145 ++++
 .../data/base/identifiable-data.service.ts    |  83 +++
 src/app/core/data/base/patch-data.spec.ts     | 180 +++++
 src/app/core/data/base/patch-data.ts          | 143 ++++
 src/app/core/data/base/put-data.spec.ts       | 108 +++
 src/app/core/data/base/put-data.ts            |  69 ++
 src/app/core/data/base/search-data.spec.ts    | 146 ++++
 src/app/core/data/base/search-data.ts         | 145 ++++
 16 files changed, 2972 insertions(+)
 create mode 100644 src/app/core/data/base/base-data.service.spec.ts
 create mode 100644 src/app/core/data/base/base-data.service.ts
 create mode 100644 src/app/core/data/base/create-data.spec.ts
 create mode 100644 src/app/core/data/base/create-data.ts
 create mode 100644 src/app/core/data/base/delete-data.spec.ts
 create mode 100644 src/app/core/data/base/delete-data.ts
 create mode 100644 src/app/core/data/base/find-all-data.spec.ts
 create mode 100644 src/app/core/data/base/find-all-data.ts
 create mode 100644 src/app/core/data/base/identifiable-data.service.spec.ts
 create mode 100644 src/app/core/data/base/identifiable-data.service.ts
 create mode 100644 src/app/core/data/base/patch-data.spec.ts
 create mode 100644 src/app/core/data/base/patch-data.ts
 create mode 100644 src/app/core/data/base/put-data.spec.ts
 create mode 100644 src/app/core/data/base/put-data.ts
 create mode 100644 src/app/core/data/base/search-data.spec.ts
 create mode 100644 src/app/core/data/base/search-data.ts

diff --git a/src/app/core/data/base/base-data.service.spec.ts b/src/app/core/data/base/base-data.service.spec.ts
new file mode 100644
index 0000000000..973b9d5095
--- /dev/null
+++ b/src/app/core/data/base/base-data.service.spec.ts
@@ -0,0 +1,627 @@
+/**
+ * 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 { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { FindListOptions } from '../find-list-options.model';
+import { Observable, of as observableOf } from 'rxjs';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { TestScheduler } from 'rxjs/testing';
+import { RemoteData } from '../remote-data';
+import { RequestEntryState } from '../request-entry-state.model';
+import { fakeAsync, tick } from '@angular/core/testing';
+import { BaseDataService } from './base-data.service';
+
+const endpoint = 'https://rest.api/core';
+
+const BOOLEAN = { f: false, t: true };
+
+class TestService extends BaseDataService<any> {
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super(undefined, requestService, rdbService, objectCache, halService);
+  }
+
+  public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+    return observableOf(endpoint);
+  }
+}
+
+describe('BaseDataService', () => {
+  let service: TestService;
+  let requestService;
+  let halService;
+  let rdbService;
+  let objectCache;
+  let selfLink;
+  let linksToFollow;
+  let testScheduler;
+  let remoteDataMocks;
+
+  function initTestService(): TestService {
+    requestService = getMockRequestService();
+    halService = new HALEndpointServiceStub('url') as any;
+    rdbService = getMockRemoteDataBuildService();
+    objectCache = {
+
+      addPatch: () => {
+        /* empty */
+      },
+      getObjectBySelfLink: () => {
+        /* empty */
+      },
+      getByHref: () => {
+        /* empty */
+      }
+    } as any;
+    selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
+    linksToFollow = [
+      followLink('a'),
+      followLink('b')
+    ];
+
+    testScheduler = new TestScheduler((actual, expected) => {
+      // asserting the two objects are equal
+      // e.g. using chai.
+      expect(actual).toEqual(expected);
+    });
+
+    const timeStamp = new Date().getTime();
+    const msToLive = 15 * 60 * 1000;
+    const payload = { foo: 'bar' };
+    const statusCodeSuccess = 200;
+    const statusCodeError = 404;
+    const errorMessage = 'not found';
+    remoteDataMocks = {
+      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
+      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
+      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+    };
+
+    return new TestService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+    );
+  }
+
+  beforeEach(() => {
+    service = initTestService();
+  });
+
+  describe(`reRequestStaleRemoteData`, () => {
+    let callback: jasmine.Spy<jasmine.Func>;
+
+    beforeEach(() => {
+      callback = jasmine.createSpy();
+    });
+
+
+    describe(`when shouldReRequest is false`, () => {
+      it(`shouldn't do anything`, () => {
+        testScheduler.run(({ cold, expectObservable, flush }) => {
+          const expected = 'a-b-c-d-e-f';
+          const values = {
+            a: remoteDataMocks.RequestPending,
+            b: remoteDataMocks.ResponsePending,
+            c: remoteDataMocks.Success,
+            d: remoteDataMocks.SuccessStale,
+            e: remoteDataMocks.Error,
+            f: remoteDataMocks.ErrorStale,
+          };
+
+          expectObservable((service as any).reRequestStaleRemoteData(false, callback)(cold(expected, values))).toBe(expected, values);
+          // since the callback happens in a tap(), flush to ensure it has been executed
+          flush();
+          expect(callback).not.toHaveBeenCalled();
+        });
+      });
+    });
+
+    describe(`when shouldReRequest is true`, () => {
+      it(`should call the callback for stale RemoteData objects, but still pass the source observable unmodified`, () => {
+        testScheduler.run(({ cold, expectObservable, flush }) => {
+          const expected = 'a-b';
+          const values = {
+            a: remoteDataMocks.SuccessStale,
+            b: remoteDataMocks.ErrorStale,
+          };
+
+          expectObservable((service as any).reRequestStaleRemoteData(true, callback)(cold(expected, values))).toBe(expected, values);
+          // since the callback happens in a tap(), flush to ensure it has been executed
+          flush();
+          expect(callback).toHaveBeenCalledTimes(2);
+        });
+      });
+
+      it(`should only call the callback for stale RemoteData objects if something is subscribed to it`, (done) => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          const expected = 'a';
+          const values = {
+            a: remoteDataMocks.SuccessStale,
+          };
+
+          const result$ = (service as any).reRequestStaleRemoteData(true, callback)(cold(expected, values));
+          expectObservable(result$).toBe(expected, values);
+          expect(callback).not.toHaveBeenCalled();
+          result$.subscribe(() => {
+            expect(callback).toHaveBeenCalled();
+            done();
+          });
+        });
+      });
+
+      it(`shouldn't do anything for RemoteData objects that aren't stale`, () => {
+        testScheduler.run(({ cold, expectObservable, flush }) => {
+          const expected = 'a-b-c-d';
+          const values = {
+            a: remoteDataMocks.RequestPending,
+            b: remoteDataMocks.ResponsePending,
+            c: remoteDataMocks.Success,
+            d: remoteDataMocks.Error,
+          };
+
+          expectObservable((service as any).reRequestStaleRemoteData(true, callback)(cold(expected, values))).toBe(expected, values);
+          // since the callback happens in a tap(), flush to ensure it has been executed
+          flush();
+          expect(callback).not.toHaveBeenCalled();
+        });
+      });
+    });
+
+  });
+
+  describe(`findByHref`, () => {
+    beforeEach(() => {
+      spyOn(service as any, 'createAndSendGetRequest').and.callFake((href$) => { href$.subscribe().unsubscribe(); });
+    });
+
+    it(`should call buildHrefFromFindOptions with href and linksToFollow`, () => {
+      testScheduler.run(({ cold }) => {
+        spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
+        spyOn(rdbService, 'buildSingle').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
+        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
+
+        service.findByHref(selfLink, true, true, ...linksToFollow);
+        expect(service.buildHrefFromFindOptions).toHaveBeenCalledWith(selfLink, {}, [], ...linksToFollow);
+      });
+    });
+
+    it(`should call createAndSendGetRequest with the result from buildHrefFromFindOptions and useCachedVersionIfAvailable`, () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service, 'buildHrefFromFindOptions').and.returnValue('bingo!');
+        spyOn(rdbService, 'buildSingle').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
+        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
+
+        service.findByHref(selfLink, true, true, ...linksToFollow);
+        expect((service as any).createAndSendGetRequest).toHaveBeenCalledWith(jasmine.anything(), true);
+        expectObservable(rdbService.buildSingle.calls.argsFor(0)[0]).toBe('(a|)', { a: 'bingo!' });
+
+        service.findByHref(selfLink, false, true, ...linksToFollow);
+        expect((service as any).createAndSendGetRequest).toHaveBeenCalledWith(jasmine.anything(), false);
+        expectObservable(rdbService.buildSingle.calls.argsFor(1)[0]).toBe('(a|)', { a: 'bingo!' });
+      });
+    });
+
+    it(`should call rdbService.buildSingle with the result from buildHrefFromFindOptions and linksToFollow`, () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service, 'buildHrefFromFindOptions').and.returnValue('bingo!');
+        spyOn(rdbService, 'buildSingle').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
+        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
+
+        service.findByHref(selfLink, true, true, ...linksToFollow);
+        expect(rdbService.buildSingle).toHaveBeenCalledWith(jasmine.anything() as any, ...linksToFollow);
+        expectObservable(rdbService.buildSingle.calls.argsFor(0)[0]).toBe('(a|)', { a: 'bingo!' });
+      });
+    });
+
+    it(`should return a the output from reRequestStaleRemoteData`, () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
+        spyOn(rdbService, 'buildSingle').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
+        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: 'bingo!' }));
+        const expected = 'a';
+        const values = {
+          a: 'bingo!',
+        };
+
+        expectObservable(service.findByHref(selfLink, true, true, ...linksToFollow)).toBe(expected, values);
+      });
+    });
+
+    it(`should call reRequestStaleRemoteData with reRequestOnStale and the exact same findByHref call as a callback`, () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
+        spyOn(rdbService, 'buildSingle').and.returnValue(cold('a', { a: remoteDataMocks.SuccessStale }));
+        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.SuccessStale }));
+
+        service.findByHref(selfLink, true, true, ...linksToFollow);
+        expect((service as any).reRequestStaleRemoteData.calls.argsFor(0)[0]).toBeTrue();
+        spyOn(service, 'findByHref').and.returnValue(cold('a', { a: remoteDataMocks.SuccessStale }));
+        // prove that the spy we just added hasn't been called yet
+        expect(service.findByHref).not.toHaveBeenCalled();
+        // call the callback passed to reRequestStaleRemoteData
+        (service as any).reRequestStaleRemoteData.calls.argsFor(0)[1]();
+        // verify that findByHref _has_ been called now, with the same params as the original call
+        expect(service.findByHref).toHaveBeenCalledWith(jasmine.anything(), true, true, ...linksToFollow);
+        // ... except for selflink, which will have been turned in to an observable.
+        expectObservable((service.findByHref as jasmine.Spy).calls.argsFor(0)[0]).toBe('(a|)', { a: selfLink });
+      });
+    });
+
+    describe(`when useCachedVersionIfAvailable is true`, () => {
+      beforeEach(() => {
+        spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
+        spyOn(service as any, 'reRequestStaleRemoteData').and.callFake(() => (source) => source);
+      });
+
+      it(`should emit a cached completed RemoteData immediately, and keep emitting if it gets rerequested`, () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.RequestPending,
+            c: remoteDataMocks.ResponsePending,
+            d: remoteDataMocks.Success,
+            e: remoteDataMocks.SuccessStale,
+          }));
+          const expected = 'a-b-c-d-e';
+          const values = {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.RequestPending,
+            c: remoteDataMocks.ResponsePending,
+            d: remoteDataMocks.Success,
+            e: remoteDataMocks.SuccessStale,
+          };
+
+          expectObservable(service.findByHref(selfLink, true, true, ...linksToFollow)).toBe(expected, values);
+        });
+      });
+
+      it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
+            a: remoteDataMocks.SuccessStale,
+            b: remoteDataMocks.RequestPending,
+            c: remoteDataMocks.ResponsePending,
+            d: remoteDataMocks.Success,
+            e: remoteDataMocks.SuccessStale,
+          }));
+          const expected = '--b-c-d-e';
+          const values = {
+            b: remoteDataMocks.RequestPending,
+            c: remoteDataMocks.ResponsePending,
+            d: remoteDataMocks.Success,
+            e: remoteDataMocks.SuccessStale,
+          };
+
+          expectObservable(service.findByHref(selfLink, true, true, ...linksToFollow)).toBe(expected, values);
+        });
+      });
+
+    });
+
+    describe(`when useCachedVersionIfAvailable is false`, () => {
+      beforeEach(() => {
+        spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
+        spyOn(service as any, 'reRequestStaleRemoteData').and.callFake(() => (source) => source);
+      });
+
+
+      it(`should not emit a cached completed RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.RequestPending,
+            c: remoteDataMocks.ResponsePending,
+            d: remoteDataMocks.Success,
+            e: remoteDataMocks.SuccessStale,
+          }));
+          const expected = '--b-c-d-e';
+          const values = {
+            b: remoteDataMocks.RequestPending,
+            c: remoteDataMocks.ResponsePending,
+            d: remoteDataMocks.Success,
+            e: remoteDataMocks.SuccessStale,
+          };
+
+          expectObservable(service.findByHref(selfLink, false, true, ...linksToFollow)).toBe(expected, values);
+        });
+      });
+
+      it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
+            a: remoteDataMocks.SuccessStale,
+            b: remoteDataMocks.RequestPending,
+            c: remoteDataMocks.ResponsePending,
+            d: remoteDataMocks.Success,
+            e: remoteDataMocks.SuccessStale,
+          }));
+          const expected = '--b-c-d-e';
+          const values = {
+            b: remoteDataMocks.RequestPending,
+            c: remoteDataMocks.ResponsePending,
+            d: remoteDataMocks.Success,
+            e: remoteDataMocks.SuccessStale,
+          };
+
+          expectObservable(service.findByHref(selfLink, false, true, ...linksToFollow)).toBe(expected, values);
+        });
+      });
+
+    });
+
+  });
+
+  describe(`findAllByHref`, () => {
+    let findListOptions;
+    beforeEach(() => {
+      findListOptions = { currentPage: 5 };
+      spyOn(service as any, 'createAndSendGetRequest').and.callFake((href$) => { href$.subscribe().unsubscribe(); });
+    });
+
+    it(`should call buildHrefFromFindOptions with href and linksToFollow`, () => {
+      testScheduler.run(({ cold }) => {
+        spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
+        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
+        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
+
+        service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow);
+        expect(service.buildHrefFromFindOptions).toHaveBeenCalledWith(selfLink, findListOptions, [], ...linksToFollow);
+      });
+    });
+
+    it(`should call createAndSendGetRequest with the result from buildHrefFromFindOptions and useCachedVersionIfAvailable`, () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service, 'buildHrefFromFindOptions').and.returnValue('bingo!');
+        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
+        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
+
+        service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow);
+        expect((service as any).createAndSendGetRequest).toHaveBeenCalledWith(jasmine.anything(), true);
+        expectObservable(rdbService.buildList.calls.argsFor(0)[0]).toBe('(a|)', { a: 'bingo!' });
+
+        service.findAllByHref(selfLink, findListOptions, false, true, ...linksToFollow);
+        expect((service as any).createAndSendGetRequest).toHaveBeenCalledWith(jasmine.anything(), false);
+        expectObservable(rdbService.buildList.calls.argsFor(1)[0]).toBe('(a|)', { a: 'bingo!' });
+      });
+    });
+
+    it(`should call rdbService.buildList with the result from buildHrefFromFindOptions and linksToFollow`, () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service, 'buildHrefFromFindOptions').and.returnValue('bingo!');
+        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
+        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
+
+        service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow);
+        expect(rdbService.buildList).toHaveBeenCalledWith(jasmine.anything() as any, ...linksToFollow);
+        expectObservable(rdbService.buildList.calls.argsFor(0)[0]).toBe('(a|)', { a: 'bingo!' });
+      });
+    });
+
+    it(`should call reRequestStaleRemoteData with reRequestOnStale and the exact same findAllByHref call as a callback`, () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service, 'buildHrefFromFindOptions').and.returnValue('bingo!');
+        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.SuccessStale }));
+        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.SuccessStale }));
+
+        service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow);
+        expect((service as any).reRequestStaleRemoteData.calls.argsFor(0)[0]).toBeTrue();
+        spyOn(service, 'findAllByHref').and.returnValue(cold('a', { a: remoteDataMocks.SuccessStale }));
+        // prove that the spy we just added hasn't been called yet
+        expect(service.findAllByHref).not.toHaveBeenCalled();
+        // call the callback passed to reRequestStaleRemoteData
+        (service as any).reRequestStaleRemoteData.calls.argsFor(0)[1]();
+        // verify that findAllByHref _has_ been called now, with the same params as the original call
+        expect(service.findAllByHref).toHaveBeenCalledWith(jasmine.anything(), findListOptions, true, true, ...linksToFollow);
+        // ... except for selflink, which will have been turned in to an observable.
+        expectObservable((service.findAllByHref as jasmine.Spy).calls.argsFor(0)[0]).toBe('(a|)', { a: selfLink });
+      });
+    });
+
+    it(`should return a the output from reRequestStaleRemoteData`, () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
+        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
+        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: 'bingo!' }));
+        const expected = 'a';
+        const values = {
+          a: 'bingo!',
+        };
+
+        expectObservable(service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow)).toBe(expected, values);
+      });
+    });
+
+    describe(`when useCachedVersionIfAvailable is true`, () => {
+      beforeEach(() => {
+        spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
+        spyOn(service as any, 'reRequestStaleRemoteData').and.callFake(() => (source) => source);
+      });
+
+      it(`should emit a cached completed RemoteData immediately, and keep emitting if it gets rerequested`, () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.RequestPending,
+            c: remoteDataMocks.ResponsePending,
+            d: remoteDataMocks.Success,
+            e: remoteDataMocks.SuccessStale,
+          }));
+          const expected = 'a-b-c-d-e';
+          const values = {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.RequestPending,
+            c: remoteDataMocks.ResponsePending,
+            d: remoteDataMocks.Success,
+            e: remoteDataMocks.SuccessStale,
+          };
+
+          expectObservable(service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow)).toBe(expected, values);
+        });
+      });
+
+      it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
+            a: remoteDataMocks.SuccessStale,
+            b: remoteDataMocks.RequestPending,
+            c: remoteDataMocks.ResponsePending,
+            d: remoteDataMocks.Success,
+            e: remoteDataMocks.SuccessStale,
+          }));
+          const expected = '--b-c-d-e';
+          const values = {
+            b: remoteDataMocks.RequestPending,
+            c: remoteDataMocks.ResponsePending,
+            d: remoteDataMocks.Success,
+            e: remoteDataMocks.SuccessStale,
+          };
+
+          expectObservable(service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow)).toBe(expected, values);
+        });
+      });
+
+    });
+
+    describe(`when useCachedVersionIfAvailable is false`, () => {
+      beforeEach(() => {
+        spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
+        spyOn(service as any, 'reRequestStaleRemoteData').and.callFake(() => (source) => source);
+      });
+
+
+      it(`should not emit a cached completed RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.RequestPending,
+            c: remoteDataMocks.ResponsePending,
+            d: remoteDataMocks.Success,
+            e: remoteDataMocks.SuccessStale,
+          }));
+          const expected = '--b-c-d-e';
+          const values = {
+            b: remoteDataMocks.RequestPending,
+            c: remoteDataMocks.ResponsePending,
+            d: remoteDataMocks.Success,
+            e: remoteDataMocks.SuccessStale,
+          };
+
+          expectObservable(service.findAllByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
+        });
+      });
+
+      it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
+            a: remoteDataMocks.SuccessStale,
+            b: remoteDataMocks.RequestPending,
+            c: remoteDataMocks.ResponsePending,
+            d: remoteDataMocks.Success,
+            e: remoteDataMocks.SuccessStale,
+          }));
+          const expected = '--b-c-d-e';
+          const values = {
+            b: remoteDataMocks.RequestPending,
+            c: remoteDataMocks.ResponsePending,
+            d: remoteDataMocks.Success,
+            e: remoteDataMocks.SuccessStale,
+          };
+
+          expectObservable(service.findAllByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
+        });
+      });
+
+    });
+  });
+
+  describe('invalidateByHref', () => {
+    let getByHrefSpy: jasmine.Spy;
+
+    beforeEach(() => {
+      getByHrefSpy = spyOn(objectCache, 'getByHref').and.returnValue(observableOf({
+        requestUUIDs: ['request1', 'request2', 'request3']
+      }));
+
+    });
+
+    it('should call setStaleByUUID for every request associated with this DSO', (done) => {
+      service.invalidateByHref('some-href').subscribe((ok) => {
+        expect(ok).toBeTrue();
+        expect(getByHrefSpy).toHaveBeenCalledWith('some-href');
+        expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request1');
+        expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request2');
+        expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request3');
+        done();
+      });
+    });
+
+    it('should call setStaleByUUID even if not subscribing to returned Observable', fakeAsync(() => {
+      service.invalidateByHref('some-href');
+      tick();
+
+      expect(getByHrefSpy).toHaveBeenCalledWith('some-href');
+      expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request1');
+      expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request2');
+      expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request3');
+    }));
+
+    it('should return an Observable that only emits true once all requests are stale', () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        requestService.setStaleByUUID.and.callFake((uuid) => {
+          switch (uuid) {   // fake requests becoming stale at different times
+            case 'request1':
+              return cold('--(t|)', BOOLEAN);
+            case 'request2':
+              return cold('----(t|)', BOOLEAN);
+            case 'request3':
+              return cold('------(t|)', BOOLEAN);
+          }
+        });
+
+        const done$ = service.invalidateByHref('some-href');
+
+        // emit true as soon as the final request is stale
+        expectObservable(done$).toBe('------(t|)', BOOLEAN);
+      });
+    });
+
+    it('should only fire for the current state of the object (instead of tracking it)', () => {
+      testScheduler.run(({ cold, flush }) => {
+        getByHrefSpy.and.returnValue(cold('a---b---c---', {
+          a: { requestUUIDs: ['request1'] },  // this is the state at the moment we're invalidating the cache
+          b: { requestUUIDs: ['request2'] },  // we shouldn't keep tracking the state
+          c: { requestUUIDs: ['request3'] },  // because we may invalidate when we shouldn't
+        }));
+
+        service.invalidateByHref('some-href');
+        flush();
+
+        // requests from the first state are marked as stale
+        expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request1');
+
+        // request from subsequent states are ignored
+        expect(requestService.setStaleByUUID).not.toHaveBeenCalledWith('request2');
+        expect(requestService.setStaleByUUID).not.toHaveBeenCalledWith('request3');
+      });
+    });
+  });
+});
diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
new file mode 100644
index 0000000000..9679bddf1b
--- /dev/null
+++ b/src/app/core/data/base/base-data.service.ts
@@ -0,0 +1,373 @@
+/**
+ * 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 { AsyncSubject, from as observableFrom, Observable, of as observableOf } from 'rxjs';
+import { map, mergeMap, skipWhile, switchMap, take, tap, toArray } from 'rxjs/operators';
+import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { URLCombiner } from '../../url-combiner/url-combiner';
+import { RemoteData } from '../remote-data';
+import { GetRequest } from '../request.models';
+import { RequestService } from '../request.service';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { FindListOptions } from '../find-list-options.model';
+import { PaginatedList } from '../paginated-list.model';
+import { ObjectCacheEntry } from '../../cache/object-cache.reducer';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+
+/**
+ * Common functionality for data services.
+ * Specific functionality that not all services would need
+ * is implemented in "DataService feature" classes (e.g. {@link CreateData}
+ *
+ * All DataService (or DataService feature) classes must
+ *   - extend this class (or {@link IdentifiableDataService})
+ *   - implement any DataService features it requires in order to forward calls to it
+ *
+ * ```
+ * export class SomeDataService extends BaseDataService<Something> implements CreateData<Something>, SearchData<Something> {
+ *   private createData: CreateData<Something>;
+ *   private searchData: SearchDataData<Something>;
+ *
+ *   create(...) {
+ *     return this.createData.create(...);
+ *   }
+ *
+ *   searchBy(...) {
+ *     return this.searchData.searchBy(...);
+ *   }
+ * }
+ * ```
+ */
+export class BaseDataService<T extends CacheableObject> {
+  constructor(
+    protected linkPath: string,
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected responseMsToLive?: number,
+  ) {
+  }
+
+  /**
+   * Allows subclasses to reset the response cache time.
+   */
+
+  /**
+   * 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);
+  }
+
+  /**
+   * 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;
+  }
+
+  /**
+   * 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 an Observable of a {@link RemoteData} of a {@link PaginatedList} 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 list we want to retrieve. Can be a string or an Observable<string>
+   * @param options
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's no valid cached version.
+   * @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>, options: 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, options, [], ...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$, options, 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 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;
+  }
+
+  /**
+   * Invalidate a cached object by its href
+   * @param href  the href to invalidate
+   */
+  public invalidateByHref(href: string): Observable<boolean> {
+    const done$ = new AsyncSubject<boolean>();
+
+    this.objectCache.getByHref(href).pipe(
+      take(1),
+      switchMap((oce: ObjectCacheEntry) => observableFrom(oce.requestUUIDs).pipe(
+        mergeMap((requestUUID: string) => this.requestService.setStaleByUUID(requestUUID)),
+        toArray(),
+      )),
+    ).subscribe(() => {
+      done$.next(true);
+      done$.complete();
+    });
+
+    return done$;
+  }
+}
diff --git a/src/app/core/data/base/create-data.spec.ts b/src/app/core/data/base/create-data.spec.ts
new file mode 100644
index 0000000000..ceefd3c51d
--- /dev/null
+++ b/src/app/core/data/base/create-data.spec.ts
@@ -0,0 +1,112 @@
+/**
+ * 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 { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { FindListOptions } from '../find-list-options.model';
+import { Observable, of as observableOf } from 'rxjs';
+import { CreateDataImpl } from './create-data';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { TestScheduler } from 'rxjs/testing';
+import { RemoteData } from '../remote-data';
+import { RequestEntryState } from '../request-entry-state.model';
+
+const endpoint = 'https://rest.api/core';
+
+class TestService extends CreateDataImpl<any> {
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super(undefined, requestService, rdbService, objectCache, halService, notificationsService, undefined);
+  }
+
+  public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+    return observableOf(endpoint);
+  }
+}
+
+describe('CreateDataImpl', () => {
+  let service: TestService;
+  let requestService;
+  let halService;
+  let rdbService;
+  let objectCache;
+  let notificationsService;
+  let selfLink;
+  let linksToFollow;
+  let testScheduler;
+  let remoteDataMocks;
+
+  function initTestService(): TestService {
+    requestService = getMockRequestService();
+    halService = new HALEndpointServiceStub('url') as any;
+    rdbService = getMockRemoteDataBuildService();
+    objectCache = {
+
+      addPatch: () => {
+        /* empty */
+      },
+      getObjectBySelfLink: () => {
+        /* empty */
+      },
+      getByHref: () => {
+        /* empty */
+      },
+    } as any;
+    notificationsService = {} as NotificationsService;
+    selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
+    linksToFollow = [
+      followLink('a'),
+      followLink('b'),
+    ];
+
+    testScheduler = new TestScheduler((actual, expected) => {
+      // asserting the two objects are equal
+      // e.g. using chai.
+      expect(actual).toEqual(expected);
+    });
+
+    const timeStamp = new Date().getTime();
+    const msToLive = 15 * 60 * 1000;
+    const payload = { foo: 'bar' };
+    const statusCodeSuccess = 200;
+    const statusCodeError = 404;
+    const errorMessage = 'not found';
+    remoteDataMocks = {
+      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
+      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
+      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+    };
+
+    return new TestService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      notificationsService,
+    );
+  }
+
+  beforeEach(() => {
+    service = initTestService();
+  });
+
+  // todo: add specs (there were no ceate specs in original DataService suite!)
+});
diff --git a/src/app/core/data/base/create-data.ts b/src/app/core/data/base/create-data.ts
new file mode 100644
index 0000000000..3ffcd9adf2
--- /dev/null
+++ b/src/app/core/data/base/create-data.ts
@@ -0,0 +1,107 @@
+/**
+ * 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 { CacheableObject } from '../../cache/cacheable-object.model';
+import { BaseDataService } from './base-data.service';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { Observable } from 'rxjs';
+import { RemoteData } from '../remote-data';
+import { hasValue, isNotEmptyOperator } from '../../../shared/empty.util';
+import { distinctUntilChanged, map, take, takeWhile } from 'rxjs/operators';
+import { DSpaceSerializer } from '../../dspace-rest/dspace.serializer';
+import { getClassForType } from '../../cache/builders/build-decorators';
+import { CreateRequest } from '../request.models';
+import { NotificationOptions } from '../../../shared/notifications/models/notification-options.model';
+import { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+
+/**
+ * Interface for a data service that can create objects.
+ */
+export interface CreateData<T extends CacheableObject> {
+  /**
+   * Create a new DSpaceObject on the server, and store the response
+   * in the object cache
+   *
+   * @param object  The object to create
+   * @param params  Array with additional params to combine with query string
+   */
+  create(object: T, ...params: RequestParam[]): Observable<RemoteData<T>>;
+}
+
+/**
+ * A DataService feature to create objects.
+ *
+ * Concrete data services can use this feature by implementing {@link CreateData}
+ * and delegating its method to an inner instance of this class.
+ */
+export class CreateDataImpl<T extends CacheableObject> extends BaseDataService<T> implements CreateData<T> {
+  constructor(
+    protected linkPath: string,
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected responseMsToLive: number,
+  ) {
+    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive);
+  }
+
+  /**
+   * Create a new object on the server, and store the response in the object cache
+   *
+   * @param object    The object to create
+   * @param params    Array with additional params to combine with query string
+   */
+  create(object: T, ...params: RequestParam[]): Observable<RemoteData<T>> {
+    const endpoint$ = this.getEndpoint().pipe(
+      isNotEmptyOperator(),
+      distinctUntilChanged(),
+      map((endpoint: string) => this.buildHrefWithParams(endpoint, params)),
+    );
+    return this.createOnEndpoint(object, endpoint$);
+  }
+
+  /**
+   * Send a POST request to create a new resource to a specific endpoint.
+   * Use this method if the endpoint needs to be adjusted. In most cases {@link create} should be sufficient.
+   * @param object     the object to create
+   * @param endpoint$  the endpoint to send the POST request to
+   */
+  createOnEndpoint(object: T, endpoint$: Observable<string>): Observable<RemoteData<T>> {
+    const requestId = this.requestService.generateRequestId();
+    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$;
+  }
+}
diff --git a/src/app/core/data/base/delete-data.spec.ts b/src/app/core/data/base/delete-data.spec.ts
new file mode 100644
index 0000000000..4c4a2ded6d
--- /dev/null
+++ b/src/app/core/data/base/delete-data.spec.ts
@@ -0,0 +1,208 @@
+/**
+ * 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 { constructIdEndpointDefault } from './identifiable-data.service';
+import { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { FindListOptions } from '../find-list-options.model';
+import { Observable, of as observableOf } from 'rxjs';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { TestScheduler } from 'rxjs/testing';
+import { RemoteData } from '../remote-data';
+import { RequestEntryState } from '../request-entry-state.model';
+import { 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';
+
+const endpoint = 'https://rest.api/core';
+
+const BOOLEAN = { f: false, t: true };
+
+class TestService extends DeleteDataImpl<any> {
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super(undefined, requestService, rdbService, objectCache, halService, notificationsService, undefined, constructIdEndpointDefault);
+  }
+
+  public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+    return observableOf(endpoint);
+  }
+}
+
+describe('DeleteDataImpl', () => {
+  let service: TestService;
+  let requestService;
+  let halService;
+  let rdbService;
+  let objectCache;
+  let notificationsService;
+  let selfLink;
+  let linksToFollow;
+  let testScheduler;
+  let remoteDataMocks;
+
+  function initTestService(): TestService {
+    requestService = getMockRequestService();
+    halService = new HALEndpointServiceStub('url') as any;
+    rdbService = getMockRemoteDataBuildService();
+    objectCache = {
+
+      addPatch: () => {
+        /* empty */
+      },
+      getObjectBySelfLink: () => {
+        /* empty */
+      },
+      getByHref: () => {
+        /* empty */
+      }
+    } as any;
+    notificationsService = {} as NotificationsService;
+    selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
+    linksToFollow = [
+      followLink('a'),
+      followLink('b')
+    ];
+
+    testScheduler = new TestScheduler((actual, expected) => {
+      // asserting the two objects are equal
+      // e.g. using chai.
+      expect(actual).toEqual(expected);
+    });
+
+    const timeStamp = new Date().getTime();
+    const msToLive = 15 * 60 * 1000;
+    const payload = { foo: 'bar' };
+    const statusCodeSuccess = 200;
+    const statusCodeError = 404;
+    const errorMessage = 'not found';
+    remoteDataMocks = {
+      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
+      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
+      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+    };
+
+    return new TestService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      notificationsService,
+    );
+  }
+
+  beforeEach(() => {
+    service = initTestService();
+  });
+
+  describe('delete', () => {
+    let MOCK_SUCCEEDED_RD;
+    let MOCK_FAILED_RD;
+
+    let invalidateByHrefSpy: jasmine.Spy;
+    let buildFromRequestUUIDSpy: 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();
+      getIDHrefObsSpy = spyOn(service, 'getIDHrefObs').and.callThrough();
+      deleteByHrefSpy = spyOn(service, 'deleteByHref').and.callThrough();
+
+      MOCK_SUCCEEDED_RD = createSuccessfulRemoteDataObject({});
+      MOCK_FAILED_RD = createFailedRemoteDataObject('something went wrong');
+    });
+
+    it('should retrieve href by ID and call deleteByHref', () => {
+      getIDHrefObsSpy.and.returnValue(observableOf('some-href'));
+      buildFromRequestUUIDSpy.and.returnValue(createSuccessfulRemoteDataObject$({}));
+
+      service.delete('some-id', ['a', 'b', 'c']).subscribe(rd => {
+        expect(getIDHrefObsSpy).toHaveBeenCalledWith('some-id');
+        expect(deleteByHrefSpy).toHaveBeenCalledWith('some-href', ['a', 'b', 'c']);
+      });
+    });
+
+    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();
+        });
+      });
+
+      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
new file mode 100644
index 0000000000..2e34f0957c
--- /dev/null
+++ b/src/app/core/data/base/delete-data.ts
@@ -0,0 +1,108 @@
+/**
+ * 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 { CacheableObject } from '../../cache/cacheable-object.model';
+import { AsyncSubject, combineLatest, Observable } from 'rxjs';
+import { RemoteData } from '../remote-data';
+import { NoContent } from '../../shared/NoContent.model';
+import { filter, map, 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';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { ConstructIdEndpoint, IdentifiableDataService } from './identifiable-data.service';
+
+export interface DeleteData<T extends CacheableObject> {
+  /**
+   * Delete an existing 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>>;
+
+  /**
+   * Delete an existing 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>>;
+}
+
+export class DeleteDataImpl<T extends CacheableObject> extends IdentifiableDataService<T> implements DeleteData<T> {
+  constructor(
+    protected linkPath: string,
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected responseMsToLive: number,
+    protected constructIdEndpoint: ConstructIdEndpoint,
+  ) {
+    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive, constructIdEndpoint);
+    if (hasNoValue(constructIdEndpoint)) {
+      throw new Error(`DeleteDataImpl initialized without a constructIdEndpoint method (linkPath: ${linkPath})`);
+    }
+  }
+
+  delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.getIDHrefObs(objectId).pipe(
+      switchMap((href: string) => this.deleteByHref(href, copyVirtualMetadata)),
+    );
+  }
+
+  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),
+    );
+  }
+}
diff --git a/src/app/core/data/base/find-all-data.spec.ts b/src/app/core/data/base/find-all-data.spec.ts
new file mode 100644
index 0000000000..3caa8990f6
--- /dev/null
+++ b/src/app/core/data/base/find-all-data.spec.ts
@@ -0,0 +1,306 @@
+/**
+ * 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 { FindAllData, FindAllDataImpl } from './find-all-data';
+import createSpyObj = jasmine.createSpyObj;
+import { FindListOptions } from '../find-list-options.model';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { TestScheduler } from 'rxjs/testing';
+import { RemoteData } from '../remote-data';
+import { RequestEntryState } from '../request-entry-state.model';
+import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
+import { RequestParam } from '../../cache/models/request-param.model';
+
+import { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { Observable, of as observableOf } from 'rxjs';
+
+/**
+ * Tests whether calls to `FindAllData` methods are correctly patched through in a concrete data service that implements it
+ */
+export function testFindAllDataImplementation(service: FindAllData<any>, methods = ['findAll', 'getFindAllHref']) {
+  describe('FindAllData implementation', () => {
+    const OPTIONS = Object.assign(new FindListOptions(), { elementsPerPage: 10, currentPage: 3 });
+    const FOLLOWLINKS = [
+      followLink('test'),
+      followLink('something'),
+    ];
+
+    beforeEach(() => {
+      (service as any).findAllData = createSpyObj('findAllData', {
+        findAll: 'TEST findAll',
+        getFindAllHref: 'TEST getFindAllHref',
+      });
+    });
+
+    if ('findAll' in methods) {
+      it('should handle calls to findAll', () => {
+        const out: any = service.findAll(OPTIONS, false, true, ...FOLLOWLINKS);
+
+        expect((service as any).findAllData.findAll).toHaveBeenCalledWith(OPTIONS, false, true, ...FOLLOWLINKS);
+        expect(out).toBe('TEST findAll');
+      });
+    }
+
+    if ('getFindAllHref' in methods) {
+      it('should handle calls to getFindAllHref', () => {
+        const out: any = service.getFindAllHref(OPTIONS, 'linkPath', ...FOLLOWLINKS);
+
+        expect((service as any).findAllData.getFindAllHref).toHaveBeenCalledWith(OPTIONS, 'linkPath', ...FOLLOWLINKS);
+        expect(out).toBe('TEST getFindAllHref');
+      });
+    }
+  });
+}
+
+const endpoint = 'https://rest.api/core';
+
+class TestService extends FindAllDataImpl<any> {
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super(undefined, requestService, rdbService, objectCache, halService, undefined);
+  }
+
+  public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+    return observableOf(endpoint);
+  }
+}
+
+describe('FindAllDataImpl', () => {
+  let service: TestService;
+  let options: FindListOptions;
+  let requestService;
+  let halService;
+  let rdbService;
+  let objectCache;
+  let selfLink;
+  let linksToFollow;
+  let testScheduler;
+  let remoteDataMocks;
+
+  function initTestService(): TestService {
+    requestService = getMockRequestService();
+    halService = new HALEndpointServiceStub('url') as any;
+    rdbService = getMockRemoteDataBuildService();
+    objectCache = {
+
+      addPatch: () => {
+        /* empty */
+      },
+      getObjectBySelfLink: () => {
+        /* empty */
+      },
+      getByHref: () => {
+        /* empty */
+      },
+    } as any;
+    selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
+    linksToFollow = [
+      followLink('a'),
+      followLink('b'),
+    ];
+
+    testScheduler = new TestScheduler((actual, expected) => {
+      // asserting the two objects are equal
+      // e.g. using chai.
+      expect(actual).toEqual(expected);
+    });
+
+    const timeStamp = new Date().getTime();
+    const msToLive = 15 * 60 * 1000;
+    const payload = { foo: 'bar' };
+    const statusCodeSuccess = 200;
+    const statusCodeError = 404;
+    const errorMessage = 'not found';
+    remoteDataMocks = {
+      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
+      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
+      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+    };
+
+    return new TestService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+    );
+  }
+
+  beforeEach(() => {
+    service = initTestService();
+  });
+
+  describe('getFindAllHref', () => {
+
+    it('should return an observable with the endpoint', () => {
+      options = {};
+
+      (service as any).getFindAllHref(options).subscribe((value) => {
+          expect(value).toBe(endpoint);
+        },
+      );
+    });
+
+    it('should include page in href if currentPage provided in options', () => {
+      options = { currentPage: 2 };
+      const expected = `${endpoint}?page=${options.currentPage - 1}`;
+
+      (service as any).getFindAllHref(options).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should include size in href if elementsPerPage provided in options', () => {
+      options = { elementsPerPage: 5 };
+      const expected = `${endpoint}?size=${options.elementsPerPage}`;
+
+      (service as any).getFindAllHref(options).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should include sort href if SortOptions provided in options', () => {
+      const sortOptions = new SortOptions('field1', SortDirection.ASC);
+      options = { sort: sortOptions };
+      const expected = `${endpoint}?sort=${sortOptions.field},${sortOptions.direction}`;
+
+      (service as any).getFindAllHref(options).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should include startsWith in href if startsWith provided in options', () => {
+      options = { startsWith: 'ab' };
+      const expected = `${endpoint}?startsWith=${options.startsWith}`;
+
+      (service as any).getFindAllHref(options).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should include all provided options in href', () => {
+      const sortOptions = new SortOptions('field1', SortDirection.DESC);
+      options = {
+        currentPage: 6,
+        elementsPerPage: 10,
+        sort: sortOptions,
+        startsWith: 'ab',
+
+      };
+      const expected = `${endpoint}?page=${options.currentPage - 1}&size=${options.elementsPerPage}` +
+        `&sort=${sortOptions.field},${sortOptions.direction}&startsWith=${options.startsWith}`;
+
+      (service as any).getFindAllHref(options).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should include all searchParams in href if any provided in options', () => {
+      options = {
+        searchParams: [
+          new RequestParam('param1', 'test'),
+          new RequestParam('param2', 'test2'),
+        ],
+      };
+      const expected = `${endpoint}?param1=test&param2=test2`;
+
+      (service as any).getFindAllHref(options).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should include linkPath in href if any provided', () => {
+      const expected = `${endpoint}/test/entries`;
+
+      (service as any).getFindAllHref({}, 'test/entries').subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should include single linksToFollow as embed', () => {
+      const expected = `${endpoint}?embed=bundles`;
+
+      (service as any).getFindAllHref({}, null, followLink('bundles')).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should include single linksToFollow as embed and its size', () => {
+      const expected = `${endpoint}?embed.size=bundles=5&embed=bundles`;
+      const config: FindListOptions = Object.assign(new FindListOptions(), {
+        elementsPerPage: 5,
+      });
+      (service as any).getFindAllHref({}, null, followLink('bundles', { findListOptions: config })).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should include multiple linksToFollow as embed', () => {
+      const expected = `${endpoint}?embed=bundles&embed=owningCollection&embed=templateItemOf`;
+
+      (service as any).getFindAllHref({}, null, followLink('bundles'), followLink('owningCollection'), followLink('templateItemOf')).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should include multiple linksToFollow as embed and its sizes if given', () => {
+      const expected = `${endpoint}?embed=bundles&embed.size=owningCollection=2&embed=owningCollection&embed=templateItemOf`;
+
+      const config: FindListOptions = Object.assign(new FindListOptions(), {
+        elementsPerPage: 2,
+      });
+
+      (service as any).getFindAllHref({}, null, followLink('bundles'), followLink('owningCollection', { findListOptions: config }), followLink('templateItemOf')).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should not include linksToFollow with shouldEmbed = false', () => {
+      const expected = `${endpoint}?embed=templateItemOf`;
+
+      (service as any).getFindAllHref(
+        {},
+        null,
+        followLink('bundles', { shouldEmbed: false }),
+        followLink('owningCollection', { shouldEmbed: false }),
+        followLink('templateItemOf'),
+      ).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should include nested linksToFollow 3lvl', () => {
+      const expected = `${endpoint}?embed=owningCollection/itemtemplate/relationships`;
+
+      (service as any).getFindAllHref({}, null, followLink('owningCollection', {}, followLink('itemtemplate', {}, followLink('relationships')))).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should include nested linksToFollow 2lvl and nested embed\'s size', () => {
+      const expected = `${endpoint}?embed.size=owningCollection/itemtemplate=4&embed=owningCollection/itemtemplate`;
+      const config: FindListOptions = Object.assign(new FindListOptions(), {
+        elementsPerPage: 4,
+      });
+      (service as any).getFindAllHref({}, null, followLink('owningCollection', {}, followLink('itemtemplate', { findListOptions: config }))).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+  });
+});
diff --git a/src/app/core/data/base/find-all-data.ts b/src/app/core/data/base/find-all-data.ts
new file mode 100644
index 0000000000..f3666b75ee
--- /dev/null
+++ b/src/app/core/data/base/find-all-data.ts
@@ -0,0 +1,112 @@
+/**
+ * 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 { Observable } from 'rxjs';
+import { FindListOptions } from '../find-list-options.model';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { RemoteData } from '../remote-data';
+import { PaginatedList } from '../paginated-list.model';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { BaseDataService } from './base-data.service';
+import { distinctUntilChanged, filter, map } from 'rxjs/operators';
+import { isNotEmpty } from '../../../shared/empty.util';
+import { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+
+/**
+ * Interface for a data service that list all of its objects.
+ */
+export interface FindAllData<T extends CacheableObject> {
+  /**
+   * 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?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>>;
+
+  /**
+   * 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
+   */
+  getFindAllHref?(options: FindListOptions, linkPath?: string, ...linksToFollow: FollowLinkConfig<T>[]): Observable<string>;
+}
+
+/**
+ * A DataService feature to list all objects.
+ *
+ * Concrete data services can use this feature by implementing {@link FindAllData}
+ * and delegating its method to an inner instance of this class.
+ */
+export class FindAllDataImpl<T extends CacheableObject> extends BaseDataService<T> implements FindAllData<T> {
+  constructor(
+    protected linkPath: string,
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected responseMsToLive: number,
+  ) {
+    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive);
+  }
+
+  /**
+   * 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 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
+   */
+  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)));
+  }
+}
diff --git a/src/app/core/data/base/identifiable-data.service.spec.ts b/src/app/core/data/base/identifiable-data.service.spec.ts
new file mode 100644
index 0000000000..d08f1141fc
--- /dev/null
+++ b/src/app/core/data/base/identifiable-data.service.spec.ts
@@ -0,0 +1,145 @@
+/**
+ * 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 { FindListOptions } from '../find-list-options.model';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { TestScheduler } from 'rxjs/testing';
+import { RemoteData } from '../remote-data';
+import { RequestEntryState } from '../request-entry-state.model';
+import { Observable, of as observableOf } from 'rxjs';
+import { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { IdentifiableDataService } from './identifiable-data.service';
+
+const endpoint = 'https://rest.api/core';
+
+class TestService extends IdentifiableDataService<any> {
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super(undefined, requestService, rdbService, objectCache, halService);
+  }
+
+  public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+    return observableOf(endpoint);
+  }
+}
+
+describe('IdentifiableDataService', () => {
+  let service: TestService;
+  let requestService;
+  let halService;
+  let rdbService;
+  let objectCache;
+  let selfLink;
+  let linksToFollow;
+  let testScheduler;
+  let remoteDataMocks;
+
+  function initTestService(): TestService {
+    requestService = getMockRequestService();
+    halService = new HALEndpointServiceStub('url') as any;
+    rdbService = getMockRemoteDataBuildService();
+    objectCache = {
+
+      addPatch: () => {
+        /* empty */
+      },
+      getObjectBySelfLink: () => {
+        /* empty */
+      },
+      getByHref: () => {
+        /* empty */
+      }
+    } as any;
+    selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
+    linksToFollow = [
+      followLink('a'),
+      followLink('b')
+    ];
+
+    testScheduler = new TestScheduler((actual, expected) => {
+      // asserting the two objects are equal
+      // e.g. using chai.
+      expect(actual).toEqual(expected);
+    });
+
+    const timeStamp = new Date().getTime();
+    const msToLive = 15 * 60 * 1000;
+    const payload = { foo: 'bar' };
+    const statusCodeSuccess = 200;
+    const statusCodeError = 404;
+    const errorMessage = 'not found';
+    remoteDataMocks = {
+      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
+      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
+      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+    };
+
+    return new TestService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+    );
+  }
+
+  beforeEach(() => {
+    service = initTestService();
+  });
+
+  describe('getIDHref', () => {
+    const endpointMock = 'https://dspace7-internal.atmire.com/server/api/core/items';
+    const resourceIdMock = '003c99b4-d4fe-44b0-a945-e12182a7ca89';
+
+    it('should return endpoint', () => {
+      const result = (service as any).getIDHref(endpointMock, resourceIdMock);
+      expect(result).toEqual(endpointMock + '/' + resourceIdMock);
+    });
+
+    it('should include single linksToFollow as embed', () => {
+      const expected = `${endpointMock}/${resourceIdMock}?embed=bundles`;
+      const result = (service as any).getIDHref(endpointMock, resourceIdMock, followLink('bundles'));
+      expect(result).toEqual(expected);
+    });
+
+    it('should include multiple linksToFollow as embed', () => {
+      const expected = `${endpointMock}/${resourceIdMock}?embed=bundles&embed=owningCollection&embed=templateItemOf`;
+      const result = (service as any).getIDHref(endpointMock, resourceIdMock, followLink('bundles'), followLink('owningCollection'), followLink('templateItemOf'));
+      expect(result).toEqual(expected);
+    });
+
+    it('should not include linksToFollow with shouldEmbed = false', () => {
+      const expected = `${endpointMock}/${resourceIdMock}?embed=templateItemOf`;
+      const result = (service as any).getIDHref(
+        endpointMock,
+        resourceIdMock,
+        followLink('bundles', { shouldEmbed: false }),
+        followLink('owningCollection', { shouldEmbed: false }),
+        followLink('templateItemOf')
+      );
+      expect(result).toEqual(expected);
+    });
+
+    it('should include nested linksToFollow 3lvl', () => {
+      const expected = `${endpointMock}/${resourceIdMock}?embed=owningCollection/itemtemplate/relationships`;
+      const result = (service as any).getIDHref(endpointMock, resourceIdMock, followLink('owningCollection', {}, followLink('itemtemplate', {}, followLink('relationships'))));
+      expect(result).toEqual(expected);
+    });
+  });
+});
diff --git a/src/app/core/data/base/identifiable-data.service.ts b/src/app/core/data/base/identifiable-data.service.ts
new file mode 100644
index 0000000000..904f925765
--- /dev/null
+++ b/src/app/core/data/base/identifiable-data.service.ts
@@ -0,0 +1,83 @@
+/**
+ * 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 { CacheableObject } from '../../cache/cacheable-object.model';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { RemoteData } from '../remote-data';
+import { BaseDataService } from './base-data.service';
+import { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+
+/**
+ * Shorthand type for the method to construct an ID endpoint.
+ */
+export type ConstructIdEndpoint = (endpoint: string, resourceID: string) => string;
+
+/**
+ * The default method to construct an ID endpoint
+ */
+export const constructIdEndpointDefault = (endpoint, resourceID) => `${endpoint}/${resourceID}`;
+
+/**
+ * A type of data service that deals with objects that have an ID.
+ *
+ * The effective endpoint to use for the ID can be adjusted by providing a different {@link ConstructIdEndpoint} method.
+ * This method is passed as an argument so that it can be set on data service features without having to override them.
+ */
+export class IdentifiableDataService<T extends CacheableObject> extends BaseDataService<T> {
+  constructor(
+    protected linkPath: string,
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected responseMsToLive?: number,
+    protected constructIdEndpoint: ConstructIdEndpoint = constructIdEndpointDefault,
+  ) {
+    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive);
+  }
+
+  /**
+   * 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);
+  }
+
+  /**
+   * 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(this.constructIdEndpoint(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)));
+  }
+}
diff --git a/src/app/core/data/base/patch-data.spec.ts b/src/app/core/data/base/patch-data.spec.ts
new file mode 100644
index 0000000000..601188ae7d
--- /dev/null
+++ b/src/app/core/data/base/patch-data.spec.ts
@@ -0,0 +1,180 @@
+/**
+ * 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/
+ */
+/* eslint-disable max-classes-per-file */
+import { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { FindListOptions } from '../find-list-options.model';
+import { Observable, of as observableOf } from 'rxjs';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { TestScheduler } from 'rxjs/testing';
+import { RemoteData } from '../remote-data';
+import { RequestEntryState } from '../request-entry-state.model';
+import { PatchDataImpl } from './patch-data';
+import { ChangeAnalyzer } from '../change-analyzer';
+import { Item } from '../../shared/item.model';
+import { compare, Operation } from 'fast-json-patch';
+import { PatchRequest } from '../request.models';
+import { DSpaceObject } from '../../shared/dspace-object.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { constructIdEndpointDefault } from './identifiable-data.service';
+
+const endpoint = 'https://rest.api/core';
+
+class TestService extends PatchDataImpl<any> {
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected comparator: ChangeAnalyzer<Item>,
+  ) {
+    super(undefined, requestService, rdbService, objectCache, halService, comparator, undefined, constructIdEndpointDefault);
+  }
+
+  public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+    return observableOf(endpoint);
+  }
+}
+
+class DummyChangeAnalyzer implements ChangeAnalyzer<Item> {
+  diff(object1: Item, object2: Item): Operation[] {
+    return compare((object1 as any).metadata, (object2 as any).metadata);
+  }
+}
+
+describe('PatchDataImpl', () => {
+  let service: TestService;
+  let requestService;
+  let halService;
+  let rdbService;
+  let comparator;
+  let objectCache;
+  let selfLink;
+  let linksToFollow;
+  let testScheduler;
+  let remoteDataMocks;
+
+  function initTestService(): TestService {
+    requestService = getMockRequestService();
+    halService = new HALEndpointServiceStub('url') as any;
+    rdbService = getMockRemoteDataBuildService();
+    comparator = new DummyChangeAnalyzer() as any;
+    objectCache = {
+
+      addPatch: () => {
+        /* empty */
+      },
+      getObjectBySelfLink: () => {
+        /* empty */
+      },
+      getByHref: () => {
+        /* empty */
+      },
+    } as any;
+    selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
+    linksToFollow = [
+      followLink('a'),
+      followLink('b'),
+    ];
+
+    testScheduler = new TestScheduler((actual, expected) => {
+      // asserting the two objects are equal
+      // e.g. using chai.
+      expect(actual).toEqual(expected);
+    });
+
+    const timeStamp = new Date().getTime();
+    const msToLive = 15 * 60 * 1000;
+    const payload = { foo: 'bar' };
+    const statusCodeSuccess = 200;
+    const statusCodeError = 404;
+    const errorMessage = 'not found';
+    remoteDataMocks = {
+      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
+      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
+      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+    };
+
+    return new TestService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      comparator,
+    );
+  }
+
+  beforeEach(() => {
+    service = initTestService();
+  });
+
+  describe('patch', () => {
+    const dso = {
+      uuid: 'dso-uuid'
+    };
+    const operations = [
+      Object.assign({
+        op: 'move',
+        from: '/1',
+        path: '/5'
+      }) as Operation
+    ];
+
+    beforeEach((done) => {
+      service.patch(dso, operations).subscribe(() => {
+        done();
+      });
+    });
+
+    it('should send a PatchRequest', () => {
+      expect(requestService.send).toHaveBeenCalledWith(jasmine.any(PatchRequest));
+    });
+  });
+
+  describe('update', () => {
+    let operations;
+    let dso;
+    let dso2;
+    const name1 = 'random string';
+    const name2 = 'another random string';
+    beforeEach(() => {
+      operations = [{ op: 'replace', path: '/0/value', value: name2 } as Operation];
+
+      dso = Object.assign(new DSpaceObject(), {
+        _links: { self: { href: selfLink } },
+        metadata: [{ key: 'dc.title', value: name1 }]
+      });
+
+      dso2 = Object.assign(new DSpaceObject(), {
+        _links: { self: { href: selfLink } },
+        metadata: [{ key: 'dc.title', value: name2 }]
+      });
+
+      spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(dso));
+      spyOn(objectCache, 'addPatch');
+    });
+
+    it('should call addPatch on the object cache with the right parameters when there are differences', () => {
+      service.update(dso2).subscribe();
+      expect(objectCache.addPatch).toHaveBeenCalledWith(selfLink, operations);
+    });
+
+    it('should not call addPatch on the object cache with the right parameters when there are no differences', () => {
+      service.update(dso).subscribe();
+      expect(objectCache.addPatch).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/app/core/data/base/patch-data.ts b/src/app/core/data/base/patch-data.ts
new file mode 100644
index 0000000000..558de928c4
--- /dev/null
+++ b/src/app/core/data/base/patch-data.ts
@@ -0,0 +1,143 @@
+/**
+ * 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 { CacheableObject } from '../../cache/cacheable-object.model';
+import { Operation } from 'fast-json-patch';
+import { Observable } from 'rxjs';
+import { RemoteData } from '../remote-data';
+import { find, map, mergeMap } from 'rxjs/operators';
+import { hasNoValue, hasValue, isNotEmpty } from '../../../shared/empty.util';
+import { PatchRequest } from '../request.models';
+import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../shared/operators';
+import { ChangeAnalyzer } from '../change-analyzer';
+import { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { RestRequestMethod } from '../rest-request-method';
+import { ConstructIdEndpoint, IdentifiableDataService } from './identifiable-data.service';
+
+
+/**
+ * Interface for a data service that can patch and update objects.
+ */
+export interface PatchData<T extends CacheableObject> {
+  /**
+   * 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>>;
+
+  /**
+   * 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>>;
+
+  /**
+   * Commit current object changes to the server
+   * @param method The RestRequestMethod for which de server sync buffer should be committed
+   */
+  commitUpdates(method?: RestRequestMethod): void;
+
+  /**
+   * Return a list of operations representing the difference between an object and its latest value in the cache.
+   * @param object  the object to resolve to a list of patch operations
+   */
+  createPatchFromCache?(object: T): Observable<Operation[]>;
+}
+
+/**
+ * A DataService feature to patch and update objects.
+ *
+ * Concrete data services can use this feature by implementing {@link PatchData}
+ * and delegating its method to an inner instance of this class.
+ *
+ * Note that this feature requires the object in question to have an ID.
+ * Make sure to use the same {@link ConstructIdEndpoint} as in the parent data service.
+ */
+export class PatchDataImpl<T extends CacheableObject> extends IdentifiableDataService<T> implements PatchData<T> {
+  constructor(
+    protected linkPath: string,
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected comparator: ChangeAnalyzer<T>,
+    protected responseMsToLive: number,
+    protected constructIdEndpoint: ConstructIdEndpoint,
+  ) {
+    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive, constructIdEndpoint);
+    if (hasNoValue(constructIdEndpoint)) {
+      throw new Error(`PatchDataImpl initialized without a constructIdEndpoint method (linkPath: ${linkPath})`);
+    }
+  }
+
+  /**
+   * 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);
+  }
+
+  /**
+   * 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);
+      }),
+    );
+  }
+
+  /**
+   * Commit current object changes to the server
+   * @param method The RestRequestMethod for which de server sync buffer should be committed
+   */
+  commitUpdates(method?: RestRequestMethod): void {
+    this.requestService.commit(method);
+  }
+
+  /**
+   * Return a list of operations representing the difference between an object and its latest value in the cache.
+   * @param object  the object to resolve to a list of patch operations
+   */
+  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)),
+    );
+  }
+}
diff --git a/src/app/core/data/base/put-data.spec.ts b/src/app/core/data/base/put-data.spec.ts
new file mode 100644
index 0000000000..01b5caea5b
--- /dev/null
+++ b/src/app/core/data/base/put-data.spec.ts
@@ -0,0 +1,108 @@
+/**
+ * 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 { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { FindListOptions } from '../find-list-options.model';
+import { Observable, of as observableOf } from 'rxjs';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { TestScheduler } from 'rxjs/testing';
+import { RemoteData } from '../remote-data';
+import { RequestEntryState } from '../request-entry-state.model';
+import { PutDataImpl } from './put-data';
+
+const endpoint = 'https://rest.api/core';
+
+class TestService extends PutDataImpl<any> {
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super(undefined, requestService, rdbService, objectCache, halService, undefined);
+  }
+
+  public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+    return observableOf(endpoint);
+  }
+}
+
+describe('PutDataImpl', () => {
+  let service: TestService;
+  let requestService;
+  let halService;
+  let rdbService;
+  let objectCache;
+  let selfLink;
+  let linksToFollow;
+  let testScheduler;
+  let remoteDataMocks;
+
+  function initTestService(): TestService {
+    requestService = getMockRequestService();
+    halService = new HALEndpointServiceStub('url') as any;
+    rdbService = getMockRemoteDataBuildService();
+    objectCache = {
+
+      addPatch: () => {
+        /* empty */
+      },
+      getObjectBySelfLink: () => {
+        /* empty */
+      },
+      getByHref: () => {
+        /* empty */
+      },
+    } as any;
+    selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
+    linksToFollow = [
+      followLink('a'),
+      followLink('b'),
+    ];
+
+    testScheduler = new TestScheduler((actual, expected) => {
+      // asserting the two objects are equal
+      // e.g. using chai.
+      expect(actual).toEqual(expected);
+    });
+
+    const timeStamp = new Date().getTime();
+    const msToLive = 15 * 60 * 1000;
+    const payload = { foo: 'bar' };
+    const statusCodeSuccess = 200;
+    const statusCodeError = 404;
+    const errorMessage = 'not found';
+    remoteDataMocks = {
+      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
+      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
+      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+    };
+
+    return new TestService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+    );
+  }
+
+  beforeEach(() => {
+    service = initTestService();
+  });
+
+  // todo: add specs (there were no put specs in original DataService suite!)
+});
diff --git a/src/app/core/data/base/put-data.ts b/src/app/core/data/base/put-data.ts
new file mode 100644
index 0000000000..bd2a8d2929
--- /dev/null
+++ b/src/app/core/data/base/put-data.ts
@@ -0,0 +1,69 @@
+/**
+ * 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 { CacheableObject } from '../../cache/cacheable-object.model';
+import { BaseDataService } from './base-data.service';
+import { Observable } from 'rxjs';
+import { RemoteData } from '../remote-data';
+import { DSpaceSerializer } from '../../dspace-rest/dspace.serializer';
+import { GenericConstructor } from '../../shared/generic-constructor';
+import { PutRequest } from '../request.models';
+import { hasValue } from '../../../shared/empty.util';
+import { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+
+/**
+ * Interface for a data service that can send PUT requests.
+ */
+export interface PutData<T extends CacheableObject> {
+  /**
+   * Send a PUT request for the specified object
+   *
+   * @param object The object to send a put request for.
+   */
+  put(object: T): Observable<RemoteData<T>>;
+}
+
+/**
+ * A DataService feature to send PUT requests.
+ *
+ * Concrete data services can use this feature by implementing {@link PutData}
+ * and delegating its method to an inner instance of this class.
+ */
+export class PutDataImpl<T extends CacheableObject> extends BaseDataService<T> implements PutData<T> {
+  constructor(
+    protected linkPath: string,
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected responseMsToLive: number,
+  ) {
+    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive);
+  }
+
+  /**
+   * 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);
+  }
+}
diff --git a/src/app/core/data/base/search-data.spec.ts b/src/app/core/data/base/search-data.spec.ts
new file mode 100644
index 0000000000..7abf26b5b8
--- /dev/null
+++ b/src/app/core/data/base/search-data.spec.ts
@@ -0,0 +1,146 @@
+/**
+ * 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 { SearchData, SearchDataImpl } from './search-data';
+import createSpyObj = jasmine.createSpyObj;
+import { FindListOptions } from '../find-list-options.model';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { Observable, of as observableOf } from 'rxjs';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { TestScheduler } from 'rxjs/testing';
+import { RemoteData } from '../remote-data';
+import { RequestEntryState } from '../request-entry-state.model';
+
+/**
+ * Tests whether calls to `SearchData` methods are correctly patched through in a concrete data service that implements it
+ */
+export function testSearchDataImplementation(service: SearchData<any>, methods = ['searchBy', 'getSearchByHref']) {
+  describe('SearchData implementation', () => {
+    const OPTIONS = Object.assign(new FindListOptions(), { elementsPerPage: 10, currentPage: 3 });
+    const FOLLOWLINKS = [
+      followLink('test'),
+      followLink('something'),
+    ];
+
+    beforeEach(() => {
+      (service as any).searchData = createSpyObj('searchData', {
+        searchBy: 'TEST searchBy',
+        getSearchByHref: 'TEST getSearchByHref',
+      });
+    });
+
+    if ('searchBy' in methods) {
+      it('should handle calls to searchBy', () => {
+        const out: any = service.searchBy('searchMethod', OPTIONS, false, true, ...FOLLOWLINKS);
+
+        expect((service as any).searchData.searchBy).toHaveBeenCalledWith('searchMethod', OPTIONS, false, true, ...FOLLOWLINKS);
+        expect(out).toBe('TEST searchBy');
+      });
+    }
+
+    if ('getSearchByHref' in methods) {
+      it('should handle calls to getSearchByHref', () => {
+        const out: any = service.getSearchByHref('searchMethod', OPTIONS, ...FOLLOWLINKS);
+
+        expect((service as any).searchData.getSearchByHref).toHaveBeenCalledWith('searchMethod', OPTIONS, ...FOLLOWLINKS);
+        expect(out).toBe('TEST getSearchByHref');
+      });
+    }
+  });
+}
+
+const endpoint = 'https://rest.api/core';
+
+class TestService extends SearchDataImpl<any> {
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super(undefined, requestService, rdbService, objectCache, halService, undefined);
+  }
+
+  public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+    return observableOf(endpoint);
+  }
+}
+
+describe('SearchDataImpl', () => {
+  let service: TestService;
+  let requestService;
+  let halService;
+  let rdbService;
+  let objectCache;
+  let selfLink;
+  let linksToFollow;
+  let testScheduler;
+  let remoteDataMocks;
+
+  function initTestService(): TestService {
+    requestService = getMockRequestService();
+    halService = new HALEndpointServiceStub('url') as any;
+    rdbService = getMockRemoteDataBuildService();
+    objectCache = {
+
+      addPatch: () => {
+        /* empty */
+      },
+      getObjectBySelfLink: () => {
+        /* empty */
+      },
+      getByHref: () => {
+        /* empty */
+      },
+    } as any;
+    selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
+    linksToFollow = [
+      followLink('a'),
+      followLink('b'),
+    ];
+
+    testScheduler = new TestScheduler((actual, expected) => {
+      // asserting the two objects are equal
+      // e.g. using chai.
+      expect(actual).toEqual(expected);
+    });
+
+    const timeStamp = new Date().getTime();
+    const msToLive = 15 * 60 * 1000;
+    const payload = { foo: 'bar' };
+    const statusCodeSuccess = 200;
+    const statusCodeError = 404;
+    const errorMessage = 'not found';
+    remoteDataMocks = {
+      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
+      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
+      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+    };
+
+    return new TestService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+    );
+  }
+
+  beforeEach(() => {
+    service = initTestService();
+  });
+
+  // todo: add specs (there were no search specs in original DataService suite!)
+});
diff --git a/src/app/core/data/base/search-data.ts b/src/app/core/data/base/search-data.ts
new file mode 100644
index 0000000000..226db8fe0d
--- /dev/null
+++ b/src/app/core/data/base/search-data.ts
@@ -0,0 +1,145 @@
+/**
+ * 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 { CacheableObject } from '../../cache/cacheable-object.model';
+import { BaseDataService } from './base-data.service';
+import { Observable } from 'rxjs';
+import { filter, map } from 'rxjs/operators';
+import { hasNoValue, isNotEmpty } from '../../../shared/empty.util';
+import { FindListOptions } from '../find-list-options.model';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { RemoteData } from '../remote-data';
+import { PaginatedList } from '../paginated-list.model';
+import { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+
+/**
+ * Shorthand type for method to construct a search endpoint
+ */
+export type ConstructSearchEndpoint = (href: string, searchMethod: string) => string;
+
+/**
+ * Default method to construct a search endpoint
+ */
+export const constructSearchEndpointDefault = (href: string, searchMethod: string): string => `${href}/search/${searchMethod}`;
+
+/**
+ * Interface for a data service that can search for objects.
+ */
+export interface SearchData<T extends CacheableObject> {
+  /**
+   * 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?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>>;
+
+  /**
+   * 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
+   */
+  getSearchByHref?(searchMethod: string, options?: FindListOptions, ...linksToFollow: FollowLinkConfig<T>[]): Observable<string>;
+}
+
+/**
+ * A DataService feature to search for objects.
+ *
+ * Concrete data services can use this feature by implementing {@link SearchData}
+ * and delegating its method to an inner instance of this class.
+ */
+export class SearchDataImpl<T extends CacheableObject> extends BaseDataService<T> implements SearchData<T> {
+  /**
+   * @param linkPath
+   * @param requestService
+   * @param rdbService
+   * @param objectCache
+   * @param halService
+   * @param responseMsToLive
+   * @param constructSearchEndpoint      an optional method to construct the search endpoint, passed as an argument so it can be
+   *                            modified without extending this class. Defaults to `${href}/search/${searchMethod}`
+   */
+  constructor(
+    protected linkPath: string,
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected responseMsToLive: number,
+    private constructSearchEndpoint: ConstructSearchEndpoint = constructSearchEndpointDefault,
+  ) {
+    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive);
+    if (hasNoValue(constructSearchEndpoint)) {
+      throw new Error(`SearchDataImpl initialized without a constructSearchEndpoint method (linkPath: ${linkPath})`);
+    }
+  }
+
+  /**
+   * 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);
+  }
+
+  /**
+   * 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
+   */
+  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)));
+  }
+
+  /**
+   * Return object search endpoint by given search method
+   *
+   * @param searchMethod The search method for the object
+   */
+  private getSearchEndpoint(searchMethod: string): Observable<string> {
+    return this.halService.getEndpoint(this.linkPath).pipe(
+      filter((href: string) => isNotEmpty(href)),
+      map(href => this.constructSearchEndpoint(href, searchMethod)),
+    );
+  }
+}

From 42a2c3c7e29f82bf1c5ab94e5e241f42bc09bc7d Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Wed, 24 Aug 2022 14:53:46 +0200
Subject: [PATCH 09/48] 93803: Refactor existing data services

---
 .../collection-metadata.component.spec.ts     |  14 +-
 .../collection-metadata.component.ts          |  27 ++-
 .../breadcrumbs/dso-breadcrumb.resolver.ts    |  13 +-
 .../browse-definition-data.service.spec.ts    |  37 +---
 .../browse/browse-definition-data.service.ts  | 107 ++---------
 src/app/core/config/config.service.spec.ts    |  10 +-
 src/app/core/config/config.service.ts         |  53 +-----
 .../submission-accesses-config.service.ts     |   6 +-
 .../config/submission-forms-config.service.ts |  11 +-
 .../submission-uploads-config.service.ts      |  11 +-
 src/app/core/core.module.ts                   |   4 +
 .../data/access-status-data.service.spec.ts   |   2 +-
 .../core/data/access-status-data.service.ts   |  23 +--
 .../core/data/bitstream-data.service.spec.ts  |   2 +-
 src/app/core/data/bitstream-data.service.ts   | 124 ++++++++++--
 .../bitstream-format-data.service.spec.ts     |   6 +-
 .../data/bitstream-format-data.service.ts     |  84 ++++++--
 src/app/core/data/bundle-data.service.spec.ts |   3 -
 src/app/core/data/bundle-data.service.ts      |  58 ++++--
 .../core/data/collection-data.service.spec.ts |   2 +-
 src/app/core/data/collection-data.service.ts  |  22 +--
 src/app/core/data/comcol-data.service.spec.ts |   2 +-
 src/app/core/data/comcol-data.service.ts      | 166 +++++++++++++++-
 src/app/core/data/community-data.service.ts   |  10 +-
 .../data/configuration-data.service.spec.ts   |   8 -
 .../core/data/configuration-data.service.ts   |  35 +---
 .../data/dso-redirect-data.service.spec.ts    | 111 +++++------
 .../core/data/dso-redirect-data.service.ts    |  95 ---------
 src/app/core/data/dso-redirect.service.ts     |  90 +++++++++
 .../data/dspace-object-data.service.spec.ts   |   8 -
 .../core/data/dspace-object-data.service.ts   |  98 +---------
 src/app/core/data/entity-type.service.ts      |  72 +++++--
 .../core/data/eperson-registration.service.ts |   8 +-
 .../core/data/external-source.service.spec.ts |   4 +-
 src/app/core/data/external-source.service.ts  |  41 ++--
 .../authorization-data.service.spec.ts        |  10 +-
 .../authorization-data.service.ts             |  44 +++--
 .../feature-data.service.ts                   |  15 +-
 .../core/data/href-only-data.service.spec.ts  |   8 +-
 src/app/core/data/href-only-data.service.ts   |  40 +---
 src/app/core/data/item-data.service.spec.ts   |  12 +-
 src/app/core/data/item-data.service.ts        | 141 ++++++++++++--
 .../data/item-request-data.service.spec.ts    |   2 +-
 .../core/data/item-request-data.service.ts    |  31 +--
 .../data/item-template-data.service.spec.ts   |  78 ++++----
 .../core/data/item-template-data.service.ts   | 180 ++++--------------
 .../data/metadata-field-data.service.spec.ts  |  12 +-
 .../core/data/metadata-field-data.service.ts  | 120 ++++++++++--
 .../data/metadata-schema-data.service.spec.ts |  12 +-
 .../core/data/metadata-schema-data.service.ts |  84 ++++++--
 .../persistent-identifier-data.service.ts     |  28 +++
 .../data/processes/process-data.service.ts    |  41 ++--
 .../data/processes/script-data.service.ts     |  47 +++--
 .../data/relationship-type.service.spec.ts    |  18 +-
 .../core/data/relationship-type.service.ts    | 118 ++++++------
 .../core/data/relationship.service.spec.ts    |   8 +-
 src/app/core/data/relationship.service.ts     |  79 +++++---
 src/app/core/data/root-data.service.spec.ts   |  15 +-
 src/app/core/data/root-data.service.ts        |  82 +-------
 src/app/core/data/site-data.service.spec.ts   |  12 --
 src/app/core/data/site-data.service.ts        |  44 +++--
 .../core/data/version-data.service.spec.ts    |  25 +--
 src/app/core/data/version-data.service.ts     |  50 +++--
 .../data/version-history-data.service.spec.ts |  10 +-
 .../core/data/version-history-data.service.ts |  25 +--
 .../core/data/workflow-action-data.service.ts |  22 +--
 .../core/eperson/eperson-data.service.spec.ts |   7 +-
 src/app/core/eperson/eperson-data.service.ts  | 128 +++++++++++--
 .../core/eperson/group-data.service.spec.ts   |   9 +-
 src/app/core/eperson/group-data.service.ts    |  70 ++++++-
 .../feedback/feedback-data.service.spec.ts    |   8 -
 .../core/feedback/feedback-data.service.ts    |  27 ++-
 src/app/core/orcid/orcid-auth.service.spec.ts |  11 +-
 src/app/core/orcid/orcid-auth.service.ts      |   4 +-
 .../core/orcid/orcid-history-data.service.ts  |  94 +--------
 src/app/core/orcid/orcid-queue.service.ts     |  73 ++-----
 .../researcher-profile.service.spec.ts        |  68 +++----
 .../profile/researcher-profile.service.ts     | 180 ++++++++++--------
 .../resource-policy.service.spec.ts           |  76 +++-----
 .../resource-policy.service.ts                | 100 +++-------
 src/app/core/shared/search/search.service.ts  |  68 ++-----
 .../statistics/usage-report-data.service.ts   |  47 ++---
 .../resolver/submission-object.resolver.ts    |  10 +-
 .../submission-cc-license-data.service.ts     |  45 +++--
 .../submission-cc-license-url-data.service.ts |  67 ++++---
 .../submission-object-data.service.ts         |   4 +-
 ...abulary-entry-details.data.service.spec.ts |  16 ++
 .../vocabulary-entry-details.data.service.ts  | 104 ++++++++++
 .../vocabulary.data.service.spec.ts           |  14 ++
 .../vocabularies/vocabulary.data.service.ts   |  70 +++++++
 .../vocabularies/vocabulary.service.spec.ts   |  33 +---
 .../vocabularies/vocabulary.service.ts        |  78 +-------
 .../workflowitem-data.service.spec.ts         |   7 +-
 .../submission/workflowitem-data.service.ts   |  75 ++++++--
 .../workspaceitem-data.service.spec.ts        |   7 +-
 .../submission/workspaceitem-data.service.ts  |  86 +++++++--
 .../tasks/claimed-task-data.service.spec.ts   |  14 +-
 .../core/tasks/claimed-task-data.service.ts   |  25 +--
 .../core/tasks/pool-task-data.service.spec.ts |  15 +-
 src/app/core/tasks/pool-task-data.service.ts  |  25 +--
 src/app/core/tasks/tasks.service.spec.ts      |  22 +--
 src/app/core/tasks/tasks.service.ts           |  66 ++++++-
 .../item-collection-mapper.component.ts       |   1 -
 .../orcid-sync-settings.component.spec.ts     |  12 +-
 .../orcid-sync-settings.component.ts          |   4 +-
 src/app/lookup-by-id/lookup-by-id.module.ts   |   4 +-
 src/app/lookup-by-id/lookup-guard.ts          |   4 +-
 ...ile-page-researcher-form.component.spec.ts |   2 +-
 .../profile-page-researcher-form.component.ts |  21 +-
 ...med-task-actions-approve.component.spec.ts |   8 +-
 .../claimed-task-actions.component.ts         |  13 +-
 ...sk-actions-edit-metadata.component.spec.ts |   8 +-
 ...imed-task-actions-reject.component.spec.ts |   8 +-
 ...k-actions-return-to-pool.component.spec.ts |   8 +-
 .../mydspace-actions-service.factory.ts       |   4 +-
 .../mydspace-actions/mydspace-actions.ts      |  11 +-
 .../mydspace-reloadable-actions.spec.ts       |  16 +-
 .../mydspace-reloadable-actions.ts            |   9 +-
 .../pool-task-actions.component.spec.ts       |  10 +-
 .../pool-task/pool-task-actions.component.ts  |   1 +
 .../item-select/item-select.component.spec.ts |   2 +-
 .../eperson-group-list.component.ts           |   3 +-
 .../resource-policy-target.resolver.ts        |   5 +-
 123 files changed, 2487 insertions(+), 2200 deletions(-)
 delete mode 100644 src/app/core/data/dso-redirect-data.service.ts
 create mode 100644 src/app/core/data/dso-redirect.service.ts
 create mode 100644 src/app/core/data/persistent-identifier-data.service.ts
 create mode 100644 src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.spec.ts
 create mode 100644 src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
 create mode 100644 src/app/core/submission/vocabularies/vocabulary.data.service.spec.ts
 create mode 100644 src/app/core/submission/vocabularies/vocabulary.data.service.ts

diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts
index 2b473bf037..79e7a465e1 100644
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts
@@ -13,7 +13,7 @@ import { Item } from '../../../core/shared/item.model';
 import { ItemTemplateDataService } from '../../../core/data/item-template-data.service';
 import { Collection } from '../../../core/shared/collection.model';
 import { RequestService } from '../../../core/data/request.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { getCollectionItemTemplateRoute } from '../../collection-page-routing-paths';
 
 describe('CollectionMetadataComponent', () => {
@@ -39,8 +39,8 @@ describe('CollectionMetadataComponent', () => {
 
   const itemTemplateServiceStub = jasmine.createSpyObj('itemTemplateService', {
     findByCollectionID: createSuccessfulRemoteDataObject$(template),
-    create: createSuccessfulRemoteDataObject$(template),
-    deleteByCollectionID: observableOf(true),
+    createByCollectionID: createSuccessfulRemoteDataObject$(template),
+    delete: observableOf(true),
     getCollectionEndpoint: observableOf(collectionTemplateHref),
   });
 
@@ -91,12 +91,12 @@ describe('CollectionMetadataComponent', () => {
 
   describe('deleteItemTemplate', () => {
     beforeEach(() => {
-      (itemTemplateService.deleteByCollectionID as jasmine.Spy).and.returnValue(observableOf(true));
+      (itemTemplateService.delete as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$({}));
       comp.deleteItemTemplate();
     });
 
-    it('should call ItemTemplateService.deleteByCollectionID', () => {
-      expect(itemTemplateService.deleteByCollectionID).toHaveBeenCalledWith(template, 'collection-id');
+    it('should call ItemTemplateService.delete', () => {
+      expect(itemTemplateService.delete).toHaveBeenCalledWith(template.uuid);
     });
 
     describe('when delete returns a success', () => {
@@ -107,7 +107,7 @@ describe('CollectionMetadataComponent', () => {
 
     describe('when delete returns a failure', () => {
       beforeEach(() => {
-        (itemTemplateService.deleteByCollectionID as jasmine.Spy).and.returnValue(observableOf(false));
+        (itemTemplateService.delete as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$());
         comp.deleteItemTemplate();
       });
 
diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
index d4396fce17..8e534a0829 100644
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
@@ -7,12 +7,14 @@ import { ItemTemplateDataService } from '../../../core/data/item-template-data.s
 import { combineLatest as combineLatestObservable, Observable } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
-import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { switchMap } from 'rxjs/operators';
+import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { map, switchMap } from 'rxjs/operators';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { RequestService } from '../../../core/data/request.service';
 import { getCollectionItemTemplateRoute } from '../../collection-page-routing-paths';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { hasValue } from '../../../shared/empty.util';
 
 /**
  * Component for editing a collection's metadata
@@ -65,7 +67,7 @@ export class CollectionMetadataComponent extends ComcolMetadataComponent<Collect
       getFirstSucceededRemoteDataPayload(),
     );
     const template$ = collection$.pipe(
-      switchMap((collection: Collection) => this.itemTemplateService.create(new Item(), collection.uuid).pipe(
+      switchMap((collection: Collection) => this.itemTemplateService.createByCollectionID(new Item(), collection.uuid).pipe(
         getFirstSucceededRemoteDataPayload(),
       )),
     );
@@ -83,18 +85,15 @@ export class CollectionMetadataComponent extends ComcolMetadataComponent<Collect
    * Delete the item template from the collection
    */
   deleteItemTemplate() {
-    const collection$ = this.dsoRD$.pipe(
+    this.dsoRD$.pipe(
       getFirstSucceededRemoteDataPayload(),
-    );
-    const template$ = collection$.pipe(
-      switchMap((collection: Collection) => this.itemTemplateService.findByCollectionID(collection.uuid).pipe(
-        getFirstSucceededRemoteDataPayload(),
-      )),
-    );
-    combineLatestObservable(collection$, template$).pipe(
-      switchMap(([collection, template]) => {
-        return this.itemTemplateService.deleteByCollectionID(template, collection.uuid);
-      })
+      switchMap((collection: Collection) => this.itemTemplateService.findByCollectionID(collection.uuid)),
+      getFirstSucceededRemoteDataPayload(),
+      switchMap((template) => {
+        return this.itemTemplateService.delete(template.uuid);
+      }),
+      getFirstCompletedRemoteData(),
+      map((response: RemoteData<NoContent>) => hasValue(response) && response.hasSucceeded),
     ).subscribe((success: boolean) => {
       if (success) {
         this.notificationsService.success(null, this.translate.get('collection.edit.template.notifications.delete.success'));
diff --git a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts
index 650bbd3301..8be4e5e099 100644
--- a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts
@@ -2,23 +2,26 @@ import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
 import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
-import { DataService } from '../data/data.service';
-import { getRemoteDataPayload, getFirstCompletedRemoteData } from '../shared/operators';
+import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../shared/operators';
 import { map } from 'rxjs/operators';
 import { Observable } from 'rxjs';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { ChildHALResource } from '../shared/child-hal-resource.model';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { hasValue } from '../../shared/empty.util';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
 
 /**
  * The class that resolves the BreadcrumbConfig object for a DSpaceObject
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export abstract class DSOBreadcrumbResolver<T extends ChildHALResource & DSpaceObject> implements Resolve<BreadcrumbConfig<T>> {
-  constructor(protected breadcrumbService: DSOBreadcrumbsService, protected dataService: DataService<T>) {
+  protected constructor(
+    protected breadcrumbService: DSOBreadcrumbsService,
+    protected dataService: IdentifiableDataService<T>,
+  ) {
   }
 
   /**
@@ -36,7 +39,7 @@ export abstract class DSOBreadcrumbResolver<T extends ChildHALResource & DSpaceO
         if (hasValue(object)) {
           const fullPath = state.url;
           const url = fullPath.substr(0, fullPath.indexOf(uuid)) + uuid;
-          return {provider: this.breadcrumbService, key: object, url: url};
+          return { provider: this.breadcrumbService, key: object, url: url };
         } else {
           return undefined;
         }
diff --git a/src/app/core/browse/browse-definition-data.service.spec.ts b/src/app/core/browse/browse-definition-data.service.spec.ts
index 5b57ee96c1..9377dc715f 100644
--- a/src/app/core/browse/browse-definition-data.service.spec.ts
+++ b/src/app/core/browse/browse-definition-data.service.spec.ts
@@ -5,15 +5,9 @@ import { FindListOptions } from '../data/find-list-options.model';
 
 describe(`BrowseDefinitionDataService`, () => {
   let service: BrowseDefinitionDataService;
-  const dataServiceImplSpy = jasmine.createSpyObj('dataService', {
+  const findAllDataSpy = jasmine.createSpyObj('findAllData', {
     findAll: EMPTY,
-    findByHref: EMPTY,
-    findAllByHref: EMPTY,
-    findById: EMPTY,
   });
-  const hrefAll = 'https://rest.api/server/api/discover/browses';
-  const hrefSingle = 'https://rest.api/server/api/discover/browses/author';
-  const id = 'author';
   const options = new FindListOptions();
   const linksToFollow = [
     followLink('entries'),
@@ -21,35 +15,14 @@ describe(`BrowseDefinitionDataService`, () => {
   ];
 
   beforeEach(() => {
-    service = new BrowseDefinitionDataService(null, null, null, null, null, null, null, null);
-    (service as any).dataService = dataServiceImplSpy;
+    service = new BrowseDefinitionDataService(null, null, null, null);
+    (service as any).findAllData = findAllDataSpy;
   });
 
   describe(`findAll`, () => {
-    it(`should call findAll on DataServiceImpl`, () => {
+    it(`should call findAll on findAllData`, () => {
       service.findAll(options, true, false, ...linksToFollow);
-      expect(dataServiceImplSpy.findAll).toHaveBeenCalledWith(options, true, false, ...linksToFollow);
-    });
-  });
-
-  describe(`findByHref`, () => {
-    it(`should call findByHref on DataServiceImpl`, () => {
-      service.findByHref(hrefSingle, true, false, ...linksToFollow);
-      expect(dataServiceImplSpy.findByHref).toHaveBeenCalledWith(hrefSingle, true, false, ...linksToFollow);
-    });
-  });
-
-  describe(`findAllByHref`, () => {
-    it(`should call findAllByHref on DataServiceImpl`, () => {
-      service.findAllByHref(hrefAll, options, true, false, ...linksToFollow);
-      expect(dataServiceImplSpy.findAllByHref).toHaveBeenCalledWith(hrefAll, options, true, false, ...linksToFollow);
-    });
-  });
-
-  describe(`findById`, () => {
-    it(`should call findById on DataServiceImpl`, () => {
-      service.findAllByHref(id, options, true, false, ...linksToFollow);
-      expect(dataServiceImplSpy.findAllByHref).toHaveBeenCalledWith(id, options, true, false, ...linksToFollow);
+      expect(findAllDataSpy.findAll).toHaveBeenCalledWith(options, true, false, ...linksToFollow);
     });
   });
 });
diff --git a/src/app/core/browse/browse-definition-data.service.ts b/src/app/core/browse/browse-definition-data.service.ts
index 6a27bb3f7a..3c9f6d6983 100644
--- a/src/app/core/browse/browse-definition-data.service.ts
+++ b/src/app/core/browse/browse-definition-data.service.ts
@@ -1,125 +1,40 @@
-/* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
 import { dataService } from '../cache/builders/build-decorators';
 import { BROWSE_DEFINITION } from '../shared/browse-definition.resource-type';
-import { DataService } from '../data/data.service';
 import { BrowseDefinition } from '../shared/browse-definition.model';
 import { RequestService } from '../data/request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
-import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { Observable } from 'rxjs';
 import { RemoteData } from '../data/remote-data';
 import { PaginatedList } from '../data/paginated-list.model';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from '../data/find-list-options.model';
-
-
-class DataServiceImpl extends DataService<BrowseDefinition> {
-  protected linkPath = 'browses';
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<BrowseDefinition>) {
-    super();
-  }
-}
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { FindAllData, FindAllDataImpl } from '../data/base/find-all-data';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 @dataService(BROWSE_DEFINITION)
-export class BrowseDefinitionDataService {
-  /**
-   * A private DataService instance to delegate specific methods to.
-   */
-  private dataService: DataServiceImpl;
+export class BrowseDefinitionDataService extends IdentifiableDataService<BrowseDefinition> implements FindAllData<BrowseDefinition> {
+  private findAllData: FindAllDataImpl<BrowseDefinition>;
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<BrowseDefinition>) {
-    this.dataService = new DataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator);
+  ) {
+    super('browses', requestService, rdbService, objectCache, halService);
+
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
-  /**
-   * 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<BrowseDefinition>>>}
-   *    Return an observable that emits object list
-   */
+
   findAll(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<BrowseDefinition>[]): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
-    return this.dataService.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-  }
-
-  /**
-   * Returns an observable of {@link RemoteData} of an {@link BrowseDefinition}, based on an href, with a list of {@link FollowLinkConfig},
-   * to automatically resolve {@link HALLink}s of the {@link BrowseDefinition}
-   * @param href                        The url of {@link BrowseDefinition} 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
-   */
-  findByHref(href: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<BrowseDefinition>[]): Observable<RemoteData<BrowseDefinition>> {
-    return this.dataService.findByHref(href, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-  }
-
-  /**
-   * Returns a list of observables of {@link RemoteData} of {@link BrowseDefinition}s, based on an href, with a list of {@link FollowLinkConfig},
-   * to automatically resolve {@link HALLink}s of the {@link BrowseDefinition}
-   * @param href                        The url of object we want to retrieve
-   * @param findListOptions             Find list options object
-   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
-   *                                    no valid cached version. Defaults to true
-   * @param reRequestOnStale            Whether or not the request should automatically be re-
-   *                                    requested after the response becomes stale
-   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
-   *                                    {@link HALLink}s should be automatically resolved
-   */
-  findAllByHref(href: string, findListOptions: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<BrowseDefinition>[]): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
-    return this.dataService.findAllByHref(href, findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...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<BrowseDefinition>[]): Observable<RemoteData<BrowseDefinition>> {
-    return this.dataService.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 }
 
diff --git a/src/app/core/config/config.service.spec.ts b/src/app/core/config/config.service.spec.ts
index be354ddc6f..ead7c7e005 100644
--- a/src/app/core/config/config.service.spec.ts
+++ b/src/app/core/config/config.service.spec.ts
@@ -9,6 +9,7 @@ import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-servic
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { FindListOptions } from '../data/find-list-options.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
 
 const LINK_NAME = 'test';
 const BROWSE = 'search/findByCollection';
@@ -20,8 +21,10 @@ class TestService extends ConfigService {
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected halService: HALEndpointService) {
-    super(requestService, rdbService, null, null, halService, null, null, null, BROWSE);
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super(BROWSE, requestService, rdbService, objectCache, halService);
   }
 }
 
@@ -45,7 +48,8 @@ describe('ConfigService', () => {
     return new TestService(
       requestService,
       rdbService,
-      halService
+      null,
+      halService,
     );
   }
 
diff --git a/src/app/core/config/config.service.ts b/src/app/core/config/config.service.ts
index 3bc87c8de0..f0b55f5351 100644
--- a/src/app/core/config/config.service.ts
+++ b/src/app/core/config/config.service.ts
@@ -1,59 +1,14 @@
-/* eslint-disable max-classes-per-file */
 import { Observable } from 'rxjs';
-import { RequestService } from '../data/request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ConfigObject } from './models/config.model';
 import { RemoteData } from '../data/remote-data';
-import { DataService } from '../data/data.service';
-import { Store } from '@ngrx/store';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
-import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 import { map } from 'rxjs/operators';
-import { CoreState } from '../core-state.model';
-
-class DataServiceImpl extends DataService<ConfigObject> {
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<ConfigObject>,
-    protected linkPath: string
-  ) {
-    super();
-  }
-}
-
-export abstract class ConfigService {
-  /**
-   * A private DataService instance to delegate specific methods to.
-   */
-  private dataService: DataServiceImpl;
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<ConfigObject>,
-    protected linkPath: string
-  ) {
-    this.dataService = new DataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator, this.linkPath);
-  }
+import { BaseDataService } from '../data/base/base-data.service';
 
+export abstract class ConfigService extends BaseDataService<ConfigObject> {
   public findByHref(href: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<ConfigObject>[]): Observable<RemoteData<ConfigObject>> {
-    return this.dataService.findByHref(href, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
+    return super.findByHref(href, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
       getFirstCompletedRemoteData(),
       map((rd: RemoteData<ConfigObject>) => {
         if (rd.hasFailed) {
@@ -61,7 +16,7 @@ export abstract class ConfigService {
         } else {
           return rd;
         }
-      })
+      }),
     );
   }
 }
diff --git a/src/app/core/config/submission-accesses-config.service.ts b/src/app/core/config/submission-accesses-config.service.ts
index 7c2d2046d9..4841e2e39d 100644
--- a/src/app/core/config/submission-accesses-config.service.ts
+++ b/src/app/core/config/submission-accesses-config.service.ts
@@ -26,14 +26,10 @@ export class SubmissionAccessesConfigService extends ConfigService {
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<SubmissionAccessesModel>
   ) {
-    super(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator, 'submissionaccessoptions');
+    super('submissionaccessoptions', requestService, rdbService, objectCache, halService);
   }
 
   findByHref(href: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow): Observable<RemoteData<SubmissionAccessesModel>> {
diff --git a/src/app/core/config/submission-forms-config.service.ts b/src/app/core/config/submission-forms-config.service.ts
index 1db5c2fa01..abd3332cae 100644
--- a/src/app/core/config/submission-forms-config.service.ts
+++ b/src/app/core/config/submission-forms-config.service.ts
@@ -4,11 +4,7 @@ import { ConfigService } from './config.service';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
-import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { ConfigObject } from './models/config.model';
 import { dataService } from '../cache/builders/build-decorators';
 import { SUBMISSION_FORMS_TYPE } from './models/config-type';
@@ -16,7 +12,6 @@ import { SubmissionFormsModel } from './models/config-submission-forms.model';
 import { RemoteData } from '../data/remote-data';
 import { Observable } from 'rxjs';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { CoreState } from '../core-state.model';
 
 @Injectable()
 @dataService(SUBMISSION_FORMS_TYPE)
@@ -24,14 +19,10 @@ export class SubmissionFormsConfigService extends ConfigService {
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<SubmissionFormsModel>
   ) {
-    super(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator, 'submissionforms');
+    super('submissionforms', requestService, rdbService, objectCache, halService);
   }
 
   public findByHref(href: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<SubmissionFormsModel>[]): Observable<RemoteData<SubmissionFormsModel>> {
diff --git a/src/app/core/config/submission-uploads-config.service.ts b/src/app/core/config/submission-uploads-config.service.ts
index 8ad17749bd..b166b895ac 100644
--- a/src/app/core/config/submission-uploads-config.service.ts
+++ b/src/app/core/config/submission-uploads-config.service.ts
@@ -6,16 +6,11 @@ import { ObjectCacheService } from '../cache/object-cache.service';
 import { dataService } from '../cache/builders/build-decorators';
 import { SUBMISSION_UPLOADS_TYPE } from './models/config-type';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
-import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { ConfigObject } from './models/config.model';
 import { SubmissionUploadsModel } from './models/config-submission-uploads.model';
 import { RemoteData } from '../data/remote-data';
 import { Observable } from 'rxjs';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { CoreState } from '../core-state.model';
 
 /**
  * Provides methods to retrieve, from REST server, bitstream access conditions configurations applicable during the submission process.
@@ -26,14 +21,10 @@ export class SubmissionUploadsConfigService extends ConfigService {
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<SubmissionUploadsModel>
   ) {
-    super(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator, 'submissionuploads');
+    super('submissionuploads', requestService, rdbService, objectCache, halService);
   }
 
   findByHref(href: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow): Observable<RemoteData<SubmissionUploadsModel>> {
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index b16930e819..80576c03b7 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -178,6 +178,8 @@ import { OrcidHistoryDataService } from './orcid/orcid-history-data.service';
 import { OrcidQueue } from './orcid/model/orcid-queue.model';
 import { OrcidHistory } from './orcid/model/orcid-history.model';
 import { OrcidAuthService } from './orcid/orcid-auth.service';
+import { VocabularyDataService } from './submission/vocabularies/vocabulary.data.service';
+import { VocabularyEntryDetailsDataService } from './submission/vocabularies/vocabulary-entry-details.data.service';
 
 /**
  * When not in production, endpoint responses can be mocked for testing purposes
@@ -300,6 +302,8 @@ const PROVIDERS = [
   FilteredDiscoveryPageResponseParsingService,
   { provide: NativeWindowService, useFactory: NativeWindowFactory },
   VocabularyService,
+  VocabularyDataService,
+  VocabularyEntryDetailsDataService,
   VocabularyTreeviewService,
   SequenceService,
   GroupDataService,
diff --git a/src/app/core/data/access-status-data.service.spec.ts b/src/app/core/data/access-status-data.service.spec.ts
index d81b9384f3..18b8cb5d65 100644
--- a/src/app/core/data/access-status-data.service.spec.ts
+++ b/src/app/core/data/access-status-data.service.spec.ts
@@ -76,6 +76,6 @@ describe('AccessStatusDataService', () => {
     });
     halService = new HALEndpointServiceStub(url);
     notificationsService = new NotificationsServiceStub();
-    service = new AccessStatusDataService(null, halService, null, notificationsService, objectCache, rdbService, requestService, null);
+    service = new AccessStatusDataService(requestService, rdbService, objectCache, halService);
   }
 });
diff --git a/src/app/core/data/access-status-data.service.ts b/src/app/core/data/access-status-data.service.ts
index 09843fac9b..2b1dfd319a 100644
--- a/src/app/core/data/access-status-data.service.ts
+++ b/src/app/core/data/access-status-data.service.ts
@@ -1,38 +1,27 @@
-import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { DataService } from './data.service';
 import { RequestService } from './request.service';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
-import { CoreState } from '../core-state.model';
 import { AccessStatusObject } from 'src/app/shared/object-list/access-status-badge/access-status.model';
 import { ACCESS_STATUS } from 'src/app/shared/object-list/access-status-badge/access-status.resource-type';
 import { Observable } from 'rxjs';
 import { RemoteData } from './remote-data';
 import { Item } from '../shared/item.model';
+import { BaseDataService } from './base/base-data.service';
 
 @Injectable()
 @dataService(ACCESS_STATUS)
-export class AccessStatusDataService extends DataService<AccessStatusObject> {
-
-  protected linkPath = 'accessStatus';
+export class AccessStatusDataService extends BaseDataService<AccessStatusObject> {
 
   constructor(
-    protected comparator: DefaultChangeAnalyzer<AccessStatusObject>,
-    protected halService: HALEndpointService,
-    protected http: HttpClient,
-    protected notificationsService: NotificationsService,
-    protected objectCache: ObjectCacheService,
-    protected rdbService: RemoteDataBuildService,
     protected requestService: RequestService,
-    protected store: Store<CoreState>,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
   ) {
-    super();
+    super('accessStatus', requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/bitstream-data.service.spec.ts b/src/app/core/data/bitstream-data.service.spec.ts
index df170397f8..07d02f84ae 100644
--- a/src/app/core/data/bitstream-data.service.spec.ts
+++ b/src/app/core/data/bitstream-data.service.spec.ts
@@ -47,7 +47,7 @@ describe('BitstreamDataService', () => {
     });
     rdbService = getMockRemoteDataBuildService();
 
-    service = new BitstreamDataService(requestService, rdbService, null, objectCache, halService, null, null, null, null, bitstreamFormatService);
+    service = new BitstreamDataService(requestService, rdbService, objectCache, halService, null, bitstreamFormatService, null, null);
   });
 
   describe('when updating the bitstream\'s format', () => {
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index 16f2cc16c2..ab0a4c301c 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -1,10 +1,8 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { map, switchMap, take } from 'rxjs/operators';
 import { hasValue } from '../../shared/empty.util';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
@@ -15,8 +13,6 @@ import { Bundle } from '../shared/bundle.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
 import { BundleDataService } from './bundle-data.service';
-import { DataService } from './data.service';
-import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
 import { buildPaginatedList, PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { PutRequest } from './request.models';
@@ -28,36 +24,43 @@ import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.util
 import { PageInfo } from '../shared/page-info.model';
 import { RequestParam } from '../cache/models/request-param.model';
 import { sendRequest } from '../shared/request.operators';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from './find-list-options.model';
+import { SearchData, SearchDataImpl } from './base/search-data';
+import { PatchData, PatchDataImpl } from './base/patch-data';
+import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
+import { RestRequestMethod } from './rest-request-method';
+import { DeleteData, DeleteDataImpl } from './base/delete-data';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NoContent } from '../shared/NoContent.model';
+import { IdentifiableDataService } from './base/identifiable-data.service';
 
 /**
  * A service to retrieve {@link Bitstream}s from the REST API
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 @dataService(BITSTREAM)
-export class BitstreamDataService extends DataService<Bitstream> {
-
-  /**
-   * The HAL path to the bitstream endpoint
-   */
-  protected linkPath = 'bitstreams';
+export class BitstreamDataService extends IdentifiableDataService<Bitstream> implements SearchData<Bitstream>, PatchData<Bitstream>, DeleteData<Bitstream> {
+  private searchData: SearchDataImpl<Bitstream>;
+  private patchData: PatchDataImpl<Bitstream>;
+  private deleteData: DeleteDataImpl<Bitstream>;
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DSOChangeAnalyzer<Bitstream>,
     protected bundleService: BundleDataService,
-    protected bitstreamFormatService: BitstreamFormatDataService
+    protected bitstreamFormatService: BitstreamFormatDataService,
+    protected comparator: DSOChangeAnalyzer<Bitstream>,
+    protected notificationsService: NotificationsService,
   ) {
-    super();
+    super('bitstreams', requestService, rdbService, objectCache, halService);
+
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.patchData = new PatchDataImpl<Bitstream>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
@@ -180,8 +183,89 @@ export class BitstreamDataService extends DataService<Bitstream> {
       hrefObs,
       useCachedVersionIfAvailable,
       reRequestOnStale,
-      ...linksToFollow
+      ...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<Bitstream>[]): Observable<string> {
+    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
+  }
+
+  /**
+   * 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
+   */
+  public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Bitstream>[]): Observable<RemoteData<PaginatedList<Bitstream>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Commit current object changes to the server
+   * @param method The RestRequestMethod for which de server sync buffer should be committed
+   */
+  public commitUpdates(method?: RestRequestMethod): void {
+    this.patchData.commitUpdates(method);
+  }
+
+  /**
+   * 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
+   */
+  public patch(object: Bitstream, operations: []): Observable<RemoteData<Bitstream>> {
+    return this.patchData.patch(object, operations);
+  }
+
+  /**
+   * 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
+   */
+  public update(object: Bitstream): Observable<RemoteData<Bitstream>> {
+    return this.patchData.update(object);
+  }
+
+  /**
+   * Delete an existing 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.deleteData.delete(objectId, copyVirtualMetadata);
+  }
+
+  /**
+   * Delete an existing 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>> {
+    return this.deleteData.deleteByHref(href, copyVirtualMetadata);
+  }
 }
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..d1c48ab82e 100644
--- a/src/app/core/data/bitstream-format-data.service.spec.ts
+++ b/src/app/core/data/bitstream-format-data.service.spec.ts
@@ -50,8 +50,6 @@ describe('BitstreamFormatDataService', () => {
   } as HALEndpointService;
 
   const notificationsService = {} as NotificationsService;
-  const http = {} as HttpClient;
-  const comparator = {} as any;
 
   let rd;
   let rdbService: RemoteDataBuildService;
@@ -65,12 +63,10 @@ describe('BitstreamFormatDataService', () => {
     return new BitstreamFormatDataService(
       requestService,
       rdbService,
-      store,
       objectCache,
       halService,
       notificationsService,
-      http,
-      comparator
+      store,
     );
   }
 
diff --git a/src/app/core/data/bitstream-format-data.service.ts b/src/app/core/data/bitstream-format-data.service.ts
index 1af3db8103..72d14fbf68 100644
--- a/src/app/core/data/bitstream-format-data.service.ts
+++ b/src/app/core/data/bitstream-format-data.service.ts
@@ -1,13 +1,8 @@
-import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { createSelector, select, Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { distinctUntilChanged, map, tap } from 'rxjs/operators';
-import {
-  BitstreamFormatsRegistryDeselectAction,
-  BitstreamFormatsRegistryDeselectAllAction,
-  BitstreamFormatsRegistrySelectAction
-} from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions';
+import { BitstreamFormatsRegistryDeselectAction, BitstreamFormatsRegistryDeselectAllAction, BitstreamFormatsRegistrySelectAction } from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions';
 import { BitstreamFormatRegistryState } from '../../admin/admin-registries/bitstream-formats/bitstream-format.reducers';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { dataService } from '../cache/builders/build-decorators';
@@ -18,40 +13,52 @@ import { BitstreamFormat } from '../shared/bitstream-format.model';
 import { BITSTREAM_FORMAT } from '../shared/bitstream-format.resource-type';
 import { Bitstream } from '../shared/bitstream.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { DataService } from './data.service';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { RemoteData } from './remote-data';
 import { PostRequest, PutRequest } from './request.models';
 import { RequestService } from './request.service';
 import { sendRequest } from '../shared/request.operators';
 import { CoreState } from '../core-state.model';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import { DeleteData, DeleteDataImpl } from './base/delete-data';
+import { FindAllData, FindAllDataImpl } from './base/find-all-data';
+import { FollowLinkConfig } from 'src/app/shared/utils/follow-link-config.model';
+import { FindListOptions } from './find-list-options.model';
+import { PaginatedList } from './paginated-list.model';
+import { NoContent } from '../shared/NoContent.model';
 
 const bitstreamFormatsStateSelector = createSelector(
   coreSelector,
-  (state: CoreState) => state.bitstreamFormats
+  (state: CoreState) => state.bitstreamFormats,
+);
+const selectedBitstreamFormatSelector = createSelector(
+  bitstreamFormatsStateSelector,
+  (bitstreamFormatRegistryState: BitstreamFormatRegistryState) => bitstreamFormatRegistryState.selectedBitstreamFormats,
 );
-const selectedBitstreamFormatSelector = createSelector(bitstreamFormatsStateSelector,
-  (bitstreamFormatRegistryState: BitstreamFormatRegistryState) => bitstreamFormatRegistryState.selectedBitstreamFormats);
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the bitstreamformats endpoint
  */
 @Injectable()
 @dataService(BITSTREAM_FORMAT)
-export class BitstreamFormatDataService extends DataService<BitstreamFormat> {
+export class BitstreamFormatDataService extends IdentifiableDataService<BitstreamFormat> implements FindAllData<BitstreamFormat>, DeleteData<BitstreamFormat> {
 
   protected linkPath = 'bitstreamformats';
 
+  private findAllData: FindAllDataImpl<BitstreamFormat>;
+  private deleteData: DeleteDataImpl<BitstreamFormat>;
+
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<BitstreamFormat>) {
-    super();
+    protected store: Store<CoreState>,
+  ) {
+    super('bitstreamformats', requestService, rdbService, objectCache, halService);
+
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
@@ -60,7 +67,7 @@ export class BitstreamFormatDataService extends DataService<BitstreamFormat> {
    */
   public getUpdateEndpoint(formatId: string): Observable<string> {
     return this.getBrowseEndpoint().pipe(
-      map((endpoint: string) => this.getIDHref(endpoint, formatId))
+      map((endpoint: string) => this.getIDHref(endpoint, formatId)),
     );
   }
 
@@ -147,4 +154,47 @@ export class BitstreamFormatDataService extends DataService<BitstreamFormat> {
   findByBitstream(bitstream: Bitstream): Observable<RemoteData<BitstreamFormat>> {
     return this.findByHref(bitstream._links.format.href);
   }
+
+  /**
+   * 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?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<BitstreamFormat>[]): Observable<RemoteData<PaginatedList<BitstreamFormat>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Delete an existing 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.deleteData.delete(objectId, copyVirtualMetadata);
+  }
+
+  /**
+   * Delete an existing 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>> {
+    return this.deleteData.deleteByHref(href, copyVirtualMetadata);
+  }
 }
diff --git a/src/app/core/data/bundle-data.service.spec.ts b/src/app/core/data/bundle-data.service.spec.ts
index 12eec9e33d..80bf7c281c 100644
--- a/src/app/core/data/bundle-data.service.spec.ts
+++ b/src/app/core/data/bundle-data.service.spec.ts
@@ -64,9 +64,6 @@ describe('BundleDataService', () => {
       store,
       objectCache,
       halService,
-      notificationsService,
-      http,
-      comparator,
     );
   }
 
diff --git a/src/app/core/data/bundle-data.service.ts b/src/app/core/data/bundle-data.service.ts
index fa5ee51b45..bc559b4b65 100644
--- a/src/app/core/data/bundle-data.service.ts
+++ b/src/app/core/data/bundle-data.service.ts
@@ -1,10 +1,7 @@
-import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { map, switchMap, take } from 'rxjs/operators';
 import { hasValue } from '../../shared/empty.util';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
@@ -13,8 +10,6 @@ import { Bundle } from '../shared/bundle.model';
 import { BUNDLE } from '../shared/bundle.resource-type';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
-import { DataService } from './data.service';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { GetRequest } from './request.models';
@@ -22,30 +17,35 @@ import { RequestService } from './request.service';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { Bitstream } from '../shared/bitstream.model';
 import { RequestEntryState } from './request-entry-state.model';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from './find-list-options.model';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import { PatchData, PatchDataImpl } from './base/patch-data';
+import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
+import { RestRequestMethod } from './rest-request-method';
+import { Operation } from 'fast-json-patch';
 
 /**
  * A service to retrieve {@link Bundle}s from the REST API
  */
 @Injectable(
-  {providedIn: 'root'}
+  { providedIn: 'root' },
 )
 @dataService(BUNDLE)
-export class BundleDataService extends DataService<Bundle> {
-  protected linkPath = 'bundles';
-  protected bitstreamsEndpoint = 'bitstreams';
+export class BundleDataService extends IdentifiableDataService<Bundle> implements PatchData<Bundle> {
+  private bitstreamsEndpoint = 'bitstreams';
+
+  private patchData: PatchDataImpl<Bundle>;
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<Bundle>) {
-    super();
+    protected comparator: DSOChangeAnalyzer<Bundle>,
+  ) {
+    super('bundles', requestService, rdbService, objectCache, halService);
+
+    this.patchData = new PatchDataImpl<Bundle>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
@@ -133,7 +133,7 @@ export class BundleDataService extends DataService<Bundle> {
     const hrefObs = this.getBitstreamsEndpoint(bundleId, searchOptions);
 
     hrefObs.pipe(
-      take(1)
+      take(1),
     ).subscribe((href) => {
       const request = new GetRequest(this.requestService.generateRequestId(), href);
       this.requestService.send(request, true);
@@ -141,4 +141,30 @@ export class BundleDataService extends DataService<Bundle> {
 
     return this.rdbService.buildList<Bitstream>(hrefObs, ...linksToFollow);
   }
+
+  /**
+   * Commit current object changes to the server
+   * @param method The RestRequestMethod for which de server sync buffer should be committed
+   */
+  public commitUpdates(method?: RestRequestMethod): void {
+    this.patchData.commitUpdates(method);
+  }
+
+  /**
+   * 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
+   */
+  public patch(object: Bundle, operations: Operation[]): Observable<RemoteData<Bundle>> {
+    return this.patchData.patch(object, operations);
+  }
+
+  /**
+   * 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
+   */
+  public update(object: Bundle): Observable<RemoteData<Bundle>> {
+    return this.patchData.update(object);
+  }
 }
diff --git a/src/app/core/data/collection-data.service.spec.ts b/src/app/core/data/collection-data.service.spec.ts
index 031e5ecf47..6d43d5475c 100644
--- a/src/app/core/data/collection-data.service.spec.ts
+++ b/src/app/core/data/collection-data.service.spec.ts
@@ -201,7 +201,7 @@ describe('CollectionDataService', () => {
     notificationsService = new NotificationsServiceStub();
     translate = getMockTranslateService();
 
-    service = new CollectionDataService(requestService, rdbService, null, null, objectCache, halService, notificationsService, null, null, null, translate);
+    service = new CollectionDataService(requestService, rdbService, objectCache, halService, null, notificationsService, null, null, translate);
   }
 
 });
diff --git a/src/app/core/data/collection-data.service.ts b/src/app/core/data/collection-data.service.ts
index c243b49d3f..c9ebc0e74f 100644
--- a/src/app/core/data/collection-data.service.ts
+++ b/src/app/core/data/collection-data.service.ts
@@ -1,6 +1,5 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 import { filter, map, switchMap, take } from 'rxjs/operators';
@@ -33,30 +32,27 @@ import {
 import { RequestService } from './request.service';
 import { BitstreamDataService } from './bitstream-data.service';
 import { RestRequest } from './rest-request.model';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from './find-list-options.model';
+import { Community } from '../shared/community.model';
 
 @Injectable()
 @dataService(COLLECTION)
 export class CollectionDataService extends ComColDataService<Collection> {
-  protected linkPath = 'collections';
   protected errorTitle = 'collection.source.update.notifications.error.title';
   protected contentSourceError = 'collection.source.update.notifications.error.content';
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected cds: CommunityDataService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
+    protected comparator: DSOChangeAnalyzer<Community>,
     protected notificationsService: NotificationsService,
-    protected http: HttpClient,
     protected bitstreamDataService: BitstreamDataService,
-    protected comparator: DSOChangeAnalyzer<Collection>,
-    protected translate: TranslateService
+    protected communityDataService: CommunityDataService,
+    protected translate: TranslateService,
   ) {
-    super();
+    super('collections', requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
   }
 
   /**
@@ -289,10 +285,10 @@ export class CollectionDataService extends ComColDataService<Collection> {
 
 
   protected getScopeCommunityHref(options: FindListOptions) {
-    return this.cds.getEndpoint().pipe(
-      map((endpoint: string) => this.cds.getIDHref(endpoint, options.scopeID)),
+    return this.communityDataService.getEndpoint().pipe(
+      map((endpoint: string) => this.communityDataService.getIDHref(endpoint, options.scopeID)),
       filter((href: string) => isNotEmpty(href)),
-      take(1)
+      take(1),
     );
   }
 }
diff --git a/src/app/core/data/comcol-data.service.spec.ts b/src/app/core/data/comcol-data.service.spec.ts
index dffc97f294..758cbad97a 100644
--- a/src/app/core/data/comcol-data.service.spec.ts
+++ b/src/app/core/data/comcol-data.service.spec.ts
@@ -47,7 +47,7 @@ class TestService extends ComColDataService<any> {
     protected comparator: DSOChangeAnalyzer<Community>,
     protected linkPath: string
   ) {
-    super();
+    super('something', requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
   }
 
   protected getFindByParentHref(parentUUID: string): Observable<string> {
diff --git a/src/app/core/data/comcol-data.service.ts b/src/app/core/data/comcol-data.service.ts
index 01cd18df0c..1b1ac3b27b 100644
--- a/src/app/core/data/comcol-data.service.ts
+++ b/src/app/core/data/comcol-data.service.ts
@@ -4,7 +4,6 @@ import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { Community } from '../shared/community.model';
 import { HALLink } from '../shared/hal-link.model';
-import { DataService } from './data.service';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -17,11 +16,44 @@ import { createFailedRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { FindListOptions } from './find-list-options.model';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import { PatchData, PatchDataImpl } from './base/patch-data';
+import { DeleteData, DeleteDataImpl } from './base/delete-data';
+import { FindAllData, FindAllDataImpl } from './base/find-all-data';
+import { SearchData, SearchDataImpl } from './base/search-data';
+import { RestRequestMethod } from './rest-request-method';
+import { CreateData, CreateDataImpl } from './base/create-data';
+import { RequestParam } from '../cache/models/request-param.model';
+import { RequestService } from './request.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
 
-export abstract class ComColDataService<T extends Community | Collection> extends DataService<T> {
-  protected abstract objectCache: ObjectCacheService;
-  protected abstract halService: HALEndpointService;
-  protected abstract bitstreamDataService: BitstreamDataService;
+export abstract class ComColDataService<T extends Community | Collection> extends IdentifiableDataService<T> implements CreateData<T>, FindAllData<T>, SearchData<T>, PatchData<T>, DeleteData<T> {
+  private createData: CreateData<T>;
+  private findAllData: FindAllData<T>;
+  private searchData: SearchData<T>;
+  private patchData: PatchData<T>;
+  private deleteData: DeleteData<T>;
+
+  protected constructor(
+    protected linkPath: string,
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected comparator: DSOChangeAnalyzer<T>,
+    protected notificationsService: NotificationsService,
+    protected bitstreamDataService: BitstreamDataService,
+  ) {
+    super(linkPath, requestService, rdbService, objectCache, halService);
+
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl<T>(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.patchData = new PatchDataImpl<T>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+  }
 
   /**
    * Get the scoped endpoint URL by fetching the object with
@@ -129,4 +161,128 @@ export abstract class ComColDataService<T extends Community | Collection> extend
     const parentCommunity = dso._links.parentCommunity;
     return isNotEmpty(parentCommunity) ? parentCommunity.href : null;
   }
+
+
+  /**
+   * Create a new object on the server, and store the response in the object cache
+   *
+   * @param object    The object to create
+   * @param params    Array with additional params to combine with query string
+   */
+  create(object: T, ...params: RequestParam[]): Observable<RemoteData<T>> {
+    return this.createData.create(object, ...params);
+  }
+
+  /**
+   * 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
+   */
+  public findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * 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> {
+    return this.findAllData.getFindAllHref(options, linkPath, ...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> {
+    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
+  }
+
+  /**
+   * 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
+   */
+  public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Commit current object changes to the server
+   * @param method The RestRequestMethod for which de server sync buffer should be committed
+   */
+  public commitUpdates(method?: RestRequestMethod): void {
+    this.patchData.commitUpdates(method);
+  }
+
+  /**
+   * 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
+   */
+  public patch(object: T, operations: []): Observable<RemoteData<T>> {
+    return this.patchData.patch(object, operations);
+  }
+
+  /**
+   * 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
+   */
+  public update(object: T): Observable<RemoteData<T>> {
+    return this.patchData.update(object);
+  }
+
+  /**
+   * Delete an existing 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
+   */
+  public delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.delete(objectId, copyVirtualMetadata);
+  }
+
+  /**
+   * Delete an existing 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.
+   */
+  public deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.deleteByHref(href, copyVirtualMetadata);
+  }
 }
diff --git a/src/app/core/data/community-data.service.ts b/src/app/core/data/community-data.service.ts
index 903d9bc79c..3062b15b1e 100644
--- a/src/app/core/data/community-data.service.ts
+++ b/src/app/core/data/community-data.service.ts
@@ -1,7 +1,5 @@
-import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 
-import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, map, switchMap, take } from 'rxjs/operators';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -19,27 +17,23 @@ import { RequestService } from './request.service';
 import { BitstreamDataService } from './bitstream-data.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { isNotEmpty } from '../../shared/empty.util';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from './find-list-options.model';
 
 @Injectable()
 @dataService(COMMUNITY)
 export class CommunityDataService extends ComColDataService<Community> {
-  protected linkPath = 'communities';
   protected topLinkPath = 'search/top';
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
+    protected comparator: DSOChangeAnalyzer<Community>,
     protected notificationsService: NotificationsService,
     protected bitstreamDataService: BitstreamDataService,
-    protected http: HttpClient,
-    protected comparator: DSOChangeAnalyzer<Community>
   ) {
-    super();
+    super('communities', requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
   }
 
   getEndpoint() {
diff --git a/src/app/core/data/configuration-data.service.spec.ts b/src/app/core/data/configuration-data.service.spec.ts
index 7077f098e0..7fe69c16e5 100644
--- a/src/app/core/data/configuration-data.service.spec.ts
+++ b/src/app/core/data/configuration-data.service.spec.ts
@@ -5,8 +5,6 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { GetRequest } from './request.models';
 import { RequestService } from './request.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
 import { ConfigurationDataService } from './configuration-data.service';
 import { ConfigurationProperty } from '../shared/configuration-property.model';
 
@@ -44,18 +42,12 @@ describe('ConfigurationDataService', () => {
       })
     });
     objectCache = {} as ObjectCacheService;
-    const notificationsService = {} as NotificationsService;
-    const http = {} as HttpClient;
-    const comparator = {} as any;
 
     service = new ConfigurationDataService(
       requestService,
       rdbService,
       objectCache,
       halService,
-      notificationsService,
-      http,
-      comparator
     );
   });
 
diff --git a/src/app/core/data/configuration-data.service.ts b/src/app/core/data/configuration-data.service.ts
index c8241aa9c7..ed62ee4933 100644
--- a/src/app/core/data/configuration-data.service.ts
+++ b/src/app/core/data/configuration-data.service.ts
@@ -1,55 +1,30 @@
 /* eslint-disable max-classes-per-file */
-import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { DataService } from './data.service';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
 import { ConfigurationProperty } from '../shared/configuration-property.model';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { CONFIG_PROPERTY } from '../shared/config-property.resource-type';
-import { CoreState } from '../core-state.model';
-
-class DataServiceImpl extends DataService<ConfigurationProperty> {
-  protected linkPath = 'properties';
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<ConfigurationProperty>) {
-    super();
-  }
-}
+import { IdentifiableDataService } from './base/identifiable-data.service';
 
 @Injectable()
 @dataService(CONFIG_PROPERTY)
 /**
  * Data Service responsible for retrieving Configuration properties
  */
-export class ConfigurationDataService {
-  protected linkPath = 'properties';
-  private dataService: DataServiceImpl;
+export class ConfigurationDataService extends IdentifiableDataService<ConfigurationProperty> {
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<ConfigurationProperty>) {
-    this.dataService = new DataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator);
+  ) {
+    super('properties', requestService, rdbService, objectCache, halService);
   }
 
   /**
@@ -57,6 +32,6 @@ export class ConfigurationDataService {
    * @param name
    */
   findByPropertyName(name: string): Observable<RemoteData<ConfigurationProperty>> {
-    return this.dataService.findById(name);
+    return this.findById(name);
   }
 }
diff --git a/src/app/core/data/dso-redirect-data.service.spec.ts b/src/app/core/data/dso-redirect-data.service.spec.ts
index 3f3a799e45..6bfd8dbd2e 100644
--- a/src/app/core/data/dso-redirect-data.service.spec.ts
+++ b/src/app/core/data/dso-redirect-data.service.spec.ts
@@ -1,22 +1,18 @@
-import { HttpClient } from '@angular/common/http';
-import { Store } from '@ngrx/store';
 import { cold, getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { followLink } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { DsoRedirectDataService } from './dso-redirect-data.service';
+import { DsoRedirectService } from './dso-redirect.service';
 import { GetRequest, IdentifierType } from './request.models';
 import { RequestService } from './request.service';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { Item } from '../shared/item.model';
-import { CoreState } from '../core-state.model';
 
-describe('DsoRedirectDataService', () => {
+describe('DsoRedirectService', () => {
   let scheduler: TestScheduler;
-  let service: DsoRedirectDataService;
+  let service: DsoRedirectService;
   let halService: HALEndpointService;
   let requestService: RequestService;
   let rdbService: RemoteDataBuildService;
@@ -29,10 +25,6 @@ describe('DsoRedirectDataService', () => {
   const requestHandleURL = `https://rest.api/rest/api/pid/find?id=${encodedHandle}`;
   const requestUUIDURL = `https://rest.api/rest/api/pid/find?id=${dsoUUID}`;
   const requestUUID = '34cfed7c-f597-49ef-9cbe-ea351f0023c2';
-  const store = {} as Store<CoreState>;
-  const notificationsService = {} as NotificationsService;
-  const http = {} as HttpClient;
-  const comparator = {} as any;
   const objectCache = {} as ObjectCacheService;
 
   beforeEach(() => {
@@ -59,20 +51,16 @@ describe('DsoRedirectDataService', () => {
         a: remoteData
       })
     });
-    service = new DsoRedirectDataService(
+    service = new DsoRedirectService(
       requestService,
       rdbService,
-      store,
       objectCache,
       halService,
-      notificationsService,
-      http,
-      comparator,
-      router
+      router,
     );
   });
 
-  describe('findById', () => {
+  describe('findByIdAndIDType', () => {
     it('should call HALEndpointService with the path to the pid endpoint', () => {
       scheduler.schedule(() => service.findByIdAndIDType(dsoHandle, IdentifierType.HANDLE));
       scheduler.flush();
@@ -141,7 +129,7 @@ describe('DsoRedirectDataService', () => {
       redir.subscribe();
       scheduler.schedule(() => redir);
       scheduler.flush();
-      expect(router.navigate).toHaveBeenCalledWith([remoteData.payload.type + 's/' + remoteData.payload.uuid]);
+      expect(router.navigate).toHaveBeenCalledWith(['/collections/' + remoteData.payload.uuid]);
     });
 
     it('should navigate to communities route', () => {
@@ -150,55 +138,58 @@ describe('DsoRedirectDataService', () => {
       redir.subscribe();
       scheduler.schedule(() => redir);
       scheduler.flush();
-      expect(router.navigate).toHaveBeenCalledWith(['communities/' + remoteData.payload.uuid]);
+      expect(router.navigate).toHaveBeenCalledWith(['/communities/' + remoteData.payload.uuid]);
     });
   });
 
-  describe('getIDHref', () => {
-    it('should return endpoint', () => {
-      const result = (service as any).getIDHref(pidLink, dsoUUID);
-      expect(result).toEqual(requestUUIDURL);
-    });
+  describe('DataService', () => {  // todo: should only test the id/uuid interpolation thingy
+    describe('getIDHref', () => {  // todo: should be able to move this up to IdentifiableDataService?
+      it('should return endpoint', () => {
+        const result = (service as any).dataService.getIDHref(pidLink, dsoUUID);
+        expect(result).toEqual(requestUUIDURL);
+      });
 
-    it('should include single linksToFollow as embed', () => {
-      const expected = `${requestUUIDURL}&embed=bundles`;
-      const result = (service as any).getIDHref(pidLink, dsoUUID, followLink('bundles'));
-      expect(result).toEqual(expected);
-    });
+      it('should include single linksToFollow as embed', () => {
+        const expected = `${requestUUIDURL}&embed=bundles`;
+        const result = (service as any).dataService.getIDHref(pidLink, dsoUUID, followLink('bundles'));
+        expect(result).toEqual(expected);
+      });
 
-    it('should include multiple linksToFollow as embed', () => {
-      const expected = `${requestUUIDURL}&embed=bundles&embed=owningCollection&embed=templateItemOf`;
-      const result = (service as any).getIDHref(pidLink, dsoUUID, followLink('bundles'), followLink('owningCollection'), followLink('templateItemOf'));
-      expect(result).toEqual(expected);
-    });
+      it('should include multiple linksToFollow as embed', () => {
+        const expected = `${requestUUIDURL}&embed=bundles&embed=owningCollection&embed=templateItemOf`;
+        const result = (service as any).dataService.getIDHref(pidLink, dsoUUID, followLink('bundles'), followLink('owningCollection'), followLink('templateItemOf'));
+        expect(result).toEqual(expected);
+      });
 
-    it('should not include linksToFollow with shouldEmbed = false', () => {
-      const expected = `${requestUUIDURL}&embed=templateItemOf`;
-      const result = (service as any).getIDHref(
-        pidLink,
-        dsoUUID,
-        followLink('bundles', { shouldEmbed: false }),
-        followLink('owningCollection', { shouldEmbed: false }),
-        followLink('templateItemOf')
-      );
-      expect(result).toEqual(expected);
-    });
+      it('should not include linksToFollow with shouldEmbed = false', () => {
+        const expected = `${requestUUIDURL}&embed=templateItemOf`;
+        const result = (service as any).dataService.getIDHref(
+          pidLink,
+          dsoUUID,
+          followLink('bundles', { shouldEmbed: false }),
+          followLink('owningCollection', { shouldEmbed: false }),
+          followLink('templateItemOf'),
+        );
+        expect(result).toEqual(expected);
+      });
 
-    it('should include nested linksToFollow 3lvl', () => {
-      const expected = `${requestUUIDURL}&embed=owningCollection/itemtemplate/relationships`;
-      const result = (service as any).getIDHref(
-        pidLink,
-        dsoUUID,
-        followLink('owningCollection',
-          {},
-          followLink('itemtemplate',
+      it('should include nested linksToFollow 3lvl', () => {
+        const expected = `${requestUUIDURL}&embed=owningCollection/itemtemplate/relationships`;
+        const result = (service as any).dataService.getIDHref(
+          pidLink,
+          dsoUUID,
+          followLink(
+            'owningCollection',
             {},
-            followLink('relationships')
-          )
-        )
-      );
-      expect(result).toEqual(expected);
+            followLink(
+              'itemtemplate',
+              {},
+              followLink('relationships'),
+            ),
+          ),
+        );
+        expect(result).toEqual(expected);
+      });
     });
   });
-
 });
diff --git a/src/app/core/data/dso-redirect-data.service.ts b/src/app/core/data/dso-redirect-data.service.ts
deleted file mode 100644
index 6270689f03..0000000000
--- a/src/app/core/data/dso-redirect-data.service.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { Router } from '@angular/router';
-import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
-import { tap } from 'rxjs/operators';
-import { hasValue } from '../../shared/empty.util';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { DataService } from './data.service';
-import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { RemoteData } from './remote-data';
-import { IdentifierType } from './request.models';
-import { RequestService } from './request.service';
-import { getFirstCompletedRemoteData } from '../shared/operators';
-import { DSpaceObject } from '../shared/dspace-object.model';
-import { Item } from '../shared/item.model';
-import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
-import { CoreState } from '../core-state.model';
-
-@Injectable()
-export class DsoRedirectDataService extends DataService<any> {
-
-  // Set the default link path to the identifier lookup endpoint.
-  protected linkPath = 'pid';
-  private uuidEndpoint = 'dso';
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DSOChangeAnalyzer<any>,
-    private router: Router) {
-    super();
-  }
-
-  setLinkPath(identifierType: IdentifierType) {
-    // The default 'pid' endpoint for identifiers does not support uuid lookups.
-    // For uuid lookups we need to change the linkPath.
-    if (identifierType === IdentifierType.UUID) {
-      this.linkPath = this.uuidEndpoint;
-    }
-  }
-
-  getIDHref(endpoint, resourceID, ...linksToFollow: FollowLinkConfig<any>[]): string {
-    // Supporting both identifier (pid) and uuid (dso) endpoints
-    return this.buildHrefFromFindOptions( endpoint.replace(/\{\?id\}/, `?id=${resourceID}`)
-        .replace(/\{\?uuid\}/, `?uuid=${resourceID}`),
-      {}, [], ...linksToFollow);
-  }
-
-  findByIdAndIDType(id: string, identifierType = IdentifierType.UUID): Observable<RemoteData<DSpaceObject>> {
-    this.setLinkPath(identifierType);
-    return this.findById(id).pipe(
-      getFirstCompletedRemoteData(),
-      tap((response) => {
-        if (response.hasSucceeded) {
-          const dso = response.payload;
-          const uuid = dso.uuid;
-          if (hasValue(uuid)) {
-            let newRoute = this.getEndpointFromDSOType(response.payload.type);
-            if (dso.type.startsWith('item')) {
-              newRoute = getItemPageRoute(dso as Item);
-            } else if (hasValue(newRoute)) {
-              newRoute += '/' + uuid;
-            }
-            if (hasValue(newRoute)) {
-              this.router.navigate([newRoute]);
-            }
-          }
-        }
-      })
-    );
-  }
-  // Is there an existing method somewhere else that converts dso type to route?
-  getEndpointFromDSOType(dsoType: string): string {
-    // Are there other types to consider?
-    if (dsoType.startsWith('item')) {
-      return 'items';
-    } else if (dsoType.startsWith('community')) {
-      return 'communities';
-    } else if (dsoType.startsWith('collection')) {
-      return 'collections';
-    } else {
-      return '';
-    }
-  }
-}
diff --git a/src/app/core/data/dso-redirect.service.ts b/src/app/core/data/dso-redirect.service.ts
new file mode 100644
index 0000000000..9e7277f2b1
--- /dev/null
+++ b/src/app/core/data/dso-redirect.service.ts
@@ -0,0 +1,90 @@
+/**
+ * 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/
+ */
+/* eslint-disable max-classes-per-file */
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+import { Observable } from 'rxjs';
+import { tap } from 'rxjs/operators';
+import { hasValue } from '../../shared/empty.util';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { RemoteData } from './remote-data';
+import { IdentifierType } from './request.models';
+import { RequestService } from './request.service';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import { getDSORoute } from '../../app-routing-paths';
+
+const ID_ENDPOINT = 'pid';
+const UUID_ENDPOINT = 'dso';
+
+class DsoByIdOrUUIDService extends IdentifiableDataService<DSpaceObject> {
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super(
+      undefined, requestService, rdbService, objectCache, halService, undefined,
+      // interpolate id/uuid as query parameter
+      (endpoint: string, resourceID: string): string => {
+        return endpoint.replace(/{\?id}/, `?id=${resourceID}`)
+                       .replace(/{\?uuid}/, `?uuid=${resourceID}`);
+      },
+    );
+  }
+
+  /**
+   * The default 'pid' endpoint for identifiers does not support uuid lookups.
+   * For uuid lookups we need to change the linkPath.
+   * @param identifierType
+   */
+  setLinkPath(identifierType: IdentifierType) {
+    if (identifierType === IdentifierType.UUID) {
+      this.linkPath = UUID_ENDPOINT;
+    } else {
+      this.linkPath = ID_ENDPOINT;
+    }
+  }
+}
+
+@Injectable()
+export class DsoRedirectService {
+  private dataService: DsoByIdOrUUIDService;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    private router: Router,
+  ) {
+    this.dataService = new DsoByIdOrUUIDService(requestService, rdbService, objectCache, halService);
+  }
+
+  findByIdAndIDType(id: string, identifierType = IdentifierType.UUID): Observable<RemoteData<DSpaceObject>> {
+    this.dataService.setLinkPath(identifierType);
+    return this.dataService.findById(id).pipe(
+      getFirstCompletedRemoteData(),
+      tap((response) => {
+        if (response.hasSucceeded) {
+          const dso = response.payload;
+          if (hasValue(dso.uuid)) {
+            let newRoute = getDSORoute(dso);
+            if (hasValue(newRoute)) {
+              this.router.navigate([newRoute]);
+            }
+          }
+        }
+      })
+    );
+  }
+}
diff --git a/src/app/core/data/dspace-object-data.service.spec.ts b/src/app/core/data/dspace-object-data.service.spec.ts
index 4b3fafa73a..0f167ea47e 100644
--- a/src/app/core/data/dspace-object-data.service.spec.ts
+++ b/src/app/core/data/dspace-object-data.service.spec.ts
@@ -7,8 +7,6 @@ import { GetRequest } from './request.models';
 import { RequestService } from './request.service';
 import { DSpaceObjectDataService } from './dspace-object-data.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
 
 describe('DSpaceObjectDataService', () => {
   let scheduler: TestScheduler;
@@ -42,18 +40,12 @@ describe('DSpaceObjectDataService', () => {
       })
     });
     objectCache = {} as ObjectCacheService;
-    const notificationsService = {} as NotificationsService;
-    const http = {} as HttpClient;
-    const comparator = {} as any;
 
     service = new DSpaceObjectDataService(
       requestService,
       rdbService,
       objectCache,
       halService,
-      notificationsService,
-      http,
-      comparator
     );
   });
 
diff --git a/src/app/core/data/dspace-object-data.service.ts b/src/app/core/data/dspace-object-data.service.ts
index ae0d525281..7ab29506aa 100644
--- a/src/app/core/data/dspace-object-data.service.ts
+++ b/src/app/core/data/dspace-object-data.service.ts
@@ -1,106 +1,28 @@
-/* eslint-disable max-classes-per-file */
-import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { DSPACE_OBJECT } from '../shared/dspace-object.resource-type';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { DataService } from './data.service';
-import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
-import { PaginatedList } from './paginated-list.model';
-import { CoreState } from '../core-state.model';
-import { FindListOptions } from './find-list-options.model';
-
-class DataServiceImpl extends DataService<DSpaceObject> {
-  protected linkPath = 'dso';
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DSOChangeAnalyzer<DSpaceObject>) {
-    super();
-  }
-
-  getIDHref(endpoint, resourceID,  ...linksToFollow: FollowLinkConfig<DSpaceObject>[]): string {
-    return this.buildHrefFromFindOptions( endpoint.replace(/\{\?uuid\}/, `?uuid=${resourceID}`),
-      {}, [], ...linksToFollow);
-  }
-}
+import { IdentifiableDataService } from './base/identifiable-data.service';
 
 @Injectable()
 @dataService(DSPACE_OBJECT)
-export class DSpaceObjectDataService {
-  protected linkPath = 'dso';
-  private dataService: DataServiceImpl;
-
+export class DSpaceObjectDataService extends IdentifiableDataService<DSpaceObject> {
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DSOChangeAnalyzer<DSpaceObject>) {
-    this.dataService = new DataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator);
+  ) {
+    super(
+      'dso', requestService, rdbService, objectCache, halService, undefined,
+      // interpolate uuid as query parameter
+      (endpoint: string, resourceID: string): string => {
+        return endpoint.replace(/{\?uuid}/, `?uuid=${resourceID}`);
+      },
+    );
   }
-
-  /**
-   * 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<DSpaceObject>[]): Observable<RemoteData<DSpaceObject>> {
-    return this.dataService.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-
-  }
-  /**
-   * 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
-   * @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, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<DSpaceObject>[]): Observable<RemoteData<DSpaceObject>> {
-    return this.dataService.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
-   * @param findListOptions             Find list options object
-   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
-   *                                    no valid cached version. Defaults to true
-   * @param reRequestOnStale            Whether or not the request should automatically be re-
-   *                                    requested after the response becomes stale
-   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
-   *                                    {@link HALLink}s should be automatically resolved
-   */
-  findAllByHref(href: string, findListOptions: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<DSpaceObject>[]): Observable<RemoteData<PaginatedList<DSpaceObject>>> {
-    return this.dataService.findAllByHref(href, findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-  }
-
 }
diff --git a/src/app/core/data/entity-type.service.ts b/src/app/core/data/entity-type.service.ts
index d08e6d28e7..0acb4adb03 100644
--- a/src/app/core/data/entity-type.service.ts
+++ b/src/app/core/data/entity-type.service.ts
@@ -1,13 +1,8 @@
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { DataService } from './data.service';
 import { RequestService } from './request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { filter, map, switchMap, take } from 'rxjs/operators';
@@ -17,27 +12,30 @@ import { PaginatedList } from './paginated-list.model';
 import { ItemType } from '../shared/item-relationships/item-type.model';
 import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
 import { RelationshipTypeService } from './relationship-type.service';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from './find-list-options.model';
+import { BaseDataService } from './base/base-data.service';
+import { SearchData, SearchDataImpl } from './base/search-data';
+import { FindAllData, FindAllDataImpl } from './base/find-all-data';
 
 /**
  * Service handling all ItemType requests
  */
 @Injectable()
-export class EntityTypeService extends DataService<ItemType> {
+export class EntityTypeService extends BaseDataService<ItemType> implements FindAllData<ItemType>, SearchData<ItemType> {
+  private findAllData: FindAllData<ItemType>;
+  private searchData: SearchDataImpl<ItemType>;
 
-  protected linkPath = 'entitytypes';
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected relationshipTypeService: RelationshipTypeService,
+  ) {
+    super('entitytypes', requestService, rdbService, objectCache, halService);
 
-  constructor(protected requestService: RequestService,
-              protected rdbService: RemoteDataBuildService,
-              protected store: Store<CoreState>,
-              protected halService: HALEndpointService,
-              protected objectCache: ObjectCacheService,
-              protected notificationsService: NotificationsService,
-              protected relationshipTypeService: RelationshipTypeService,
-              protected http: HttpClient,
-              protected comparator: DefaultChangeAnalyzer<ItemType>) {
-    super();
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   getBrowseEndpoint(options, linkPath?: string): Observable<string> {
@@ -158,7 +156,43 @@ export class EntityTypeService extends DataService<ItemType> {
     return this.halService.getEndpoint(this.linkPath).pipe(
       take(1),
       switchMap((endPoint: string) =>
-        this.findByHref(endPoint + '/label/' + label))
+        this.findByHref(endPoint + '/label/' + label)),
     );
   }
+
+  /**
+   * 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
+   */
+  public findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<ItemType>[]): Observable<RemoteData<PaginatedList<ItemType>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * 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?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<ItemType>[]): Observable<RemoteData<PaginatedList<ItemType>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
 }
diff --git a/src/app/core/data/eperson-registration.service.ts b/src/app/core/data/eperson-registration.service.ts
index 989a401733..3b033f693a 100644
--- a/src/app/core/data/eperson-registration.service.ts
+++ b/src/app/core/data/eperson-registration.service.ts
@@ -13,11 +13,9 @@ import { RegistrationResponseParsingService } from './registration-response-pars
 import { RemoteData } from './remote-data';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 
-@Injectable(
-  {
-    providedIn: 'root',
-  }
-)
+@Injectable({
+  providedIn: 'root',
+})
 /**
  * Service that will register a new email address and request a token
  */
diff --git a/src/app/core/data/external-source.service.spec.ts b/src/app/core/data/external-source.service.spec.ts
index 59226197d1..8a547b69f9 100644
--- a/src/app/core/data/external-source.service.spec.ts
+++ b/src/app/core/data/external-source.service.spec.ts
@@ -48,9 +48,9 @@ describe('ExternalSourceService', () => {
       buildList: createSuccessfulRemoteDataObject$(createPaginatedList(entries))
     });
     halService = jasmine.createSpyObj('halService', {
-      getEndpoint: observableOf('external-sources-REST-endpoint')
+      getEndpoint: observableOf('external-sources-REST-endpoint'),
     });
-    service = new ExternalSourceService(requestService, rdbService, undefined, undefined, halService, undefined, undefined, undefined);
+    service = new ExternalSourceService(requestService, rdbService, undefined, halService);
   }
 
   beforeEach(() => {
diff --git a/src/app/core/data/external-source.service.ts b/src/app/core/data/external-source.service.ts
index 6ea7e07d28..434b563191 100644
--- a/src/app/core/data/external-source.service.ts
+++ b/src/app/core/data/external-source.service.ts
@@ -1,13 +1,9 @@
 import { Injectable } from '@angular/core';
-import { DataService } from './data.service';
 import { ExternalSource } from '../shared/external-source.model';
 import { RequestService } from './request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { distinctUntilChanged, map, switchMap, take } from 'rxjs/operators';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
@@ -15,28 +11,27 @@ import { hasValue, isNotEmptyOperator } from '../../shared/empty.util';
 import { RemoteData } from './remote-data';
 import { PaginatedList } from './paginated-list.model';
 import { ExternalSourceEntry } from '../shared/external-source-entry.model';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from './find-list-options.model';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import { SearchData, SearchDataImpl } from './base/search-data';
 
 /**
  * A service handling all external source requests
  */
 @Injectable()
-export class ExternalSourceService extends DataService<ExternalSource> {
-  protected linkPath = 'externalsources';
+export class ExternalSourceService extends IdentifiableDataService<ExternalSource> implements SearchData<ExternalSource> {
+  private searchData: SearchData<ExternalSource>;
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<ExternalSource>) {
-    super();
+  ) {
+    super('externalsources', requestService, rdbService, objectCache, halService);
+
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
@@ -75,10 +70,28 @@ export class ExternalSourceService extends DataService<ExternalSource> {
       isNotEmptyOperator(),
       distinctUntilChanged(),
       map((endpoint: string) => hasValue(searchOptions) ? searchOptions.toRestUrl(endpoint) : endpoint),
-      take(1)
+      take(1),
     );
 
     // TODO create a dedicated ExternalSourceEntryDataService and move this entire method to it. Then the "as any"s won't be necessary
     return this.findAllByHref(href$, undefined, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow as any) as any;
   }
+
+  /**
+   * 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
+   */
+  public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<ExternalSource>[]): Observable<RemoteData<PaginatedList<ExternalSource>>> {
+    return undefined;
+  }
 }
diff --git a/src/app/core/data/feature-authorization/authorization-data.service.spec.ts b/src/app/core/data/feature-authorization/authorization-data.service.spec.ts
index df46d3f0a1..38b71a5c46 100644
--- a/src/app/core/data/feature-authorization/authorization-data.service.spec.ts
+++ b/src/app/core/data/feature-authorization/authorization-data.service.spec.ts
@@ -1,6 +1,5 @@
 import { AuthorizationDataService } from './authorization-data.service';
 import { SiteDataService } from '../site-data.service';
-import { AuthService } from '../../auth/auth.service';
 import { Site } from '../../shared/site.model';
 import { EPerson } from '../../eperson/models/eperson.model';
 import { of as observableOf } from 'rxjs';
@@ -16,7 +15,6 @@ import { FindListOptions } from '../find-list-options.model';
 describe('AuthorizationDataService', () => {
   let service: AuthorizationDataService;
   let siteService: SiteDataService;
-  let authService: AuthService;
 
   let site: Site;
   let ePerson: EPerson;
@@ -37,13 +35,9 @@ describe('AuthorizationDataService', () => {
       uuid: 'test-eperson'
     });
     siteService = jasmine.createSpyObj('siteService', {
-      find: observableOf(site)
+      find: observableOf(site),
     });
-    authService = {
-      isAuthenticated: () => observableOf(true),
-      getAuthenticatedUserFromStore: () => observableOf(ePerson)
-    } as AuthService;
-    service = new AuthorizationDataService(requestService, undefined, undefined, undefined, undefined, undefined, undefined, undefined, authService, siteService);
+    service = new AuthorizationDataService(requestService, undefined, undefined, undefined, siteService);
   }
 
   beforeEach(() => {
diff --git a/src/app/core/data/feature-authorization/authorization-data.service.ts b/src/app/core/data/feature-authorization/authorization-data.service.ts
index f27919844d..85df98f399 100644
--- a/src/app/core/data/feature-authorization/authorization-data.service.ts
+++ b/src/app/core/data/feature-authorization/authorization-data.service.ts
@@ -2,17 +2,11 @@ import { Observable, of as observableOf } from 'rxjs';
 import { Injectable } from '@angular/core';
 import { AUTHORIZATION } from '../../shared/authorization.resource-type';
 import { dataService } from '../../cache/builders/build-decorators';
-import { DataService } from '../data.service';
 import { Authorization } from '../../shared/authorization.model';
 import { RequestService } from '../request.service';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
-import { DSOChangeAnalyzer } from '../dso-change-analyzer.service';
-import { AuthService } from '../../auth/auth.service';
 import { SiteDataService } from '../site-data.service';
 import { followLink, FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { RemoteData } from '../remote-data';
@@ -24,31 +18,31 @@ import { AuthorizationSearchParams } from './authorization-search-params';
 import { addSiteObjectUrlIfEmpty, oneAuthorizationMatchesFeature } from './authorization-utils';
 import { FeatureID } from './feature-id';
 import { getFirstCompletedRemoteData } from '../../shared/operators';
-import { CoreState } from '../../core-state.model';
 import { FindListOptions } from '../find-list-options.model';
+import { BaseDataService } from '../base/base-data.service';
+import { SearchData, SearchDataImpl } from '../base/search-data';
 
 /**
  * A service to retrieve {@link Authorization}s from the REST API
  */
 @Injectable()
 @dataService(AUTHORIZATION)
-export class AuthorizationDataService extends DataService<Authorization> {
+export class AuthorizationDataService extends BaseDataService<Authorization> implements SearchData<Authorization> {
   protected linkPath = 'authorizations';
   protected searchByObjectPath = 'object';
 
+  private searchData: SearchDataImpl<Authorization>;
+
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DSOChangeAnalyzer<Authorization>,
-    protected authService: AuthService,
-    protected siteService: SiteDataService
+    protected siteService: SiteDataService,
   ) {
-    super();
+    super('authorizations', requestService, rdbService, objectCache, halService);
+
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
@@ -130,7 +124,25 @@ export class AuthorizationDataService extends DataService<Authorization> {
       params.push(new RequestParam('eperson', ePersonUuid));
     }
     return Object.assign(new FindListOptions(), options, {
-      searchParams: [...params]
+      searchParams: [...params],
     });
   }
+
+  /**
+   * 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?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Authorization>[]): Observable<RemoteData<PaginatedList<Authorization>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
 }
diff --git a/src/app/core/data/feature-authorization/feature-data.service.ts b/src/app/core/data/feature-authorization/feature-data.service.ts
index cbe8356660..bed6cd114d 100644
--- a/src/app/core/data/feature-authorization/feature-data.service.ts
+++ b/src/app/core/data/feature-authorization/feature-data.service.ts
@@ -1,36 +1,27 @@
 import { Injectable } from '@angular/core';
 import { FEATURE } from '../../shared/feature.resource-type';
 import { dataService } from '../../cache/builders/build-decorators';
-import { DataService } from '../data.service';
 import { Feature } from '../../shared/feature.model';
 import { RequestService } from '../request.service';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
-import { DSOChangeAnalyzer } from '../dso-change-analyzer.service';
-import { CoreState } from '../../core-state.model';
+import { BaseDataService } from '../base/base-data.service';
 
 /**
  * A service to retrieve {@link Feature}s from the REST API
  */
 @Injectable()
 @dataService(FEATURE)
-export class FeatureDataService extends DataService<Feature> {
+export class FeatureDataService extends BaseDataService<Feature> {
   protected linkPath = 'features';
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DSOChangeAnalyzer<Feature>
   ) {
-    super();
+    super('features', requestService, rdbService, objectCache, halService);
   }
 }
diff --git a/src/app/core/data/href-only-data.service.spec.ts b/src/app/core/data/href-only-data.service.spec.ts
index 64c451837d..ed8c91399d 100644
--- a/src/app/core/data/href-only-data.service.spec.ts
+++ b/src/app/core/data/href-only-data.service.spec.ts
@@ -1,8 +1,8 @@
 import { HrefOnlyDataService } from './href-only-data.service';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { DataService } from './data.service';
 import { FindListOptions } from './find-list-options.model';
+import { BaseDataService } from './base/base-data.service';
 
 describe(`HrefOnlyDataService`, () => {
   let service: HrefOnlyDataService;
@@ -15,12 +15,12 @@ describe(`HrefOnlyDataService`, () => {
     href = 'https://rest.api/server/api/core/items/de7fa215-4a25-43a7-a4d7-17534a09fdfc';
     followLinks = [ followLink('link1'), followLink('link2') ];
     findListOptions = new FindListOptions();
-    service = new HrefOnlyDataService(null, null, null, null, null, null, null, null);
+    service = new HrefOnlyDataService(null, null, null, null);
   });
 
   it(`should instantiate a private DataService`, () => {
     expect((service as any).dataService).toBeDefined();
-    expect((service as any).dataService).toBeInstanceOf(DataService);
+    expect((service as any).dataService).toBeInstanceOf(BaseDataService);
   });
 
     describe(`findByHref`, () => {
@@ -28,7 +28,7 @@ describe(`HrefOnlyDataService`, () => {
         spy = spyOn((service as any).dataService, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(null));
       });
 
-      it(`should delegate to findByHref on the internal DataService`, () => {
+      it(`should forward to findByHref on the internal DataService`, () => {
         service.findByHref(href, false, false, ...followLinks);
         expect(spy).toHaveBeenCalledWith(href, false, false, ...followLinks);
       });
diff --git a/src/app/core/data/href-only-data.service.ts b/src/app/core/data/href-only-data.service.ts
index 60c225cb34..ba5abe9340 100644
--- a/src/app/core/data/href-only-data.service.ts
+++ b/src/app/core/data/href-only-data.service.ts
@@ -1,13 +1,7 @@
-/* eslint-disable max-classes-per-file */
-import { DataService } from './data.service';
 import { RequestService } from './request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { Injectable } from '@angular/core';
 import { VOCABULARY_ENTRY } from '../submission/vocabularies/models/vocabularies.resource-type';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
@@ -18,25 +12,8 @@ import { PaginatedList } from './paginated-list.model';
 import { ITEM_TYPE } from '../shared/item-relationships/item-type.resource-type';
 import { LICENSE } from '../shared/license.resource-type';
 import { CacheableObject } from '../cache/cacheable-object.model';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from './find-list-options.model';
-
-class DataServiceImpl extends DataService<any> {
-  // linkPath isn't used if we're only searching by href.
-  protected linkPath = undefined;
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<any>) {
-    super();
-  }
-}
+import { BaseDataService } from './base/base-data.service';
 
 /**
  * A DataService with only findByHref methods. Its purpose is to be used for resources that don't
@@ -46,24 +23,25 @@ class DataServiceImpl extends DataService<any> {
  * an @dataService annotation can be added for any number of these resource types
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 @dataService(VOCABULARY_ENTRY)
 @dataService(ITEM_TYPE)
 @dataService(LICENSE)
 export class HrefOnlyDataService {
-  private dataService: DataServiceImpl;
+  /**
+   * Not all BaseDataService methods should be exposed, so
+   * @private
+   */
+  private dataService: BaseDataService<any>;
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<any>) {
-    this.dataService = new DataServiceImpl(requestService, rdbService, store, objectCache, halService, notificationsService, http, comparator);
+  ) {
+    this.dataService = new BaseDataService(undefined, requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/item-data.service.spec.ts b/src/app/core/data/item-data.service.spec.ts
index a4ed9f882f..01ccfe8c3b 100644
--- a/src/app/core/data/item-data.service.spec.ts
+++ b/src/app/core/data/item-data.service.spec.ts
@@ -21,7 +21,7 @@ import { HALEndpointServiceStub } from 'src/app/shared/testing/hal-endpoint-serv
 describe('ItemDataService', () => {
   let scheduler: TestScheduler;
   let service: ItemDataService;
-  let bs: BrowseService;
+  let browseService: BrowseService;
   const requestService = Object.assign(getMockRequestService(), {
     generateRequestId(): string {
       return scopeID;
@@ -78,14 +78,12 @@ describe('ItemDataService', () => {
     return new ItemDataService(
       requestService,
       rdbService,
-      store,
-      bs,
       objectCache,
       halEndpointService,
       notificationsService,
-      http,
       comparator,
-      bundleService
+      browseService,
+      bundleService,
     );
   }
 
@@ -95,7 +93,7 @@ describe('ItemDataService', () => {
     });
 
     it('should return the endpoint to fetch Items within the given scope and starting with the given string', () => {
-      bs = initMockBrowseService(true);
+      browseService = initMockBrowseService(true);
       service = initTestService();
 
       const result = service.getBrowseEndpoint(options);
@@ -106,7 +104,7 @@ describe('ItemDataService', () => {
 
     describe('if the dc.date.issue browse isn\'t configured for items', () => {
       beforeEach(() => {
-        bs = initMockBrowseService(false);
+        browseService = initMockBrowseService(false);
         service = initTestService();
       });
       it('should throw an error', () => {
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index cb5d7a3d57..ecc9e0e502 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -1,6 +1,13 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
+/**
+ * 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/
+ */
+/* eslint-disable max-classes-per-file */
+import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { distinctUntilChanged, filter, find, map, switchMap, take } from 'rxjs/operators';
 import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
@@ -16,12 +23,10 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
 import { ITEM } from '../shared/item.resource-type';
 import { URLCombiner } from '../url-combiner/url-combiner';
-
-import { DataService } from './data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
-import { DeleteRequest, GetRequest, PostRequest, PutRequest} from './request.models';
+import { DeleteRequest, GetRequest, PostRequest, PutRequest } from './request.models';
 import { RequestService } from './request.service';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { Bundle } from '../shared/bundle.model';
@@ -34,27 +39,41 @@ import { ResponseParsingService } from './parsing.service';
 import { StatusCodeOnlyResponseParsingService } from './status-code-only-response-parsing.service';
 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 { ConstructIdEndpoint, IdentifiableDataService } from './base/identifiable-data.service';
+import { PatchData, PatchDataImpl } from './base/patch-data';
+import { DeleteData, DeleteDataImpl } from './base/delete-data';
+import { RestRequestMethod } from './rest-request-method';
+import { CreateData, CreateDataImpl } from './base/create-data';
+import { RequestParam } from '../cache/models/request-param.model';
 
-@Injectable()
-@dataService(ITEM)
-export class ItemDataService extends DataService<Item> {
-  protected linkPath = 'items';
+/**
+ * An abstract service for CRUD operations on Items
+ * Doesn't specify an endpoint because multiple endpoints support Item-like functionality (e.g. items, itemtemplates)
+ * Extend this class to implement data services for Items
+ */
+export abstract class BaseItemDataService extends IdentifiableDataService<Item> implements CreateData<Item>, PatchData<Item>, DeleteData<Item> {
+  private createData: CreateData<Item>;
+  private patchData: PatchData<Item>;
+  private deleteData: DeleteData<Item>;
 
-  constructor(
+  protected constructor(
+    protected linkPath,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected bs: BrowseService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
-    protected http: HttpClient,
     protected comparator: DSOChangeAnalyzer<Item>,
-    protected bundleService: BundleDataService
+    protected browseService: BrowseService,
+    protected bundleService: BundleDataService,
+    protected constructIdEndpoint: ConstructIdEndpoint = (endpoint, resourceID) => `${endpoint}/${resourceID}`,
   ) {
-    super();
+    super(linkPath, requestService, rdbService, objectCache, halService, undefined, constructIdEndpoint);
+
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.patchData = new PatchDataImpl<Item>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
@@ -69,10 +88,11 @@ export class ItemDataService extends DataService<Item> {
     if (options.sort && options.sort.field) {
       field = options.sort.field;
     }
-    return this.bs.getBrowseURLFor(field, linkPath).pipe(
+    return this.browseService.getBrowseURLFor(field, linkPath).pipe(
       filter((href: string) => isNotEmpty(href)),
       map((href: string) => new URLCombiner(href, `?scope=${options.scopeID}`).toString()),
-      distinctUntilChanged(),);
+      distinctUntilChanged(),
+    );
   }
 
   /**
@@ -84,7 +104,7 @@ export class ItemDataService extends DataService<Item> {
   public getMappedCollectionsEndpoint(itemId: string, collectionId?: string): Observable<string> {
     return this.halService.getEndpoint(this.linkPath).pipe(
       map((endpoint: string) => this.getIDHref(endpoint, itemId)),
-      map((endpoint: string) => `${endpoint}/mappedCollections${collectionId ? `/${collectionId}` : ''}`)
+      map((endpoint: string) => `${endpoint}/mappedCollections${collectionId ? `/${collectionId}` : ''}`),
     );
   }
 
@@ -219,7 +239,7 @@ export class ItemDataService extends DataService<Item> {
   public getMoveItemEndpoint(itemId: string): Observable<string> {
     return this.halService.getEndpoint(this.linkPath).pipe(
       map((endpoint: string) => this.getIDHref(endpoint, itemId)),
-      map((endpoint: string) => `${endpoint}/owningCollection`)
+      map((endpoint: string) => `${endpoint}/owningCollection`),
     );
   }
 
@@ -299,4 +319,85 @@ export class ItemDataService extends DataService<Item> {
     this.requestService.setStaleByHrefSubstring('item/' + itemUUID);
   }
 
+  /**
+   * Commit current object changes to the server
+   * @param method The RestRequestMethod for which de server sync buffer should be committed
+   */
+  public commitUpdates(method?: RestRequestMethod): void {
+    this.patchData.commitUpdates(method);
+  }
+
+  /**
+   * 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
+   */
+  public patch(object: Item, operations: Operation[]): Observable<RemoteData<Item>> {
+    return this.patchData.patch(object, operations);
+  }
+
+  /**
+   * 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
+   */
+  public update(object: Item): Observable<RemoteData<Item>> {
+    return this.patchData.update(object);
+  }
+
+  /**
+   * Delete an existing 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
+   */
+  public delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.delete(objectId, copyVirtualMetadata);
+  }
+
+  /**
+   * Delete an existing 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.
+   */
+  public deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.deleteByHref(href, copyVirtualMetadata);
+  }
+
+  /**
+   * Create a new object on the server, and store the response in the object cache
+   *
+   * @param object    The object to create
+   * @param params    Array with additional params to combine with query string
+   */
+  public create(object: Item, ...params: RequestParam[]): Observable<RemoteData<Item>> {
+    return this.createData.create(object, ...params);
+  }
+
+}
+
+/**
+ * A service for CRUD operations on Items
+ */
+@Injectable()
+@dataService(ITEM)
+export class ItemDataService extends BaseItemDataService {
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected comparator: DSOChangeAnalyzer<Item>,
+    protected browseService: BrowseService,
+    protected bundleService: BundleDataService,
+  ) {
+    super('items', requestService, rdbService, objectCache, halService, notificationsService, comparator, browseService, bundleService);
+  }
 }
diff --git a/src/app/core/data/item-request-data.service.spec.ts b/src/app/core/data/item-request-data.service.spec.ts
index 0d99ca5cd4..a5d1872510 100644
--- a/src/app/core/data/item-request-data.service.spec.ts
+++ b/src/app/core/data/item-request-data.service.spec.ts
@@ -35,7 +35,7 @@ describe('ItemRequestDataService', () => {
       getEndpoint: observableOf(restApiEndpoint),
     });
 
-    service = new ItemRequestDataService(requestService, rdbService, null, null, halService, null, null, null);
+    service = new ItemRequestDataService(requestService, rdbService, null, halService);
   });
 
   describe('requestACopy', () => {
diff --git a/src/app/core/data/item-request-data.service.ts b/src/app/core/data/item-request-data.service.ts
index 2bab0b304f..ff6025f7ac 100644
--- a/src/app/core/data/item-request-data.service.ts
+++ b/src/app/core/data/item-request-data.service.ts
@@ -9,40 +9,27 @@ import { PostRequest, PutRequest } from './request.models';
 import { RequestService } from './request.service';
 import { ItemRequest } from '../shared/item-request.model';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { DataService } from './data.service';
-import { Store } from '@ngrx/store';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
+import { HttpHeaders } from '@angular/common/http';
 import { RequestCopyEmail } from '../../request-copy/email-request-copy/request-copy-email.model';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { CoreState } from '../core-state.model';
 import { sendRequest } from '../shared/request.operators';
+import { IdentifiableDataService } from './base/identifiable-data.service';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the itemrequests endpoint
  */
-@Injectable(
-  {
-    providedIn: 'root',
-  }
-)
-export class ItemRequestDataService extends DataService<ItemRequest> {
-
-  protected linkPath = 'itemrequests';
-
+@Injectable({
+  providedIn: 'root',
+})
+export class ItemRequestDataService extends IdentifiableDataService<ItemRequest> {
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<ItemRequest>,
   ) {
-    super();
+    super('itemrequests', requestService, rdbService, objectCache, halService);
   }
 
   getItemRequestEndpoint(): Observable<string> {
@@ -124,9 +111,9 @@ export class ItemRequestDataService extends DataService<ItemRequest> {
           suggestOpenAccess,
         }), options);
       }),
-      sendRequest(this.requestService)).subscribe();
+      sendRequest(this.requestService),
+    ).subscribe();
 
     return this.rdbService.buildFromRequestUUID(requestId);
   }
-
 }
diff --git a/src/app/core/data/item-template-data.service.spec.ts b/src/app/core/data/item-template-data.service.spec.ts
index 4b8aa362ba..b73287f50f 100644
--- a/src/app/core/data/item-template-data.service.spec.ts
+++ b/src/app/core/data/item-template-data.service.spec.ts
@@ -8,17 +8,17 @@ import { BrowseService } from '../browse/browse.service';
 import { cold } from 'jasmine-marbles';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
 import { CollectionDataService } from './collection-data.service';
 import { RestRequestMethod } from './rest-request-method';
 import { Item } from '../shared/item.model';
 import { RestRequest } from './rest-request.model';
 import { CoreState } from '../core-state.model';
 import { RequestEntry } from './request-entry.model';
+import createSpyObj = jasmine.createSpyObj;
 
 describe('ItemTemplateDataService', () => {
   let service: ItemTemplateDataService;
-  let itemService: any;
+  let byCollection: any;
 
   const item = new Item();
   const collectionEndpoint = 'https://rest.api/core/collections/4af28e99-6a9c-4036-a199-e1b587046d39';
@@ -47,14 +47,14 @@ describe('ItemTemplateDataService', () => {
   } as RequestService;
   const rdbService = {} as RemoteDataBuildService;
   const store = {} as Store<CoreState>;
-  const bs = {} as BrowseService;
+  const browseService = {} as BrowseService;
   const objectCache = {
     getObjectBySelfLink(self) {
       return observableOf({});
     },
     addPatch(self, operations) {
       // Do nothing
-    }
+    },
   } as any;
   const halEndpointService = {
     getEndpoint(linkPath: string): Observable<string> {
@@ -62,7 +62,6 @@ describe('ItemTemplateDataService', () => {
     }
   } as HALEndpointService;
   const notificationsService = {} as NotificationsService;
-  const http = {} as HttpClient;
   const comparator = {
     diff(first, second) {
       return [{}];
@@ -78,60 +77,61 @@ describe('ItemTemplateDataService', () => {
     service = new ItemTemplateDataService(
       requestService,
       rdbService,
-      store,
-      bs,
       objectCache,
       halEndpointService,
       notificationsService,
-      http,
       comparator,
+      browseService,
       undefined,
-      collectionService
+      collectionService,
     );
-    itemService = (service as any).dataService;
+    byCollection = (service as any).byCollection;
   }
 
   beforeEach(() => {
     initTestService();
   });
 
-  describe('commitUpdates', () => {
-    it('should call commitUpdates on the item service implementation', () => {
-      spyOn(itemService, 'commitUpdates');
-      service.commitUpdates();
-      expect(itemService.commitUpdates).toHaveBeenCalled();
-    });
-  });
-
-  describe('update', () => {
-    it('should call update on the item service implementation', () => {
-      spyOn(itemService, 'update');
-      service.update(item);
-      expect(itemService.update).toHaveBeenCalled();
-    });
-  });
-
   describe('findByCollectionID', () => {
-    it('should call findByCollectionID on the item service implementation', () => {
-      spyOn(itemService, 'findByCollectionID');
+    it('should call findByCollectionID on the collection-based data service', () => {
+      spyOn(byCollection, 'findById');
       service.findByCollectionID(scopeID);
-      expect(itemService.findByCollectionID).toHaveBeenCalled();
+      expect(byCollection.findById).toHaveBeenCalled();
     });
   });
 
-  describe('create', () => {
-    it('should call createTemplate on the item service implementation', () => {
-      spyOn(itemService, 'createTemplate');
-      service.create(item, scopeID);
-      expect(itemService.createTemplate).toHaveBeenCalled();
+  describe('createByCollectionID', () => {
+    it('should call createTemplate on the collection-based data service', () => {
+      spyOn(byCollection, 'createTemplate');
+      service.createByCollectionID(item, scopeID);
+      expect(byCollection.createTemplate).toHaveBeenCalledWith(item, scopeID);
     });
   });
 
-  describe('deleteByCollectionID', () => {
-    it('should call deleteByCollectionID on the item service implementation', () => {
-      spyOn(itemService, 'deleteByCollectionID');
-      service.deleteByCollectionID(item, scopeID);
-      expect(itemService.deleteByCollectionID).toHaveBeenCalled();
+  describe('byCollection', () => {
+    beforeEach(() => {
+      byCollection.createData = createSpyObj('createData', {
+        createOnEndpoint: 'TEST createOnEndpoint',
+      });
+    });
+
+    describe('getIDHrefObs', () => {
+      it('should point to the Item template of a given Collection', () => {
+        expect(byCollection.getIDHrefObs(scopeID)).toBeObservable(cold('a', { a: jasmine.stringMatching(`/collections/${scopeID}/itemtemplate`) }));
+      });
+    });
+
+    describe('createTemplate', () => {
+      it('should forward to CreateDataImpl.createOnEndpoint', () => {
+        spyOn(byCollection, 'getIDHrefObs').and.returnValue('TEST getIDHrefObs');
+
+        const out = byCollection.createTemplate(item, scopeID);
+
+        expect(byCollection.getIDHrefObs).toHaveBeenCalledWith(scopeID);
+        expect(byCollection.createData.createOnEndpoint).toHaveBeenCalledWith(item, 'TEST getIDHrefObs');
+        expect(out).toBe('TEST createOnEndpoint');
+      });
     });
   });
 });
+
diff --git a/src/app/core/data/item-template-data.service.ts b/src/app/core/data/item-template-data.service.ts
index fd9f7de031..634c966dba 100644
--- a/src/app/core/data/item-template-data.service.ts
+++ b/src/app/core/data/item-template-data.service.ts
@@ -1,147 +1,62 @@
 /* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
-import { ItemDataService } from './item-data.service';
-import { UpdateDataService } from './update-data.service';
+import { BaseItemDataService } from './item-data.service';
 import { Item } from '../shared/item.model';
-import { RestRequestMethod } from './rest-request-method';
 import { RemoteData } from './remote-data';
 import { Observable } from 'rxjs';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
 import { RequestService } from './request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
 import { BrowseService } from '../browse/browse.service';
 import { CollectionDataService } from './collection-data.service';
-import { map, switchMap } from 'rxjs/operators';
+import { switchMap } from 'rxjs/operators';
 import { BundleDataService } from './bundle-data.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { NoContent } from '../shared/NoContent.model';
-import { hasValue } from '../../shared/empty.util';
-import { Operation } from 'fast-json-patch';
-import { getFirstCompletedRemoteData } from '../shared/operators';
-import { CoreState } from '../core-state.model';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import { CreateDataImpl } from './base/create-data';
 
 /**
- * A custom implementation of the ItemDataService, but for collection item templates
- * Makes sure to change the endpoint before sending out CRUD requests for the item template
+ * Data service for interacting with Item templates via their Collection
  */
-class DataServiceImpl extends ItemDataService {
-  protected collectionLinkPath = 'itemtemplate';
-  protected linkPath = 'itemtemplates';
-
-  /**
-   * Endpoint dynamically changing depending on what request we're sending
-   */
-  private endpoint$: Observable<string>;
-
-  /**
-   * Is the current endpoint based on a collection?
-   */
-  private collectionEndpoint = false;
+class CollectionItemTemplateDataService extends IdentifiableDataService<Item> {
+  private createData: CreateDataImpl<Item>;
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected bs: BrowseService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DSOChangeAnalyzer<Item>,
-    protected bundleService: BundleDataService,
-    protected collectionService: CollectionDataService) {
-    super(requestService, rdbService, store, bs, objectCache, halService, notificationsService, http, comparator, bundleService);
+    protected collectionService: CollectionDataService,
+  ) {
+    super('itemtemplates', requestService, rdbService, objectCache, halService, undefined);
+
+    // We only intend to use createOnEndpoint, so this inner data service feature doesn't need an endpoint at all
+    this.createData = new CreateDataImpl<Item>(undefined, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
   }
 
   /**
-   * Get the endpoint based on a collection
-   * @param collectionID  The ID of the collection to base the endpoint on
+   * Create an observable for the HREF of a specific object based on its identifier
+   *
+   * Overridden to ensure that {@link findById} works with Collection IDs and points to the template.
+   * @param collectionID  the ID of a Collection
    */
-  public getCollectionEndpoint(collectionID: string): Observable<string> {
+  public getIDHrefObs(collectionID: string): Observable<string> {
     return this.collectionService.getIDHrefObs(collectionID).pipe(
-      switchMap((href: string) => this.halService.getEndpoint(this.collectionLinkPath, href))
+      switchMap((href: string) => this.halService.getEndpoint('itemtemplate', href)),
     );
   }
 
   /**
-   * Set the endpoint to be based on a collection
-   * @param collectionID  The ID of the collection to base the endpoint on
-   */
-  private setCollectionEndpoint(collectionID: string) {
-    this.collectionEndpoint = true;
-    this.endpoint$ = this.getCollectionEndpoint(collectionID);
-  }
-
-  /**
-   * Set the endpoint to the regular linkPath
-   */
-  private setRegularEndpoint() {
-    this.collectionEndpoint = false;
-    this.endpoint$ = this.halService.getEndpoint(this.linkPath);
-  }
-
-  /**
-   * Get the base endpoint for all requests
-   * Uses the current collectionID to assemble a request endpoint for the collection's item template
-   */
-  protected getEndpoint(): Observable<string> {
-    return this.endpoint$;
-  }
-
-  /**
-   * If the current endpoint is based on a collection, simply return the collection's template endpoint, otherwise
-   * create a regular template endpoint
-   * @param resourceID
-   */
-  getIDHrefObs(resourceID: string): Observable<string> {
-    if (this.collectionEndpoint) {
-      return this.getEndpoint();
-    } else {
-      return super.getIDHrefObs(resourceID);
-    }
-  }
-
-  /**
-   * Set the collection ID and send a find by ID request
-   * @param collectionID
-   * @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
-   */
-  findByCollectionID(collectionID: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Item>[]): Observable<RemoteData<Item>> {
-    this.setCollectionEndpoint(collectionID);
-    return super.findById(collectionID, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-  }
-
-  /**
-   * Set the collection ID and send a create request
+   * Create a new item template for a Collection by ID
    * @param item
    * @param collectionID
    */
-  createTemplate(item: Item, collectionID: string): Observable<RemoteData<Item>> {
-    this.setCollectionEndpoint(collectionID);
-    return super.create(item);
-  }
-
-  /**
-   * Set the collection ID and send a delete request
-   * @param item
-   * @param collectionID
-   */
-  deleteByCollectionID(item: Item, collectionID: string): Observable<boolean> {
-    this.setRegularEndpoint();
-    return super.delete(item.uuid).pipe(
-      getFirstCompletedRemoteData(),
-      map((response: RemoteData<NoContent>) => hasValue(response) && response.hasSucceeded)
-    );
+  public createTemplate(item: Item, collectionID: string): Observable<RemoteData<Item>> {
+    return this.createData.createOnEndpoint(item, this.getIDHrefObs(collectionID));
   }
 }
 
@@ -149,43 +64,23 @@ class DataServiceImpl extends ItemDataService {
  * A service responsible for fetching/sending data from/to the REST API on a collection's itemtemplates endpoint
  */
 @Injectable()
-export class ItemTemplateDataService implements UpdateDataService<Item> {
-  /**
-   * The data service responsible for all CRUD actions on the item
-   */
-  private dataService: DataServiceImpl;
+export class ItemTemplateDataService extends BaseItemDataService {
+  private byCollection: CollectionItemTemplateDataService;
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected bs: BrowseService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
-    protected http: HttpClient,
     protected comparator: DSOChangeAnalyzer<Item>,
+    protected browseService: BrowseService,
     protected bundleService: BundleDataService,
-    protected collectionService: CollectionDataService) {
-    this.dataService = new DataServiceImpl(requestService, rdbService, store, bs, objectCache, halService, notificationsService, http, comparator, bundleService, collectionService);
-  }
+    protected collectionService: CollectionDataService,
+  ) {
+    super('itemtemplates', requestService, rdbService, objectCache, halService, notificationsService, comparator, browseService, bundleService);
 
-  /**
-   * Commit current object changes to the server
-   */
-  commitUpdates(method?: RestRequestMethod) {
-    this.dataService.commitUpdates(method);
-  }
-
-  /**
-   * Add a new patch to the object cache
-   */
-  update(object: Item): Observable<RemoteData<Item>> {
-    return this.dataService.update(object);
-  }
-
-  patch(dso: Item, operations: Operation[]): Observable<RemoteData<Item>> {
-    return this.dataService.patch(dso, operations);
+    this.byCollection = new CollectionItemTemplateDataService(requestService, rdbService, objectCache, halService, notificationsService, collectionService);
   }
 
   /**
@@ -199,7 +94,7 @@ export class ItemTemplateDataService implements UpdateDataService<Item> {
    *                                    {@link HALLink}s should be automatically resolved
    */
   findByCollectionID(collectionID: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Item>[]): Observable<RemoteData<Item>> {
-    return this.dataService.findByCollectionID(collectionID, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+    return this.byCollection.findById(collectionID, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
   /**
@@ -207,17 +102,8 @@ export class ItemTemplateDataService implements UpdateDataService<Item> {
    * @param item
    * @param collectionID
    */
-  create(item: Item, collectionID: string): Observable<RemoteData<Item>> {
-    return this.dataService.createTemplate(item, collectionID);
-  }
-
-  /**
-   * Delete a template item by collection ID
-   * @param item
-   * @param collectionID
-   */
-  deleteByCollectionID(item: Item, collectionID: string): Observable<boolean> {
-    return this.dataService.deleteByCollectionID(item, collectionID);
+  createByCollectionID(item: Item, collectionID: string): Observable<RemoteData<Item>> {
+    return this.byCollection.createTemplate(item, collectionID);
   }
 
   /**
@@ -225,6 +111,6 @@ export class ItemTemplateDataService implements UpdateDataService<Item> {
    * @param collectionID  The ID of the collection to base the endpoint on
    */
   getCollectionEndpoint(collectionID: string): Observable<string> {
-    return this.dataService.getCollectionEndpoint(collectionID);
+    return this.byCollection.getIDHrefObs(collectionID);
   }
 }
diff --git a/src/app/core/data/metadata-field-data.service.spec.ts b/src/app/core/data/metadata-field-data.service.spec.ts
index 54a174e365..09cbcb908a 100644
--- a/src/app/core/data/metadata-field-data.service.spec.ts
+++ b/src/app/core/data/metadata-field-data.service.spec.ts
@@ -10,6 +10,7 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { RequestParam } from '../cache/models/request-param.model';
 import { FindListOptions } from './find-list-options.model';
+import { createPaginatedList } from '../../shared/testing/utils.test';
 
 describe('MetadataFieldDataService', () => {
   let metadataFieldService: MetadataFieldDataService;
@@ -33,16 +34,19 @@ describe('MetadataFieldDataService', () => {
       generateRequestId: '34cfed7c-f597-49ef-9cbe-ea351f0023c2',
       send: {},
       getByUUID: observableOf({ response: new RestResponse(true, 200, 'OK') }),
-      setStaleByHrefSubstring: {}
+      setStaleByHrefSubstring: {},
     });
     halService = Object.assign(new HALEndpointServiceStub(endpoint));
     notificationsService = jasmine.createSpyObj('notificationsService', {
-      error: {}
+      error: {},
     });
     rdbService = jasmine.createSpyObj('rdbService', {
-      buildSingle: createSuccessfulRemoteDataObject$(undefined)
+      buildSingle: createSuccessfulRemoteDataObject$(undefined),
+      buildList: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     });
-    metadataFieldService = new MetadataFieldDataService(requestService, rdbService, undefined, halService, undefined, undefined, undefined, notificationsService);
+    metadataFieldService = new MetadataFieldDataService(
+      requestService, rdbService, undefined, halService, notificationsService,
+    );
   }
 
   beforeEach(() => {
diff --git a/src/app/core/data/metadata-field-data.service.ts b/src/app/core/data/metadata-field-data.service.ts
index 5a78213c84..e54ccb71c3 100644
--- a/src/app/core/data/metadata-field-data.service.ts
+++ b/src/app/core/data/metadata-field-data.service.ts
@@ -1,17 +1,11 @@
 import { Injectable } from '@angular/core';
 import { hasValue } from '../../shared/empty.util';
 import { dataService } from '../cache/builders/build-decorators';
-import { DataService } from './data.service';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
-import { HttpClient } from '@angular/common/http';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { METADATA_FIELD } from '../metadata/metadata-field.resource-type';
 import { MetadataField } from '../metadata/metadata-field.model';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
@@ -19,29 +13,43 @@ import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { RequestParam } from '../cache/models/request-param.model';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from './find-list-options.model';
+import { SearchData, SearchDataImpl } from './base/search-data';
+import { PutData, PutDataImpl } from './base/put-data';
+import { CreateData, CreateDataImpl } from './base/create-data';
+import { NoContent } from '../shared/NoContent.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { DeleteData, DeleteDataImpl } from './base/delete-data';
+import { IdentifiableDataService } from './base/identifiable-data.service';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the metadatafields endpoint
  */
 @Injectable()
 @dataService(METADATA_FIELD)
-export class MetadataFieldDataService extends DataService<MetadataField> {
-  protected linkPath = 'metadatafields';
+export class MetadataFieldDataService extends IdentifiableDataService<MetadataField> implements CreateData<MetadataField>, PutData<MetadataField>, DeleteData<MetadataField>, SearchData<MetadataField> {
+  private createData: CreateData<MetadataField>;
+  private searchData: SearchData<MetadataField>;
+  private putData: PutData<MetadataField>;
+  private deleteData: DeleteData<MetadataField>;
+
   protected searchBySchemaLinkPath = 'bySchema';
   protected searchByFieldNameLinkPath = 'byFieldName';
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected halService: HALEndpointService,
     protected objectCache: ObjectCacheService,
-    protected comparator: DefaultChangeAnalyzer<MetadataField>,
-    protected http: HttpClient,
-    protected notificationsService: NotificationsService) {
-    super();
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('metadatafields', requestService, rdbService, objectCache, halService);
+
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.putData = new PutDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
@@ -57,7 +65,7 @@ export class MetadataFieldDataService extends DataService<MetadataField> {
    */
   findBySchema(schema: MetadataSchema, options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<MetadataField>[]) {
     const optionsWithSchema = Object.assign(new FindListOptions(), options, {
-      searchParams: [new RequestParam('schema', schema.prefix)]
+      searchParams: [new RequestParam('schema', schema.prefix)],
     });
     return this.searchBy(this.searchBySchemaLinkPath, optionsWithSchema, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
@@ -85,8 +93,8 @@ export class MetadataFieldDataService extends DataService<MetadataField> {
         new RequestParam('element', hasValue(element) ? element : ''),
         new RequestParam('qualifier', hasValue(qualifier) ? qualifier : ''),
         new RequestParam('query', hasValue(query) ? query : ''),
-        new RequestParam('exactName', hasValue(exactName) ? exactName : '')
-      ]
+        new RequestParam('exactName', hasValue(exactName) ? exactName : ''),
+      ],
     });
     return this.searchBy(this.searchByFieldNameLinkPath, optionParams, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
@@ -112,4 +120,80 @@ export class MetadataFieldDataService extends DataService<MetadataField> {
 
   }
 
+
+  /**
+   * Delete an existing 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.deleteData.delete(objectId, copyVirtualMetadata);
+  }
+
+  /**
+   * Delete an existing 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.
+   */
+  public deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.deleteByHref(href, copyVirtualMetadata);
+  }
+
+  /**
+   * Send a PUT request for the specified object
+   *
+   * @param object The object to send a put request for.
+   */
+  put(object: MetadataField): Observable<RemoteData<MetadataField>> {
+    return this.putData.put(object);
+  }
+
+  /**
+   * Create a new object on the server, and store the response in the object cache
+   *
+   * @param object    The object to create
+   * @param params    Array with additional params to combine with query string
+   */
+  create(object: MetadataField, ...params: RequestParam[]): Observable<RemoteData<MetadataField>> {
+    return this.createData.create(object, ...params);
+  }
+
+  /**
+   * 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<MetadataField>[]): Observable<string> {
+    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
+  }
+
+  /**
+   * 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
+   */
+  public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<MetadataField>[]): Observable<RemoteData<PaginatedList<MetadataField>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
 }
diff --git a/src/app/core/data/metadata-schema-data.service.spec.ts b/src/app/core/data/metadata-schema-data.service.spec.ts
index 2e61955502..9c8fb9ca00 100644
--- a/src/app/core/data/metadata-schema-data.service.spec.ts
+++ b/src/app/core/data/metadata-schema-data.service.spec.ts
@@ -24,14 +24,20 @@ describe('MetadataSchemaDataService', () => {
       generateRequestId: '34cfed7c-f597-49ef-9cbe-ea351f0023c2',
       send: {},
       getByUUID: observableOf({ response: new RestResponse(true, 200, 'OK') }),
-      removeByHrefSubstring: {}
+      removeByHrefSubstring: {},
     });
     halService = Object.assign(new HALEndpointServiceStub(endpoint));
     notificationsService = jasmine.createSpyObj('notificationsService', {
-      error: {}
+      error: {},
     });
     rdbService = getMockRemoteDataBuildService();
-    metadataSchemaService = new MetadataSchemaDataService(requestService, rdbService, undefined, halService, undefined, undefined, undefined, notificationsService);
+    metadataSchemaService = new MetadataSchemaDataService(
+      requestService,
+      rdbService,
+      null,
+      halService,
+      notificationsService,
+    );
   }
 
   beforeEach(() => {
diff --git a/src/app/core/data/metadata-schema-data.service.ts b/src/app/core/data/metadata-schema-data.service.ts
index f277f6cab6..97f806d237 100644
--- a/src/app/core/data/metadata-schema-data.service.ts
+++ b/src/app/core/data/metadata-schema-data.service.ts
@@ -1,6 +1,4 @@
-import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
@@ -8,33 +6,45 @@ import { ObjectCacheService } from '../cache/object-cache.service';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
 import { METADATA_SCHEMA } from '../metadata/metadata-schema.resource-type';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { DataService } from './data.service';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { RequestService } from './request.service';
 import { Observable } from 'rxjs';
 import { hasValue } from '../../shared/empty.util';
 import { tap } from 'rxjs/operators';
 import { RemoteData } from './remote-data';
-import { CoreState } from '../core-state.model';
+import { PutData, PutDataImpl } from './base/put-data';
+import { CreateData, CreateDataImpl } from './base/create-data';
+import { NoContent } from '../shared/NoContent.model';
+import { FindAllData, FindAllDataImpl } from './base/find-all-data';
+import { FindListOptions } from './find-list-options.model';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { PaginatedList } from './paginated-list.model';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import { DeleteData, DeleteDataImpl } from './base/delete-data';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the metadataschemas endpoint
  */
 @Injectable()
 @dataService(METADATA_SCHEMA)
-export class MetadataSchemaDataService extends DataService<MetadataSchema> {
-  protected linkPath = 'metadataschemas';
+export class MetadataSchemaDataService extends IdentifiableDataService<MetadataSchema> implements FindAllData<MetadataSchema>, DeleteData<MetadataSchema> {
+  private createData: CreateData<MetadataSchema>;
+  private findAllData: FindAllData<MetadataSchema>;
+  private putData: PutData<MetadataSchema>;
+  private deleteData: DeleteData<MetadataSchema>;
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected halService: HALEndpointService,
     protected objectCache: ObjectCacheService,
-    protected comparator: DefaultChangeAnalyzer<MetadataSchema>,
-    protected http: HttpClient,
-    protected notificationsService: NotificationsService) {
-    super();
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('metadataschemas', requestService, rdbService, objectCache, halService);
+
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.putData = new PutDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
@@ -49,9 +59,9 @@ export class MetadataSchemaDataService extends DataService<MetadataSchema> {
     const isUpdate = hasValue(schema.id);
 
     if (isUpdate) {
-      return this.put(schema);
+      return this.putData.put(schema);
     } else {
-      return this.create(schema);
+      return this.createData.create(schema);
     }
   }
 
@@ -61,8 +71,50 @@ export class MetadataSchemaDataService extends DataService<MetadataSchema> {
    */
   clearRequests(): Observable<string> {
     return this.getBrowseEndpoint().pipe(
-      tap((href: string) => this.requestService.removeByHrefSubstring(href))
+      tap((href: string) => this.requestService.removeByHrefSubstring(href)),
     );
   }
 
+  /**
+   * 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
+   */
+  public findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<MetadataSchema>[]): Observable<RemoteData<PaginatedList<MetadataSchema>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Delete an existing 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
+   */
+  public delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.delete(objectId, copyVirtualMetadata);
+  }
+
+  /**
+   * Delete an existing 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.
+   */
+  public deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.deleteByHref(href, copyVirtualMetadata);
+  }
 }
diff --git a/src/app/core/data/persistent-identifier-data.service.ts b/src/app/core/data/persistent-identifier-data.service.ts
new file mode 100644
index 0000000000..661d8c044d
--- /dev/null
+++ b/src/app/core/data/persistent-identifier-data.service.ts
@@ -0,0 +1,28 @@
+/**
+ * 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 { BaseDataService } from './base/base-data.service';
+import { RequestService } from './request.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { Observable } from 'rxjs';
+import { RemoteData } from './remote-data';
+import { DSpaceObject } from '../shared/dspace-object.model';
+
+export class PersistentIdentifierDataService extends IdentifiableDataService<DSpaceObject> {
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super('pid', requestService, rdbService, objectCache, halService);
+  }
+}
diff --git a/src/app/core/data/processes/process-data.service.ts b/src/app/core/data/processes/process-data.service.ts
index 81b4cbd503..0168ded7c9 100644
--- a/src/app/core/data/processes/process-data.service.ts
+++ b/src/app/core/data/processes/process-data.service.ts
@@ -1,13 +1,8 @@
 import { Injectable } from '@angular/core';
-import { DataService } from '../data.service';
 import { RequestService } from '../request.service';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
-import { DefaultChangeAnalyzer } from '../default-change-analyzer.service';
 import { Process } from '../../../process-page/processes/process.model';
 import { dataService } from '../../cache/builders/build-decorators';
 import { PROCESS } from '../../../process-page/processes/process.resource-type';
@@ -17,24 +12,26 @@ import { PaginatedList } from '../paginated-list.model';
 import { Bitstream } from '../../shared/bitstream.model';
 import { RemoteData } from '../remote-data';
 import { BitstreamDataService } from '../bitstream-data.service';
-import { CoreState } from '../../core-state.model';
+import { IdentifiableDataService } from '../base/identifiable-data.service';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { FindAllData, FindAllDataImpl } from '../base/find-all-data';
+import { FindListOptions } from '../find-list-options.model';
 
 @Injectable()
 @dataService(PROCESS)
-export class ProcessDataService extends DataService<Process> {
-  protected linkPath = 'processes';
+export class ProcessDataService extends IdentifiableDataService<Process> implements FindAllData<Process> {
+  private findAllData: FindAllData<Process>;
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
     protected bitstreamDataService: BitstreamDataService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<Process>) {
-    super();
+  ) {
+    super('processes', requestService, rdbService, objectCache, halService);
+
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
@@ -55,4 +52,22 @@ export class ProcessDataService extends DataService<Process> {
     const href$ = this.getFilesEndpoint(processId);
     return this.bitstreamDataService.findAllByHref(href$);
   }
+
+  /**
+   * 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?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Process>[]): Observable<RemoteData<PaginatedList<Process>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
 }
diff --git a/src/app/core/data/processes/script-data.service.ts b/src/app/core/data/processes/script-data.service.ts
index 75a66c822a..a05599c36c 100644
--- a/src/app/core/data/processes/script-data.service.ts
+++ b/src/app/core/data/processes/script-data.service.ts
@@ -1,18 +1,13 @@
 import { Injectable } from '@angular/core';
-import { DataService } from '../data.service';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
-import { DefaultChangeAnalyzer } from '../default-change-analyzer.service';
 import { Script } from '../../../process-page/scripts/script.model';
 import { ProcessParameter } from '../../../process-page/processes/process-parameter.model';
 import { map, take } from 'rxjs/operators';
 import { URLCombiner } from '../../url-combiner/url-combiner';
 import { RemoteData } from '../remote-data';
-import { MultipartPostRequest} from '../request.models';
+import { MultipartPostRequest } from '../request.models';
 import { RequestService } from '../request.service';
 import { Observable } from 'rxjs';
 import { dataService } from '../../cache/builders/build-decorators';
@@ -21,26 +16,29 @@ import { Process } from '../../../process-page/processes/process.model';
 import { hasValue } from '../../../shared/empty.util';
 import { getFirstCompletedRemoteData } from '../../shared/operators';
 import { RestRequest } from '../rest-request.model';
-import { CoreState } from '../../core-state.model';
+import { IdentifiableDataService } from '../base/identifiable-data.service';
+import { FindAllData, FindAllDataImpl } from '../base/find-all-data';
+import { FindListOptions } from '../find-list-options.model';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { PaginatedList } from '../paginated-list.model';
 
 export const METADATA_IMPORT_SCRIPT_NAME = 'metadata-import';
 export const METADATA_EXPORT_SCRIPT_NAME = 'metadata-export';
 
 @Injectable()
 @dataService(SCRIPT)
-export class ScriptDataService extends DataService<Script> {
-  protected linkPath = 'scripts';
+export class ScriptDataService extends IdentifiableDataService<Script> implements FindAllData<Script> {
+  private findAllData: FindAllDataImpl<Script>;
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<Script>) {
-    super();
+  ) {
+    super('scripts', requestService, rdbService, objectCache, halService);
+
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   public invoke(scriptName: string, parameters: ProcessParameter[], files: File[]): Observable<RemoteData<Process>> {
@@ -75,6 +73,25 @@ export class ScriptDataService extends DataService<Script> {
       getFirstCompletedRemoteData(),
       map((rd: RemoteData<Script>) => {
         return hasValue(rd.payload);
-      }));
+      }),
+    );
+  }
+
+  /**
+   * 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
+   */
+  public findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Script>[]): Observable<RemoteData<PaginatedList<Script>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 }
diff --git a/src/app/core/data/relationship-type.service.spec.ts b/src/app/core/data/relationship-type.service.spec.ts
index ab9f0502fe..ebda23d7a4 100644
--- a/src/app/core/data/relationship-type.service.spec.ts
+++ b/src/app/core/data/relationship-type.service.spec.ts
@@ -2,17 +2,14 @@ import { of as observableOf } from 'rxjs';
 import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import {
-  createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
-} from '../../shared/remote-data.utils';
-import { ObjectCacheService } from '../cache/object-cache.service';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { ItemType } from '../shared/item-relationships/item-type.model';
 import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
 import { RelationshipTypeService } from './relationship-type.service';
 import { RequestService } from './request.service';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { hasValueOperator } from '../../shared/empty.util';
+import { ObjectCacheService } from '../cache/object-cache.service';
 
 describe('RelationshipTypeService', () => {
   let service: RelationshipTypeService;
@@ -29,7 +26,6 @@ describe('RelationshipTypeService', () => {
   let relationshipType1;
   let relationshipType2;
 
-  let itemService;
   let buildList;
   let rdbService;
   let objectCache;
@@ -72,22 +68,14 @@ describe('RelationshipTypeService', () => {
       /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
     }) as ObjectCacheService;
 
-    itemService = undefined;
-
   }
 
   function initTestService() {
     return new RelationshipTypeService(
-      itemService,
       requestService,
       rdbService,
-      null,
-      halService,
       objectCache,
-      null,
-      null,
-      null,
-      null
+      halService,
     );
   }
 
diff --git a/src/app/core/data/relationship-type.service.ts b/src/app/core/data/relationship-type.service.ts
index b84a72339d..e3b01c3024 100644
--- a/src/app/core/data/relationship-type.service.ts
+++ b/src/app/core/data/relationship-type.service.ts
@@ -1,28 +1,22 @@
-import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { map, mergeMap, switchMap, toArray } from 'rxjs/operators';
-import { AppState } from '../../app.reducer';
 import { hasValue } from '../../shared/empty.util';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { followLink } from '../../shared/utils/follow-link-config.model';
+import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ItemType } from '../shared/item-relationships/item-type.model';
 import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
 import { RELATIONSHIP_TYPE } from '../shared/item-relationships/relationship-type.resource-type';
-import { getFirstSucceededRemoteData, getFirstCompletedRemoteData, getRemoteDataPayload } from '../shared/operators';
-import { DataService } from './data.service';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
-import { ItemDataService } from './item-data.service';
+import { getFirstCompletedRemoteData, getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
-import { CoreState } from '../core-state.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { BaseDataService } from './base/base-data.service';
+import { FindAllDataImpl } from './base/find-all-data';
+import { SearchDataImpl } from './base/search-data';
+import { ObjectCacheService } from '../cache/object-cache.service';
 
 /**
  * Check if one side of a RelationshipType is the ItemType with the given label
@@ -38,20 +32,20 @@ const checkSide = (typeRd: RemoteData<ItemType>, label: string): boolean =>
  */
 @Injectable()
 @dataService(RELATIONSHIP_TYPE)
-export class RelationshipTypeService extends DataService<RelationshipType> {
-  protected linkPath = 'relationshiptypes';
+export class RelationshipTypeService extends BaseDataService<RelationshipType> {
+  private searchData: SearchDataImpl<RelationshipType>;
+  private findAllData: FindAllDataImpl<RelationshipType>;
 
-  constructor(protected itemService: ItemDataService,
-              protected requestService: RequestService,
-              protected rdbService: RemoteDataBuildService,
-              protected store: Store<CoreState>,
-              protected halService: HALEndpointService,
-              protected objectCache: ObjectCacheService,
-              protected notificationsService: NotificationsService,
-              protected http: HttpClient,
-              protected comparator: DefaultChangeAnalyzer<RelationshipType>,
-              protected appStore: Store<AppState>) {
-    super();
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super('relationshiptypes', requestService, rdbService, objectCache, halService);
+
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
@@ -67,34 +61,34 @@ export class RelationshipTypeService extends DataService<RelationshipType> {
    */
   getRelationshipTypeByLabelAndTypes(relationshipTypeLabel: string, firstItemType: string, secondItemType: string): Observable<RelationshipType> {
     // Retrieve all relationship types from the server in a single page
-    return this.findAll({ currentPage: 1, elementsPerPage: 9999 }, true, true, followLink('leftType'), followLink('rightType'))
-      .pipe(
-        getFirstSucceededRemoteData(),
-        // Emit each type in the page array separately
-        switchMap((typeListRD: RemoteData<PaginatedList<RelationshipType>>) => typeListRD.payload.page),
-        // Check each type individually, to see if it matches the provided types
-        mergeMap((relationshipType: RelationshipType) => {
-          if (relationshipType.leftwardType === relationshipTypeLabel) {
-            return this.checkType(relationshipType, firstItemType, secondItemType);
-          } else if (relationshipType.rightwardType === relationshipTypeLabel) {
-            return this.checkType(relationshipType, secondItemType, firstItemType);
-          } else {
-            return [null];
-          }
-        }),
-        // Wait for all types to be checked and emit once, with the results combined back into an
-        // array
-        toArray(),
-        // Look for a match in the array and emit it if found, or null if one isn't found
-        map((types: RelationshipType[]) => {
-          const match = types.find((type: RelationshipType) => hasValue(type));
-          if (hasValue(match)) {
-            return match;
-          } else {
-            return null;
-          }
-        })
-      );
+    return this.findAllData.findAll({ currentPage: 1, elementsPerPage: 9999 }, true, true, followLink('leftType'), followLink('rightType'))
+               .pipe(
+                 getFirstSucceededRemoteData(),
+                 // Emit each type in the page array separately
+                 switchMap((typeListRD: RemoteData<PaginatedList<RelationshipType>>) => typeListRD.payload.page),
+                 // Check each type individually, to see if it matches the provided types
+                 mergeMap((relationshipType: RelationshipType) => {
+                   if (relationshipType.leftwardType === relationshipTypeLabel) {
+                     return this.checkType(relationshipType, firstItemType, secondItemType);
+                   } else if (relationshipType.rightwardType === relationshipTypeLabel) {
+                     return this.checkType(relationshipType, secondItemType, firstItemType);
+                   } else {
+                     return [null];
+                   }
+                 }),
+                 // Wait for all types to be checked and emit once, with the results combined back into an
+                 // array
+                 toArray(),
+                 // Look for a match in the array and emit it if found, or null if one isn't found
+                 map((types: RelationshipType[]) => {
+                   const match = types.find((type: RelationshipType) => hasValue(type));
+                   if (hasValue(match)) {
+                     return match;
+                   } else {
+                     return null;
+                   }
+                 }),
+               );
   }
 
   /**
@@ -127,27 +121,29 @@ export class RelationshipTypeService extends DataService<RelationshipType> {
    * Returns an observable of the given RelationshipType if it matches, null if it doesn't
    *
    * @param type            The RelationshipType to check
+   * @param useCachedVersionIfAvailable
+   * @param reRequestOnStale
+   * @param linksToFollow
    */
-  searchByEntityType(type: string,useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<RelationshipType>[]): Observable<PaginatedList<RelationshipType>> {
-
-    return this.searchBy(
+  searchByEntityType(type: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<RelationshipType>[]): Observable<PaginatedList<RelationshipType>> {
+    return this.searchData.searchBy(
       'byEntityType',
       {
         searchParams: [
           {
             fieldName: 'type',
-            fieldValue: type
+            fieldValue: type,
           },
           {
             fieldName: 'size',
-            fieldValue: 100
+            fieldValue: 100,
           },
-        ]
-      }, useCachedVersionIfAvailable,reRequestOnStale,...linksToFollow).pipe(
+        ],
+      }, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow,
+    ).pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
     ) as Observable<PaginatedList<RelationshipType>>;
   }
 
-
 }
diff --git a/src/app/core/data/relationship.service.spec.ts b/src/app/core/data/relationship.service.spec.ts
index 387593d609..8a860693a9 100644
--- a/src/app/core/data/relationship.service.spec.ts
+++ b/src/app/core/data/relationship.service.spec.ts
@@ -6,7 +6,7 @@ import { Relationship } from '../shared/item-relationships/relationship.model';
 import { Item } from '../shared/item.model';
 import { PageInfo } from '../shared/page-info.model';
 import { buildPaginatedList } from './paginated-list.model';
-import { DeleteRequest} from './request.models';
+import { DeleteRequest } from './request.models';
 import { RelationshipService } from './relationship.service';
 import { RequestService } from './request.service';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
@@ -123,15 +123,11 @@ describe('RelationshipService', () => {
 
   function initTestService() {
     return new RelationshipService(
-      itemService,
       requestService,
       rdbService,
-      null,
       halService,
       objectCache,
-      null,
-      null,
-      null,
+      itemService,
       null,
       jasmine.createSpy('paginatedRelationsToItems').and.returnValue((v) => v),
     );
diff --git a/src/app/core/data/relationship.service.ts b/src/app/core/data/relationship.service.ts
index 4594e17a11..8773b61473 100644
--- a/src/app/core/data/relationship.service.ts
+++ b/src/app/core/data/relationship.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { HttpHeaders } from '@angular/common/http';
 import { Inject, Injectable } from '@angular/core';
 import { MemoizedSelector, select, Store } from '@ngrx/store';
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
@@ -15,7 +15,6 @@ import {
   SetNameVariantAction
 } from '../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.actions';
 import { NameVariantListState } from '../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
@@ -33,19 +32,19 @@ import {
   getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload
 } from '../shared/operators';
-import { DataService } from './data.service';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { ItemDataService } from './item-data.service';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
-import { DeleteRequest, PostRequest} from './request.models';
+import { DeleteRequest, PostRequest } from './request.models';
 import { RequestService } from './request.service';
 import { NoContent } from '../shared/NoContent.model';
 import { RequestEntryState } from './request-entry-state.model';
 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 { SearchData, SearchDataImpl } from './base/search-data';
+import { PutData, PutDataImpl } from './base/put-data';
+import { IdentifiableDataService } from './base/identifiable-data.service';
 
 const relationshipListsStateSelector = (state: AppState) => state.relationshipLists;
 
@@ -75,22 +74,23 @@ const compareItemsByUUID = (itemCheck: Item) =>
  */
 @Injectable()
 @dataService(RELATIONSHIP)
-export class RelationshipService extends DataService<Relationship> {
-  protected linkPath = 'relationships';
-  protected responseMsToLive = 15 * 60 * 1000;
+export class RelationshipService extends IdentifiableDataService<Relationship> implements SearchData<Relationship> {
+  private searchData: SearchData<Relationship>;
+  private putData: PutData<Relationship>;
 
-  constructor(protected itemService: ItemDataService,
-              protected requestService: RequestService,
-              protected rdbService: RemoteDataBuildService,
-              protected store: Store<CoreState>,
-              protected halService: HALEndpointService,
-              protected objectCache: ObjectCacheService,
-              protected notificationsService: NotificationsService,
-              protected http: HttpClient,
-              protected comparator: DefaultChangeAnalyzer<Relationship>,
-              protected appStore: Store<AppState>,
-              @Inject(PAGINATED_RELATIONS_TO_ITEMS_OPERATOR) private paginatedRelationsToItems: (thisId: string) => (source: Observable<RemoteData<PaginatedList<Relationship>>>) => Observable<RemoteData<PaginatedList<Item>>>) {
-    super();
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected halService: HALEndpointService,
+    protected objectCache: ObjectCacheService,
+    protected itemService: ItemDataService,
+    protected appStore: Store<AppState>,
+    @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);
+
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.putData = new PutDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
@@ -99,13 +99,15 @@ export class RelationshipService extends DataService<Relationship> {
    */
   getRelationshipEndpoint(uuid: string) {
     return this.getBrowseEndpoint().pipe(
-      map((href: string) => `${href}/${uuid}`)
+      map((href: string) => `${href}/${uuid}`),
     );
   }
 
   /**
    * Send a delete request for a relationship by ID
-   * @param id
+   * @param id                    the ID of the relationship to delete
+   * @param copyVirtualMetadata   whether to copy this relationship's virtual metadata to the related Items
+   *                              accepted values: none, all, left, right, configured
    */
   deleteRelationship(id: string, copyVirtualMetadata: string): Observable<RemoteData<NoContent>> {
     return this.getRelationshipEndpoint(id).pipe(
@@ -469,7 +471,7 @@ export class RelationshipService extends DataService<Relationship> {
    * @param object the {@link Relationship} to update
    */
   update(object: Relationship): Observable<RemoteData<Relationship>> {
-    return this.put(object);
+    return this.putData.put(object);
   }
 
   /**
@@ -513,7 +515,7 @@ export class RelationshipService extends DataService<Relationship> {
       searchParams.push(
         {
           fieldName: 'relatedItem',
-          fieldValue: itemId
+          fieldValue: itemId,
         },
       );
     });
@@ -521,8 +523,31 @@ export class RelationshipService extends DataService<Relationship> {
     return this.searchBy(
       'byItemsAndType',
       {
-        searchParams: searchParams
-      }) as Observable<RemoteData<PaginatedList<Relationship>>>;
+        searchParams: searchParams,
+      },
+    ) as Observable<RemoteData<PaginatedList<Relationship>>>;
 
   }
+
+  /**
+   * 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?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Relationship>[]): Observable<RemoteData<PaginatedList<Relationship>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  getSearchByHref(searchMethod: string, options: FindListOptions, ...linksToFollow: FollowLinkConfig<Relationship>[]): Observable<string> {
+    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
+  }
 }
diff --git a/src/app/core/data/root-data.service.spec.ts b/src/app/core/data/root-data.service.spec.ts
index e3e23dac12..b65449d007 100644
--- a/src/app/core/data/root-data.service.spec.ts
+++ b/src/app/core/data/root-data.service.spec.ts
@@ -12,19 +12,20 @@ describe('RootDataService', () => {
   let halService: HALEndpointService;
   let restService;
   let rootEndpoint;
+  let findByHrefSpy;
 
   beforeEach(() => {
     rootEndpoint = 'root-endpoint';
     halService = jasmine.createSpyObj('halService', {
-      getRootHref: rootEndpoint
+      getRootHref: rootEndpoint,
     });
     restService = jasmine.createSpyObj('halService', {
-      get: jasmine.createSpy('get')
-    });
-    service = new RootDataService(null, null, null, null, halService, null, null, null, restService);
-    (service as any).dataService = jasmine.createSpyObj('dataService', {
-      findByHref: createSuccessfulRemoteDataObject$({})
+      get: jasmine.createSpy('get'),
     });
+    service = new RootDataService(null, null, null, halService, restService);
+
+    findByHrefSpy = spyOn(service as any, 'findByHref');
+    findByHrefSpy.and.returnValue(createSuccessfulRemoteDataObject$({}));
   });
 
   describe('findRoot', () => {
@@ -36,7 +37,7 @@ describe('RootDataService', () => {
 
     it('should call findByHref using the root endpoint', (done) => {
       result$.subscribe(() => {
-        expect((service as any).dataService.findByHref).toHaveBeenCalledWith(rootEndpoint, true, true);
+        expect(findByHrefSpy).toHaveBeenCalledWith(rootEndpoint, true, true);
         done();
       });
     });
diff --git a/src/app/core/data/root-data.service.ts b/src/app/core/data/root-data.service.ts
index a54a176300..4fbef3e556 100644
--- a/src/app/core/data/root-data.service.ts
+++ b/src/app/core/data/root-data.service.ts
@@ -1,70 +1,33 @@
-/* eslint-disable max-classes-per-file */
-import { DataService } from './data.service';
 import { Root } from './root.model';
 import { Injectable } from '@angular/core';
 import { ROOT } from './root.resource-type';
 import { dataService } from '../cache/builders/build-decorators';
 import { RequestService } from './request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
-import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { Observable, of as observableOf } from 'rxjs';
 import { RemoteData } from './remote-data';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { PaginatedList } from './paginated-list.model';
-import { CoreState } from '../core-state.model';
-import { FindListOptions } from './find-list-options.model';
 import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { catchError, map } from 'rxjs/operators';
-
-
-/**
- * A private DataService implementation to delegate specific methods to.
- */
-class DataServiceImpl extends DataService<Root> {
-  protected linkPath = '';
-  protected responseMsToLive = 6 * 60 * 60 * 1000;
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<Root>) {
-    super();
-  }
-}
+import { BaseDataService } from './base/base-data.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
 
 /**
  * A service to retrieve the {@link Root} object from the REST API.
  */
 @Injectable()
 @dataService(ROOT)
-export class RootDataService {
-  /**
-   * A private DataService instance to delegate specific methods to.
-   */
-  private dataService: DataServiceImpl;
-
+export class RootDataService extends BaseDataService<Root> {
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<Root>,
-    protected restService: DspaceRestService) {
-    this.dataService = new DataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator);
+    protected restService: DspaceRestService,
+  ) {
+    super('', requestService, rdbService, objectCache, halService, 6 * 60 * 60 * 1000);
   }
 
   /**
@@ -90,38 +53,7 @@ export class RootDataService {
    *                                    {@link HALLink}s should be automatically resolved
    */
   findRoot(useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Root>[]): Observable<RemoteData<Root>> {
-    return this.dataService.findByHref(this.halService.getRootHref(), useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-  }
-
-  /**
-   * 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
-   * @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<Root>[]): Observable<RemoteData<Root>> {
-    return this.dataService.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
-   * @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<Root>[]): Observable<RemoteData<PaginatedList<Root>>> {
-    return this.dataService.findAllByHref(href, findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+    return this.findByHref(this.halService.getRootHref(), useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
   /**
diff --git a/src/app/core/data/site-data.service.spec.ts b/src/app/core/data/site-data.service.spec.ts
index 1e8b135db8..d3ff37a442 100644
--- a/src/app/core/data/site-data.service.spec.ts
+++ b/src/app/core/data/site-data.service.spec.ts
@@ -4,14 +4,10 @@ import { RequestService } from './request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { Site } from '../shared/site.model';
-import { Store } from '@ngrx/store';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { TestScheduler } from 'rxjs/testing';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from './find-list-options.model';
 
 describe('SiteDataService', () => {
@@ -47,21 +43,13 @@ describe('SiteDataService', () => {
       })
     });
 
-    const store = {} as Store<CoreState>;
     objectCache = {} as ObjectCacheService;
-    const notificationsService = {} as NotificationsService;
-    const http = {} as HttpClient;
-    const comparator = {} as any;
 
     service = new SiteDataService(
       requestService,
       rdbService,
-      store,
       objectCache,
       halService,
-      notificationsService,
-      http,
-      comparator
     );
   });
 
diff --git a/src/app/core/data/site-data.service.ts b/src/app/core/data/site-data.service.ts
index b2ba9d6dfb..4b61cc5d9d 100644
--- a/src/app/core/data/site-data.service.ts
+++ b/src/app/core/data/site-data.service.ts
@@ -1,42 +1,38 @@
-import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { getFirstSucceededRemoteData } from '../shared/operators';
 import { Site } from '../shared/site.model';
 import { SITE } from '../shared/site.resource-type';
-import { DataService } from './data.service';
-import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
-import { CoreState } from '../core-state.model';
+import { BaseDataService } from './base/base-data.service';
+import { FindAllData, FindAllDataImpl } from './base/find-all-data';
+import { FollowLinkConfig } from 'src/app/shared/utils/follow-link-config.model';
+import { FindListOptions } from './find-list-options.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
 
 /**
  * Service responsible for handling requests related to the Site object
  */
 @Injectable()
 @dataService(SITE)
-export class SiteDataService extends DataService<Site> {
-  protected linkPath = 'sites';
+export class SiteDataService extends BaseDataService<Site> implements FindAllData<Site> {
+  private findAllData: FindAllData<Site>;
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DSOChangeAnalyzer<Site>,
   ) {
-    super();
+    super('sites', requestService, rdbService, objectCache, halService);
+
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
@@ -46,7 +42,25 @@ export class SiteDataService extends DataService<Site> {
     return this.findAll().pipe(
       getFirstSucceededRemoteData(),
       map((remoteData: RemoteData<PaginatedList<Site>>) => remoteData.payload),
-      map((list: PaginatedList<Site>) => list.page[0])
+      map((list: PaginatedList<Site>) => list.page[0]),
     );
   }
+
+  /**
+   * 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
+   */
+  public findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Site>[]): Observable<RemoteData<PaginatedList<Site>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
 }
diff --git a/src/app/core/data/version-data.service.spec.ts b/src/app/core/data/version-data.service.spec.ts
index 29de3389d7..3b7d239f2d 100644
--- a/src/app/core/data/version-data.service.spec.ts
+++ b/src/app/core/data/version-data.service.spec.ts
@@ -1,18 +1,12 @@
-import { HttpClient } from '@angular/common/http';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RequestService } from './request.service';
-import { PageInfo } from '../shared/page-info.model';
 import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { HrefOnlyDataService } from './href-only-data.service';
 import { getMockHrefOnlyDataService } from '../../shared/mocks/href-only-data.service.mock';
-
-import { Store } from '@ngrx/store';
 import { RestResponse } from '../cache/response.models';
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 import { Item } from '../shared/item.model';
@@ -20,10 +14,8 @@ import { VersionDataService } from './version-data.service';
 import { Version } from '../shared/version.model';
 import { VersionHistory } from '../shared/version-history.model';
 import { followLink } from '../../shared/utils/follow-link-config.model';
-import { CoreState } from '../core-state.model';
 import { RequestEntry } from './request-entry.model';
 
-
 describe('VersionDataService test', () => {
   let scheduler: TestScheduler;
   let service: VersionDataService;
@@ -80,29 +72,17 @@ describe('VersionDataService test', () => {
   const mockVersionRD = createSuccessfulRemoteDataObject(mockVersion);
 
   const endpointURL = `https://rest.api/rest/api/versioning/versions`;
-  const findByIdRequestURL = `https://rest.api/rest/api/versioning/versions/${mockVersion.id}`;
-  const findByIdRequestURL$ = observableOf(findByIdRequestURL);
-
   const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
 
   objectCache = {} as ObjectCacheService;
-  const notificationsService = {} as NotificationsService;
-  const http = {} as HttpClient;
-  const comparator = {} as any;
   const comparatorEntry = {} as any;
-  const store = {} as Store<CoreState>;
-  const pageInfo = new PageInfo();
-
   function initTestService() {
     hrefOnlyDataService = getMockHrefOnlyDataService();
     return new VersionDataService(
       requestService,
       rdbService,
-      store,
       objectCache,
       halService,
-      notificationsService,
-      http,
       comparatorEntry
     );
   }
@@ -134,8 +114,7 @@ describe('VersionDataService test', () => {
 
       service = initTestService();
 
-      spyOn((service as any), 'findByHref').and.callThrough();
-      spyOn((service as any), 'getIDHrefObs').and.returnValue(findByIdRequestURL$);
+      spyOn((service as any), 'findById').and.callThrough();
     });
 
     afterEach(() => {
@@ -147,7 +126,7 @@ describe('VersionDataService test', () => {
         scheduler.schedule(() => service.getHistoryFromVersion(mockVersion, true, true));
         scheduler.flush();
 
-        expect((service as any).findByHref).toHaveBeenCalledWith(findByIdRequestURL$, true, true, followLink('versionhistory'));
+        expect((service as any).findById).toHaveBeenCalledWith(mockVersion.id, true, true, followLink('versionhistory'));
       });
 
       it('should return a VersionHistory', () => {
diff --git a/src/app/core/data/version-data.service.ts b/src/app/core/data/version-data.service.ts
index a94412ac1b..0c677a5541 100644
--- a/src/app/core/data/version-data.service.ts
+++ b/src/app/core/data/version-data.service.ts
@@ -1,14 +1,9 @@
 import { Injectable } from '@angular/core';
-import { DataService } from './data.service';
 import { Version } from '../shared/version.model';
 import { RequestService } from './request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { EMPTY, Observable } from 'rxjs';
 import { dataService } from '../cache/builders/build-decorators';
 import { VERSION } from '../shared/version.resource-type';
@@ -17,26 +12,30 @@ import { followLink } from '../../shared/utils/follow-link-config.model';
 import { getFirstSucceededRemoteDataPayload } from '../shared/operators';
 import { map, switchMap } from 'rxjs/operators';
 import { isNotEmpty } from '../../shared/empty.util';
-import { CoreState } from '../core-state.model';
+import { RemoteData } from './remote-data';
+import { PatchData, PatchDataImpl } from './base/patch-data';
+import { RestRequestMethod } from './rest-request-method';
+import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
+import { IdentifiableDataService } from './base/identifiable-data.service';
 
 /**
  * Service responsible for handling requests related to the Version object
  */
 @Injectable()
 @dataService(VERSION)
-export class VersionDataService extends DataService<Version> {
-  protected linkPath = 'versions';
+export class VersionDataService extends IdentifiableDataService<Version> implements PatchData<Version> {
+  private patchData: PatchData<Version>;
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<Version>) {
-    super();
+    protected comparator: DefaultChangeAnalyzer<Version>,
+  ) {
+    super('versions', requestService, rdbService, objectCache, halService);
+
+    this.patchData = new PatchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
@@ -65,4 +64,29 @@ export class VersionDataService extends DataService<Version> {
     );
   }
 
+  /**
+   * 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
+   */
+  public patch(object: Version, operations: []): Observable<RemoteData<Version>> {
+    return this.patchData.patch(object, operations);
+  }
+
+  /**
+   * 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
+   */
+  public update(object: Version): Observable<RemoteData<Version>> {
+    return this.patchData.update(object);
+  }
+
+  /**
+   * Commit current object changes to the server
+   * @param method The RestRequestMethod for which de server sync buffer should be committed
+   */
+  public commitUpdates(method?: RestRequestMethod): void {
+    this.patchData.commitUpdates(method);
+  }
 }
diff --git a/src/app/core/data/version-history-data.service.spec.ts b/src/app/core/data/version-history-data.service.spec.ts
index 26ed370026..1991c5c193 100644
--- a/src/app/core/data/version-history-data.service.spec.ts
+++ b/src/app/core/data/version-history-data.service.spec.ts
@@ -102,7 +102,7 @@ describe('VersionHistoryDataService', () => {
       buildFromRequestUUID: jasmine.createSpy('buildFromRequestUUID'),
     });
     objectCache = jasmine.createSpyObj('objectCache', {
-      remove: jasmine.createSpy('remove')
+      remove: jasmine.createSpy('remove'),
     });
     versionService = jasmine.createSpyObj('objectCache', {
       findByHref: jasmine.createSpy('findByHref'),
@@ -112,7 +112,13 @@ describe('VersionHistoryDataService', () => {
     halService = new HALEndpointServiceStub(url);
     notificationsService = new NotificationsServiceStub();
 
-    service = new VersionHistoryDataService(requestService, rdbService, null, objectCache, halService, notificationsService, versionService, null, null);
+    service = new VersionHistoryDataService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      versionService,
+    );
   }
 
   beforeEach(() => {
diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts
index 2769e26770..4c6891d5ea 100644
--- a/src/app/core/data/version-history-data.service.ts
+++ b/src/app/core/data/version-history-data.service.ts
@@ -1,14 +1,10 @@
-import { DataService } from './data.service';
 import { VersionHistory } from '../shared/version-history.model';
 import { Injectable } from '@angular/core';
 import { RequestService } from './request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
+import { HttpHeaders } from '@angular/common/http';
 import { PostRequest } from './request.models';
 import { Observable, of } from 'rxjs';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
@@ -21,40 +17,31 @@ import { VERSION_HISTORY } from '../shared/version-history.resource-type';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { VersionDataService } from './version-data.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import {
-  getAllSucceededRemoteData,
-  getFirstCompletedRemoteData,
-  getFirstSucceededRemoteDataPayload,
-  getRemoteDataPayload
-} from '../shared/operators';
+import { getAllSucceededRemoteData, getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload, getRemoteDataPayload } from '../shared/operators';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { hasValueOperator } from '../../shared/empty.util';
 import { Item } from '../shared/item.model';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from './find-list-options.model';
 import { sendRequest } from '../shared/request.operators';
 import { RestRequest } from './rest-request.model';
+import { IdentifiableDataService } from './base/identifiable-data.service';
 
 /**
  * Service responsible for handling requests related to the VersionHistory object
  */
 @Injectable()
 @dataService(VERSION_HISTORY)
-export class VersionHistoryDataService extends DataService<VersionHistory> {
-  protected linkPath = 'versionhistories';
+export class VersionHistoryDataService extends IdentifiableDataService<VersionHistory> {
   protected versionsEndpoint = 'versions';
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
     protected versionDataService: VersionDataService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<VersionHistory>) {
-    super();
+  ) {
+    super('versionhistories', requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/workflow-action-data.service.ts b/src/app/core/data/workflow-action-data.service.ts
index ab8f187b2f..a89e997474 100644
--- a/src/app/core/data/workflow-action-data.service.ts
+++ b/src/app/core/data/workflow-action-data.service.ts
@@ -1,41 +1,27 @@
-import { DataService } from './data.service';
 import { WorkflowAction } from '../tasks/models/workflow-action-object.model';
 import { RequestService } from './request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
-import { Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
 import { dataService } from '../cache/builders/build-decorators';
 import { WORKFLOW_ACTION } from '../tasks/models/workflow-action-object.resource-type';
-import { CoreState } from '../core-state.model';
-import { FindListOptions } from './find-list-options.model';
+import { BaseDataService } from './base/base-data.service';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the workflowactions endpoint
  */
 @Injectable()
 @dataService(WORKFLOW_ACTION)
-export class WorkflowActionDataService extends DataService<WorkflowAction> {
+export class WorkflowActionDataService extends BaseDataService<WorkflowAction> {
   protected linkPath = 'workflowactions';
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<WorkflowAction>) {
-    super();
-  }
-
-  getBrowseEndpoint(options: FindListOptions, linkPath?: string): Observable<string> {
-    return this.halService.getEndpoint(this.linkPath);
+  ) {
+    super('workflowactions', requestService, rdbService, objectCache, halService);
   }
 }
diff --git a/src/app/core/eperson/eperson-data.service.spec.ts b/src/app/core/eperson/eperson-data.service.spec.ts
index 80cb92716a..aa07194992 100644
--- a/src/app/core/eperson/eperson-data.service.spec.ts
+++ b/src/app/core/eperson/eperson-data.service.spec.ts
@@ -13,7 +13,7 @@ import {
 } from '../../access-control/epeople-registry/epeople-registry.actions';
 import { RequestParam } from '../cache/models/request-param.model';
 import { ChangeAnalyzer } from '../data/change-analyzer';
-import { DeleteRequest, PatchRequest, PostRequest } from '../data/request.models';
+import { PatchRequest, PostRequest } from '../data/request.models';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
@@ -47,12 +47,11 @@ describe('EPersonDataService', () => {
     return new EPersonDataService(
       requestService,
       rdbService,
-      store,
       null,
       halService,
+      new DummyChangeAnalyzer() as any,
       null,
-      null,
-      new DummyChangeAnalyzer() as any
+      store,
     );
   }
 
diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts
index d801ab6fa4..2c2d52b258 100644
--- a/src/app/core/eperson/eperson-data.service.ts
+++ b/src/app/core/eperson/eperson-data.service.ts
@@ -1,35 +1,36 @@
-import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { createSelector, select, Store } from '@ngrx/store';
 import { Operation } from 'fast-json-patch';
 import { Observable } from 'rxjs';
 import { find, map, take } from 'rxjs/operators';
-import {
-  EPeopleRegistryCancelEPersonAction,
-  EPeopleRegistryEditEPersonAction
-} from '../../access-control/epeople-registry/epeople-registry.actions';
+import { EPeopleRegistryCancelEPersonAction, EPeopleRegistryEditEPersonAction } from '../../access-control/epeople-registry/epeople-registry.actions';
 import { EPeopleRegistryState } from '../../access-control/epeople-registry/epeople-registry.reducers';
 import { AppState } from '../../app.reducer';
-import { hasValue, hasNoValue } from '../../shared/empty.util';
+import { hasNoValue, hasValue } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { DataService } from '../data/data.service';
 import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
-import { PaginatedList, buildPaginatedList } from '../data/paginated-list.model';
+import { buildPaginatedList, PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
-import { PatchRequest, PostRequest, } from '../data/request.models';
+import { PatchRequest, PostRequest } from '../data/request.models';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { getRemoteDataPayload, getFirstSucceededRemoteData, } from '../shared/operators';
+import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
 import { EPerson } from './models/eperson.model';
 import { EPERSON } from './models/eperson.resource-type';
 import { NoContent } from '../shared/NoContent.model';
 import { PageInfo } from '../shared/page-info.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { CreateData, CreateDataImpl } from '../data/base/create-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { SearchData, SearchDataImpl } from '../data/base/search-data';
+import { PatchData, PatchDataImpl } from '../data/base/patch-data';
+import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
+import { RestRequestMethod } from '../data/rest-request-method';
 
 const ePeopleRegistryStateSelector = (state: AppState) => state.epeopleRegistry;
 const editEPersonSelector = createSelector(ePeopleRegistryStateSelector, (ePeopleRegistryState: EPeopleRegistryState) => ePeopleRegistryState.editEPerson);
@@ -39,23 +40,30 @@ const editEPersonSelector = createSelector(ePeopleRegistryStateSelector, (ePeopl
  */
 @Injectable()
 @dataService(EPERSON)
-export class EPersonDataService extends DataService<EPerson> {
-
-  protected linkPath = 'epersons';
+export class EPersonDataService extends IdentifiableDataService<EPerson> implements CreateData<EPerson>, SearchData<EPerson>, PatchData<EPerson>, DeleteData<EPerson> {
   protected searchByEmailPath = 'byEmail';
   protected searchByMetadataPath = 'byMetadata';
 
+  private createData: CreateData<EPerson>;
+  private searchData: SearchData<EPerson>;
+  private patchData: PatchData<EPerson>;
+  private deleteData: DeleteData<EPerson>;
+
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<any>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
+    protected comparator: DSOChangeAnalyzer<EPerson>,
     protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DSOChangeAnalyzer<EPerson>
+    protected store: Store<any>,
   ) {
-    super();
+    super('epersons', requestService, rdbService, objectCache, halService);
+
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.patchData = new PatchDataImpl<EPerson>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
@@ -326,4 +334,90 @@ export class EPersonDataService extends DataService<EPerson> {
     return this.rdbService.buildFromRequestUUID(requestId);
   }
 
+
+  /**
+   * Create a new object on the server, and store the response in the object cache
+   *
+   * @param object    The object to create
+   * @param params    Array with additional params to combine with query string
+   */
+  public create(object: EPerson, ...params: RequestParam[]): Observable<RemoteData<EPerson>> {
+    return this.createData.create(object, ...params);
+  }
+
+  /**
+   * 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?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<EPerson>[]): Observable<RemoteData<PaginatedList<EPerson>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...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
+   */
+  getSearchByHref(searchMethod: string, options?: FindListOptions, ...linksToFollow: FollowLinkConfig<EPerson>[]): Observable<string> {
+    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
+  }
+
+  /**
+   * Return a list of operations representing the difference between an object and its latest value in the cache.
+   * @param object  the object to resolve to a list of patch operations
+   */
+  public createPatchFromCache(object: EPerson): Observable<Operation[]> {
+    return this.patchData.createPatchFromCache(object);
+  }
+
+  patch(object: EPerson, operations: Operation[]): Observable<RemoteData<EPerson>> {
+    return this.patchData.patch(object, operations);
+  }
+
+  update(object: EPerson): Observable<RemoteData<EPerson>> {
+    return this.patchData.update(object);
+  }
+
+  commitUpdates(method?: RestRequestMethod): void {
+    this.patchData.commitUpdates(method);
+  }
+
+  /**
+   * Delete an existing 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
+   */
+  public delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.delete(objectId, copyVirtualMetadata);
+  }
+
+  /**
+   * Delete an existing 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.
+   */
+  public deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.deleteByHref(href, copyVirtualMetadata);
+  }
 }
diff --git a/src/app/core/eperson/group-data.service.spec.ts b/src/app/core/eperson/group-data.service.spec.ts
index c30b74e966..569c1b1a77 100644
--- a/src/app/core/eperson/group-data.service.spec.ts
+++ b/src/app/core/eperson/group-data.service.spec.ts
@@ -65,15 +65,14 @@ describe('GroupDataService', () => {
 
   function initTestService() {
     return new GroupDataService(
+      requestService,
+      rdbService,
+      null,
+      halService,
       new DummyChangeAnalyzer() as any,
       null,
       null,
-      requestService,
-      rdbService,
       store,
-      null,
-      halService,
-      null,
     );
   }
 
diff --git a/src/app/core/eperson/group-data.service.ts b/src/app/core/eperson/group-data.service.ts
index 4467e26240..615132dca1 100644
--- a/src/app/core/eperson/group-data.service.ts
+++ b/src/app/core/eperson/group-data.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 
 import { createSelector, select, Store } from '@ngrx/store';
@@ -15,7 +15,6 @@ import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { DataService } from '../data/data.service';
 import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
@@ -34,6 +33,13 @@ import { Community } from '../shared/community.model';
 import { Collection } from '../shared/collection.model';
 import { NoContent } from '../shared/NoContent.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { CreateData, CreateDataImpl } from '../data/base/create-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { SearchData, SearchDataImpl } from '../data/base/search-data';
+import { PatchData, PatchDataImpl } from '../data/base/patch-data';
+import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
+import { Operation } from 'fast-json-patch';
+import { RestRequestMethod } from '../data/rest-request-method';
 
 const groupRegistryStateSelector = (state: AppState) => state.groupRegistry;
 const editGroupSelector = createSelector(groupRegistryStateSelector, (groupRegistryState: GroupRegistryState) => groupRegistryState.editGroup);
@@ -43,24 +49,32 @@ const editGroupSelector = createSelector(groupRegistryStateSelector, (groupRegis
  */
 @Injectable()
 @dataService(GROUP)
-export class GroupDataService extends DataService<Group> {
-  protected linkPath = 'groups';
+export class GroupDataService extends IdentifiableDataService<Group> {
   protected browseEndpoint = '';
   public ePersonsEndpoint = 'epersons';
   public subgroupsEndpoint = 'subgroups';
 
+  private createData: CreateData<Group>;
+  private searchData: SearchData<Group>;
+  private patchData: PatchData<Group>;
+  private deleteData: DeleteData<Group>;
+
   constructor(
-    protected comparator: DSOChangeAnalyzer<Group>,
-    protected http: HttpClient,
-    protected notificationsService: NotificationsService,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<any>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
+    protected comparator: DSOChangeAnalyzer<Group>,
+    protected notificationsService: NotificationsService,
     protected nameService: DSONameService,
+    protected store: Store<any>,
   ) {
-    super();
+    super('groups', requestService, rdbService, objectCache, halService);
+
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.patchData = new PatchDataImpl<Group>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
@@ -322,4 +336,42 @@ export class GroupDataService extends DataService<Group> {
 
     return responseRD$;
   }
+
+
+  public create(object: Group, ...params: RequestParam[]): Observable<RemoteData<Group>> {
+    return this.createData.create(object, ...params);
+  }
+
+  //
+  searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Group>[]): Observable<RemoteData<PaginatedList<Group>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  getSearchByHref(searchMethod: string, options?: FindListOptions, ...linksToFollow: FollowLinkConfig<Group>[]): Observable<string> {
+    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
+  }
+
+  public createPatchFromCache(object: Group): Observable<Operation[]> {
+    return this.patchData.createPatchFromCache(object);
+  }
+
+  patch(object: Group, operations: Operation[]): Observable<RemoteData<Group>> {
+    return this.patchData.patch(object, operations);
+  }
+
+  update(object: Group): Observable<RemoteData<Group>> {
+    return this.patchData.update(object);
+  }
+
+  commitUpdates(method?: RestRequestMethod): void {
+    this.patchData.commitUpdates(method);
+  }
+
+  delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.delete(objectId, copyVirtualMetadata);
+  }
+
+  public deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.deleteByHref(href, copyVirtualMetadata);
+  }
 }
diff --git a/src/app/core/feedback/feedback-data.service.spec.ts b/src/app/core/feedback/feedback-data.service.spec.ts
index 1462a79587..c5fa5d4aa7 100644
--- a/src/app/core/feedback/feedback-data.service.spec.ts
+++ b/src/app/core/feedback/feedback-data.service.spec.ts
@@ -5,9 +5,7 @@ import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-servic
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
 import { Store } from '@ngrx/store';
-import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
 import { Feedback } from './models/feedback.model';
 import { CoreState } from '../core-state.model';
 
@@ -17,8 +15,6 @@ describe('FeedbackDataService', () => {
   let halService;
   let rdbService;
   let notificationsService;
-  let http;
-  let comparator;
   let objectCache;
   let store;
   let item;
@@ -44,8 +40,6 @@ describe('FeedbackDataService', () => {
     halService = new HALEndpointServiceStub('url') as any;
     rdbService = {} as RemoteDataBuildService;
     notificationsService = {} as NotificationsService;
-    http = {} as HttpClient;
-    comparator = new DSOChangeAnalyzer() as any;
     objectCache = {
 
       addPatch: () => {
@@ -63,8 +57,6 @@ describe('FeedbackDataService', () => {
       objectCache,
       halService,
       notificationsService,
-      http,
-      comparator,
     );
   }
 
diff --git a/src/app/core/feedback/feedback-data.service.ts b/src/app/core/feedback/feedback-data.service.ts
index 8f6d4e3ecf..bc8a44b6f5 100644
--- a/src/app/core/feedback/feedback-data.service.ts
+++ b/src/app/core/feedback/feedback-data.service.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { DataService } from '../data/data.service';
 import { Feedback } from './models/feedback.model';
 import { FEEDBACK } from './models/feedback.resource-type';
 import { dataService } from '../cache/builders/build-decorators';
@@ -10,17 +9,19 @@ import { Store } from '@ngrx/store';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
-import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
 import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { RemoteData } from '../data/remote-data';
+import { RequestParam } from '../cache/models/request-param.model';
+import { CreateData, CreateDataImpl } from '../data/base/create-data';
 
 /**
  * Service for checking and managing the feedback
  */
 @Injectable()
 @dataService(FEEDBACK)
-export class FeedbackDataService extends DataService<Feedback> {
-  protected linkPath = 'feedbacks';
+export class FeedbackDataService extends IdentifiableDataService<Feedback> implements CreateData<Feedback> {
+  private createData: CreateDataImpl<Feedback>;
 
   constructor(
     protected requestService: RequestService,
@@ -29,10 +30,10 @@ export class FeedbackDataService extends DataService<Feedback> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DSOChangeAnalyzer<Feedback>,
   ) {
-    super();
+    super('feedbacks', requestService, rdbService, objectCache, halService);
+
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
   }
 
   /**
@@ -46,4 +47,14 @@ export class FeedbackDataService extends DataService<Feedback> {
     );
   }
 
+
+  /**
+   * Create a new object on the server, and store the response in the object cache
+   *
+   * @param object    The object to create
+   * @param params    Array with additional params to combine with query string
+   */
+  public create(object: Feedback, ...params: RequestParam[]): Observable<RemoteData<Feedback>> {
+    return this.createData.create(object, ...params);
+  }
 }
diff --git a/src/app/core/orcid/orcid-auth.service.spec.ts b/src/app/core/orcid/orcid-auth.service.spec.ts
index 27a33a85b1..617ae78b24 100644
--- a/src/app/core/orcid/orcid-auth.service.spec.ts
+++ b/src/app/core/orcid/orcid-auth.service.spec.ts
@@ -165,7 +165,8 @@ describe('OrcidAuthService', () => {
     routerStub = new RouterMock();
     researcherProfileService = jasmine.createSpyObj('ResearcherProfileService', {
       findById: jasmine.createSpy('findById'),
-      updateByOrcidOperations: jasmine.createSpy('updateByOrcidOperations')
+      patch: jasmine.createSpy('patch'),
+      updateByOrcidOperations: jasmine.createSpy('updateByOrcidOperations'),
     });
     configurationDataService = jasmine.createSpyObj('configurationDataService', {
       findByPropertyName: jasmine.createSpy('findByPropertyName')
@@ -237,7 +238,7 @@ describe('OrcidAuthService', () => {
   describe('linkOrcidByItem', () => {
     beforeEach(() => {
       scheduler = getTestScheduler();
-      researcherProfileService.updateByOrcidOperations.and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
+      researcherProfileService.patch.and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
       researcherProfileService.findById.and.returnValue(createSuccessfulRemoteDataObject$(researcherProfile));
     });
 
@@ -251,14 +252,14 @@ describe('OrcidAuthService', () => {
       scheduler.schedule(() => service.linkOrcidByItem(mockItemUnlinkedToOrcid, 'test-code').subscribe());
       scheduler.flush();
 
-      expect(researcherProfileService.updateByOrcidOperations).toHaveBeenCalledWith(researcherProfile, operations);
+      expect(researcherProfileService.patch).toHaveBeenCalledWith(researcherProfile, operations);
     });
   });
 
   describe('unlinkOrcidByItem', () => {
     beforeEach(() => {
       scheduler = getTestScheduler();
-      researcherProfileService.updateByOrcidOperations.and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
+      researcherProfileService.patch.and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
       researcherProfileService.findById.and.returnValue(createSuccessfulRemoteDataObject$(researcherProfile));
     });
 
@@ -271,7 +272,7 @@ describe('OrcidAuthService', () => {
       scheduler.schedule(() => service.unlinkOrcidByItem(mockItemLinkedToOrcid).subscribe());
       scheduler.flush();
 
-      expect(researcherProfileService.updateByOrcidOperations).toHaveBeenCalledWith(researcherProfile, operations);
+      expect(researcherProfileService.patch).toHaveBeenCalledWith(researcherProfile, operations);
     });
   });
 
diff --git a/src/app/core/orcid/orcid-auth.service.ts b/src/app/core/orcid/orcid-auth.service.ts
index cf7bc2b259..3024b7df94 100644
--- a/src/app/core/orcid/orcid-auth.service.ts
+++ b/src/app/core/orcid/orcid-auth.service.ts
@@ -77,7 +77,7 @@ export class OrcidAuthService {
 
     return this.researcherProfileService.findById(person.firstMetadata('dspace.object.owner').authority).pipe(
       getFirstCompletedRemoteData(),
-      switchMap((profileRD) => this.researcherProfileService.updateByOrcidOperations(profileRD.payload, operations))
+      switchMap((profileRD) => this.researcherProfileService.patch(profileRD.payload, operations)),
     );
   }
 
@@ -94,7 +94,7 @@ export class OrcidAuthService {
 
     return this.researcherProfileService.findById(person.firstMetadata('dspace.object.owner').authority).pipe(
       getFirstCompletedRemoteData(),
-      switchMap((profileRD) => this.researcherProfileService.updateByOrcidOperations(profileRD.payload, operations))
+      switchMap((profileRD) => this.researcherProfileService.patch(profileRD.payload, operations)),
     );
   }
 
diff --git a/src/app/core/orcid/orcid-history-data.service.ts b/src/app/core/orcid/orcid-history-data.service.ts
index cef3efbe78..9abcbac63b 100644
--- a/src/app/core/orcid/orcid-history-data.service.ts
+++ b/src/app/core/orcid/orcid-history-data.service.ts
@@ -1,16 +1,10 @@
-// eslint-disable-next-line max-classes-per-file
-import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { DataService } from '../data/data.service';
-import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
-import { ItemDataService } from '../data/item-data.service';
 import { RemoteData } from '../data/remote-data';
 import { PostRequest } from '../data/request.models';
 import { RequestService } from '../data/request.service';
@@ -19,58 +13,24 @@ import { OrcidHistory } from './model/orcid-history.model';
 import { ORCID_HISTORY } from './model/orcid-history.resource-type';
 import { OrcidQueue } from './model/orcid-queue.model';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { CoreState } from '../core-state.model';
 import { RestRequest } from '../data/rest-request.model';
 import { sendRequest } from '../shared/request.operators';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { FindListOptions } from '../data/find-list-options.model';
-import { PaginatedList } from '../data/paginated-list.model';
-
-/**
- * A private DataService implementation to delegate specific methods to.
- */
-class OrcidHistoryServiceImpl extends DataService<OrcidHistory> {
-  public linkPath = 'orcidhistories';
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<OrcidHistory>) {
-    super();
-  }
-
-}
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
 
 /**
  * A service that provides methods to make REST requests with Orcid History endpoint.
  */
 @Injectable()
 @dataService(ORCID_HISTORY)
-export class OrcidHistoryDataService {
-
-  dataService: OrcidHistoryServiceImpl;
-
-  responseMsToLive: number = 10 * 1000;
+export class OrcidHistoryDataService extends IdentifiableDataService<OrcidHistory> {
 
   constructor(
-      protected requestService: RequestService,
-      protected rdbService: RemoteDataBuildService,
-      protected store: Store<CoreState>,
-      protected objectCache: ObjectCacheService,
-      protected halService: HALEndpointService,
-      protected notificationsService: NotificationsService,
-      protected http: HttpClient,
-      protected comparator: DefaultChangeAnalyzer<OrcidHistory>,
-      protected itemService: ItemDataService ) {
-
-          this.dataService = new OrcidHistoryServiceImpl(requestService, rdbService, store, objectCache, halService,
-              notificationsService, http, comparator);
-
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super('orcidhistories', requestService, rdbService, objectCache, halService, 10 * 1000);
   }
 
   sendToORCID(orcidQueue: OrcidQueue): Observable<RemoteData<OrcidHistory>> {
@@ -87,40 +47,4 @@ export class OrcidHistoryDataService {
       switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid)  as Observable<RemoteData<OrcidHistory>>)
     );
   }
-
-  getEndpoint(): Observable<string> {
-    return this.halService.getEndpoint(this.dataService.linkPath);
-  }
-
-  /**
-   * Returns an observable of {@link RemoteData} of an object, based on its ID, with a list of
-   * {@link FollowLinkConfig}, to automatically resolve {@link HALLink}s of the object
-   * @param id                          ID of object we want to retrieve
-   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
-   *                                    no valid cached version. Defaults to true
-   * @param reRequestOnStale            Whether or not the request should automatically be re-
-   *                                    requested after the response becomes stale
-   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
-   *                                    {@link HALLink}s should be automatically resolved
-   */
-  findById(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<OrcidHistory>[]): Observable<RemoteData<OrcidHistory>> {
-    return this.dataService.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-  }
-
-  /**
-   * Returns a list of observables of {@link RemoteData} of {@link OrcidHistory}s, based on an href, with a list of {@link FollowLinkConfig},
-   * to automatically resolve {@link HALLink}s of the {@link OrcidHistory}
-   * @param href                        The url of object we want to retrieve
-   * @param findListOptions             Find list options object
-   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
-   *                                    no valid cached version. Defaults to true
-   * @param reRequestOnStale            Whether or not the request should automatically be re-
-   *                                    requested after the response becomes stale
-   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
-   *                                    {@link HALLink}s should be automatically resolved
-   */
-  findAllByHref(href: string, findListOptions: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<OrcidHistory>[]): Observable<RemoteData<PaginatedList<OrcidHistory>>> {
-    return this.dataService.findAllByHref(href, findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-  }
-
 }
diff --git a/src/app/core/orcid/orcid-queue.service.ts b/src/app/core/orcid/orcid-queue.service.ts
index 30b9580b96..9b3f47747d 100644
--- a/src/app/core/orcid/orcid-queue.service.ts
+++ b/src/app/core/orcid/orcid-queue.service.ts
@@ -1,75 +1,42 @@
-// eslint-disable-next-line max-classes-per-file
-import { DataService } from '../data/data.service';
 import { OrcidQueue } from './model/orcid-queue.model';
 import { RequestService } from '../data/request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
-import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { Injectable } from '@angular/core';
 import { dataService } from '../cache/builders/build-decorators';
 import { ORCID_QUEUE } from './model/orcid-queue.resource-type';
-import { ItemDataService } from '../data/item-data.service';
 import { Observable } from 'rxjs';
 import { RemoteData } from '../data/remote-data';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RequestParam } from '../cache/models/request-param.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { NoContent } from '../shared/NoContent.model';
-import { ConfigurationDataService } from '../data/configuration-data.service';
-import { Router } from '@angular/router';
-import { CoreState } from '../core-state.model';
-
-/**
- * A private DataService implementation to delegate specific methods to.
- */
-class OrcidQueueServiceImpl extends DataService<OrcidQueue> {
-  public linkPath = 'orcidqueues';
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<OrcidQueue>) {
-    super();
-  }
-
-}
+import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
+import { SearchData, SearchDataImpl } from '../data/base/search-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
 
 /**
  * A service that provides methods to make REST requests with Orcid Queue endpoint.
  */
 @Injectable()
 @dataService(ORCID_QUEUE)
-export class OrcidQueueService {
-
-  dataService: OrcidQueueServiceImpl;
-
-  responseMsToLive: number = 10 * 1000;
+export class OrcidQueueService extends IdentifiableDataService<OrcidQueue> {
+  private searchData: SearchData<OrcidQueue>;
+  private deleteData: DeleteData<OrcidQueue>;
 
   constructor(
-      protected requestService: RequestService,
-      protected rdbService: RemoteDataBuildService,
-      protected store: Store<CoreState>,
-      protected objectCache: ObjectCacheService,
-      protected halService: HALEndpointService,
-      protected notificationsService: NotificationsService,
-      protected http: HttpClient,
-      protected comparator: DefaultChangeAnalyzer<OrcidQueue>,
-      protected configurationService: ConfigurationDataService,
-      protected router: Router,
-      protected itemService: ItemDataService ) {
-
-          this.dataService = new OrcidQueueServiceImpl(requestService, rdbService, store, objectCache, halService,
-              notificationsService, http, comparator);
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('orcidqueues', requestService, rdbService, objectCache, halService, 10 * 1000);
 
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
@@ -82,13 +49,13 @@ export class OrcidQueueService {
    * @returns { OrcidQueue }
    */
   searchByProfileItemId(itemId: string, paginationOptions: PaginationComponentOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<RemoteData<PaginatedList<OrcidQueue>>> {
-    return this.dataService.searchBy('findByProfileItem', {
+    return this.searchData.searchBy('findByProfileItem', {
         searchParams: [new RequestParam('profileItemId', itemId)],
         elementsPerPage: paginationOptions.pageSize,
-        currentPage: paginationOptions.currentPage
+        currentPage: paginationOptions.currentPage,
       },
       useCachedVersionIfAvailable,
-      reRequestOnStale
+      reRequestOnStale,
     );
   }
 
@@ -97,14 +64,14 @@ export class OrcidQueueService {
    * @returns { NoContent }
    */
   deleteById(orcidQueueId: number): Observable<RemoteData<NoContent>> {
-    return this.dataService.delete(orcidQueueId.toString());
+    return this.deleteData.delete(orcidQueueId.toString());
   }
 
   /**
    * This method will set linkPath to stale
    */
   clearFindByProfileItemRequests() {
-    this.requestService.setStaleByHrefSubstring(this.dataService.linkPath + '/search/findByProfileItem');
+    this.requestService.setStaleByHrefSubstring(this.linkPath + '/search/findByProfileItem');
   }
 
 }
diff --git a/src/app/core/profile/researcher-profile.service.spec.ts b/src/app/core/profile/researcher-profile.service.spec.ts
index 899867ec8e..aac1c670c1 100644
--- a/src/app/core/profile/researcher-profile.service.spec.ts
+++ b/src/app/core/profile/researcher-profile.service.spec.ts
@@ -253,46 +253,27 @@ describe('ResearcherProfileService', () => {
       objectCache,
       halService,
       notificationsService,
-      http,
       routerStub,
       comparator,
-      itemService
+      itemService,
     );
     serviceAsAny = service;
 
-    spyOn((service as any).dataService, 'create').and.callThrough();
-    spyOn((service as any).dataService, 'delete').and.callThrough();
-    spyOn((service as any).dataService, 'update').and.callThrough();
-    spyOn((service as any).dataService, 'findById').and.callThrough();
-    spyOn((service as any).dataService, 'findByHref').and.callThrough();
-    spyOn((service as any).dataService, 'searchBy').and.callThrough();
-    spyOn((service as any).dataService, 'getLinkPath').and.returnValue(observableOf(endpointURL));
-
-  });
-
-  describe('findById', () => {
-    it('should proxy the call to dataservice.findById with eperson UUID', () => {
-      scheduler.schedule(() => service.findById(researcherProfileId));
-      scheduler.flush();
-
-      expect((service as any).dataService.findById).toHaveBeenCalledWith(researcherProfileId, true, true);
-    });
-
-    it('should return a ResearcherProfile object with the given id', () => {
-      const result = service.findById(researcherProfileId);
-      const expected = cold('a|', {
-        a: researcherProfileRD
-      });
-      expect(result).toBeObservable(expected);
-    });
+    spyOn((service as any), 'findById').and.callThrough();
+    spyOn((service as any), 'findByHref').and.callThrough();
+    spyOn((service as any), 'getLinkPath').and.returnValue(observableOf(endpointURL));
+    spyOn((service as any).createData, 'create').and.callThrough();
+    spyOn((service as any).patchData, 'update').and.callThrough();
+    spyOn((service as any).searchData, 'searchBy').and.callThrough();
+    spyOn((service as any).deleteData, 'delete').and.callThrough();
   });
 
   describe('create', () => {
-    it('should proxy the call to dataservice.create with eperson UUID', () => {
+    it('should proxy the call to createData.create with eperson UUID', () => {
       scheduler.schedule(() => service.create());
       scheduler.flush();
 
-      expect((service as any).dataService.create).toHaveBeenCalled();
+      expect((service as any).createData.create).toHaveBeenCalled();
     });
 
     it('should return the RemoteData<ResearcherProfile> created', () => {
@@ -305,11 +286,11 @@ describe('ResearcherProfileService', () => {
   });
 
   describe('delete', () => {
-    it('should proxy the call to dataservice.delete', () => {
-      scheduler.schedule(() => service.delete(researcherProfile));
+    it('should proxy the call to deleteData.delete', () => {
+      scheduler.schedule(() => service.delete(researcherProfile.id));
       scheduler.flush();
 
-      expect((service as any).dataService.delete).toHaveBeenCalledWith(researcherProfile.id);
+      expect((service as any).deleteData.delete).toHaveBeenCalledWith(researcherProfile.id, undefined);
     });
   });
 
@@ -360,34 +341,33 @@ describe('ResearcherProfileService', () => {
   });
 
   describe('setVisibility', () => {
-    let patchSpy;
     beforeEach(() => {
-      spyOn((service as any).dataService, 'patch').and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
-      spyOn((service as any), 'findById').and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
+      spyOn((service as any).patchData, 'patch').and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
+      (service.findById as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
     });
 
-    it('should proxy the call to dataservice.patch', () => {
+    it('should proxy the call to patchData.patch', () => {
       const replaceOperation: ReplaceOperation<boolean> = {
         path: '/visible',
         op: 'replace',
-        value: true
+        value: true,
       };
 
       scheduler.schedule(() => service.setVisibility(researcherProfile, true));
       scheduler.flush();
 
-      expect((service as any).dataService.patch).toHaveBeenCalledWith(researcherProfile, [replaceOperation]);
+      expect((service as any).patchData.patch).toHaveBeenCalledWith(researcherProfile, [replaceOperation]);
     });
   });
 
   describe('createFromExternalSource', () => {
 
     beforeEach(() => {
-      spyOn((service as any).dataService, 'patch').and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
-      spyOn((service as any), 'findById').and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
+      spyOn((service as any).patchData, 'patch').and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
+      (service.findById as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
     });
 
-    it('should proxy the call to dataservice.patch', () => {
+    it('should proxy the call to patchData.patch', () => {
       const options: HttpOptions = Object.create({});
       let headers = new HttpHeaders();
       headers = headers.append('Content-Type', 'text/uri-list');
@@ -406,14 +386,14 @@ describe('ResearcherProfileService', () => {
   describe('updateByOrcidOperations', () => {
     beforeEach(() => {
       scheduler = getTestScheduler();
-      spyOn((service as any).dataService, 'patch').and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
+      spyOn((service as any).patchData, 'patch').and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
     });
 
     it('should call patch method properly', () => {
-      scheduler.schedule(() => service.updateByOrcidOperations(researcherProfile, []).subscribe());
+      scheduler.schedule(() => service.patch(researcherProfile, []).subscribe());
       scheduler.flush();
 
-      expect((service as any).dataService.patch).toHaveBeenCalledWith(researcherProfile, []);
+      expect((service as any).patchData.patch).toHaveBeenCalledWith(researcherProfile, []);
     });
   });
 });
diff --git a/src/app/core/profile/researcher-profile.service.ts b/src/app/core/profile/researcher-profile.service.ts
index 882845d133..2f9e7b3d18 100644
--- a/src/app/core/profile/researcher-profile.service.ts
+++ b/src/app/core/profile/researcher-profile.service.ts
@@ -1,9 +1,7 @@
-/* eslint-disable max-classes-per-file */
-import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 
-import { Store } from '@ngrx/store';
 import { Operation, ReplaceOperation } from 'fast-json-patch';
 import { Observable } from 'rxjs';
 import { find, map } from 'rxjs/operators';
@@ -11,54 +9,41 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { DataService } from '../data/data.service';
 import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { ItemDataService } from '../data/item-data.service';
 import { RemoteData } from '../data/remote-data';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { NoContent } from '../shared/NoContent.model';
-import { getAllCompletedRemoteData, getFirstCompletedRemoteData } from '../shared/operators';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 import { ResearcherProfile } from './model/researcher-profile.model';
 import { RESEARCHER_PROFILE } from './model/researcher-profile.resource-type';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { PostRequest } from '../data/request.models';
 import { hasValue, isEmpty } from '../../shared/empty.util';
-import { CoreState } from '../core-state.model';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { Item } from '../shared/item.model';
 import { createFailedRemoteDataObject$ } from '../../shared/remote-data.utils';
-
-/**
- * A private DataService implementation to delegate specific methods to.
- */
-class ResearcherProfileServiceImpl extends DataService<ResearcherProfile> {
-  protected linkPath = 'profiles';
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<ResearcherProfile>) {
-    super();
-  }
-
-}
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { CreateData, CreateDataImpl } from '../data/base/create-data';
+import { SearchData, SearchDataImpl } from '../data/base/search-data';
+import { PatchData, PatchDataImpl } from '../data/base/patch-data';
+import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
+import { RestRequestMethod } from '../data/rest-request-method';
+import { RequestParam } from '../cache/models/request-param.model';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
 
 /**
  * A service that provides methods to make REST requests with researcher profile endpoint.
  */
 @Injectable()
 @dataService(RESEARCHER_PROFILE)
-export class ResearcherProfileService {
-
-  protected dataService: ResearcherProfileServiceImpl;
-
-  protected responseMsToLive: number = 10 * 1000;
+export class ResearcherProfileService extends IdentifiableDataService<ResearcherProfile> implements CreateData<ResearcherProfile>, SearchData<ResearcherProfile>, PatchData<ResearcherProfile>, DeleteData<ResearcherProfile> {
+  private createData: CreateDataImpl<ResearcherProfile>;
+  private searchData: SearchDataImpl<ResearcherProfile>;
+  private patchData: PatchDataImpl<ResearcherProfile>;
+  private deleteData: DeleteDataImpl<ResearcherProfile>;
 
   constructor(
     protected requestService: RequestService,
@@ -66,50 +51,16 @@ export class ResearcherProfileService {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
-    protected http: HttpClient,
     protected router: Router,
     protected comparator: DefaultChangeAnalyzer<ResearcherProfile>,
-    protected itemService: ItemDataService) {
+    protected itemService: ItemDataService,
+  ) {
+    super('profiles', requestService, rdbService, objectCache, halService, 10 * 1000);
 
-    this.dataService = new ResearcherProfileServiceImpl(requestService, rdbService, null, objectCache, halService,
-      notificationsService, http, comparator);
-
-  }
-
-  /**
-   * Find the researcher profile with the given uuid.
-   *
-   * @param uuid the profile uuid
-   * @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
-   */
-  public findById(uuid: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<ResearcherProfile>[]): Observable<RemoteData<ResearcherProfile>> {
-    return this.dataService.findById(uuid, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
-      getAllCompletedRemoteData(),
-    );
-  }
-
-  /**
-   * Create a new researcher profile for the current user.
-   */
-  public create(): Observable<RemoteData<ResearcherProfile>> {
-    return this.dataService.create(new ResearcherProfile());
-  }
-
-  /**
-   * Delete a researcher profile.
-   *
-   * @param researcherProfile the profile to delete
-   */
-  public delete(researcherProfile: ResearcherProfile): Observable<boolean> {
-    return this.dataService.delete(researcherProfile.id).pipe(
-      getFirstCompletedRemoteData(),
-      map((response: RemoteData<NoContent>) => response.isSuccess)
-    );
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.patchData = new PatchDataImpl<ResearcherProfile>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
@@ -152,7 +103,7 @@ export class ResearcherProfileService {
       value: visible
     };
 
-    return this.dataService.patch(researcherProfile, [replaceOperation]);
+    return this.patch(researcherProfile, [replaceOperation]);
   }
 
   /**
@@ -166,11 +117,11 @@ export class ResearcherProfileService {
     options.headers = headers;
 
     const requestId = this.requestService.generateRequestId();
-    const href$ = this.halService.getEndpoint(this.dataService.getLinkPath());
+    const href$ = this.halService.getEndpoint(this.getLinkPath());
 
     href$.pipe(
       find((href: string) => hasValue(href)),
-      map((href: string) => this.dataService.buildHrefWithParams(href, [], followLink('item')))
+      map((href: string) => this.buildHrefWithParams(href, [], followLink('item'))),
     ).subscribe((endpoint: string) => {
       const request = new PostRequest(requestId, endpoint, sourceUri, options);
       this.requestService.send(request);
@@ -179,16 +130,85 @@ export class ResearcherProfileService {
     return this.rdbService.buildFromRequestUUID(requestId, followLink('item'));
   }
 
+
   /**
-   * Update researcher profile by patch orcid operation
+   * Create a new object on the server, and store the response in the object cache
    *
-   * @param researcherProfile
-   * @param operations
+   * @param object    The object to create
+   * @param params    Array with additional params to combine with query string
    */
-  public updateByOrcidOperations(researcherProfile: ResearcherProfile, operations: Operation[]): Observable<RemoteData<ResearcherProfile>> {
-    return this.dataService.patch(researcherProfile, operations);
+  public create(object?: ResearcherProfile, ...params: RequestParam[]): Observable<RemoteData<ResearcherProfile>> {
+    if (isEmpty(object)) {
+      object = new ResearcherProfile();
+    }
+    return this.createData.create(object, ...params);
   }
 
+  searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<ResearcherProfile>[]): Observable<RemoteData<PaginatedList<ResearcherProfile>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
 
+  getSearchByHref?(searchMethod: string, options?: FindListOptions, ...linksToFollow: FollowLinkConfig<ResearcherProfile>[]): Observable<string> {
+    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
+  }
+
+  /**
+   * Commit current object changes to the server
+   * @param method The RestRequestMethod for which de server sync buffer should be committed
+   */
+  public commitUpdates(method?: RestRequestMethod): void {
+    this.patchData.commitUpdates(method);
+  }
+
+  /**
+   * Return a list of operations representing the difference between an object and its latest value in the cache.
+   * @param object  the object to resolve to a list of patch operations
+   */
+  public createPatchFromCache(object: ResearcherProfile): Observable<Operation[]> {
+    return this.patchData.createPatchFromCache(object);
+  }
+
+  /**
+   * 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
+   */
+  public patch(object: ResearcherProfile, operations: Operation[]): Observable<RemoteData<ResearcherProfile>> {
+    return this.patchData.patch(object, operations);
+  }
+
+  /**
+   * 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
+   */
+  public update(object: ResearcherProfile): Observable<RemoteData<ResearcherProfile>> {
+    return this.patchData.update(object);
+  }
+
+  /**
+   * Delete an existing 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
+   */
+  public delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.delete(objectId, copyVirtualMetadata);
+  }
+
+  /**
+   * Delete an existing 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.
+   */
+  public deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.deleteByHref(href, copyVirtualMetadata);
+  }
 
 }
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..62c07ad862 100644
--- a/src/app/core/resource-policy/resource-policy.service.spec.ts
+++ b/src/app/core/resource-policy/resource-policy.service.spec.ts
@@ -131,7 +131,6 @@ describe('ResourcePolicyService', () => {
     });
     objectCache = {} as ObjectCacheService;
     const notificationsService = {} as NotificationsService;
-    const http = {} as HttpClient;
     const comparator = {} as any;
 
     service = new ResourcePolicyService(
@@ -140,42 +139,41 @@ describe('ResourcePolicyService', () => {
       objectCache,
       halService,
       notificationsService,
-      http,
       comparator,
       ePersonService,
-      groupService
+      groupService,
     );
 
-    spyOn((service as any).dataService, 'create').and.callThrough();
-    spyOn((service as any).dataService, 'delete').and.callThrough();
-    spyOn((service as any).dataService, 'update').and.callThrough();
-    spyOn((service as any).dataService, 'findById').and.callThrough();
-    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).createData, 'create').and.callThrough();
+    spyOn((service as any).deleteData, 'delete').and.callThrough();
+    spyOn((service as any).patchData, 'update').and.callThrough();
+    spyOn((service as any), 'findById').and.callThrough();
+    spyOn((service as any), 'findByHref').and.callThrough();
+    spyOn((service as any).searchData, 'searchBy').and.callThrough();
+    spyOn((service as any).searchData, 'getSearchByHref').and.returnValue(observableOf(requestURL));
   });
 
   describe('create', () => {
-    it('should proxy the call to dataservice.create with eperson UUID', () => {
+    it('should proxy the call to createData.create with eperson UUID', () => {
       scheduler.schedule(() => service.create(resourcePolicy, resourceUUID, epersonUUID));
       const params = [
         new RequestParam('resource', resourceUUID),
-        new RequestParam('eperson', epersonUUID)
+        new RequestParam('eperson', epersonUUID),
       ];
       scheduler.flush();
 
-      expect((service as any).dataService.create).toHaveBeenCalledWith(resourcePolicy, ...params);
+      expect((service as any).createData.create).toHaveBeenCalledWith(resourcePolicy, ...params);
     });
 
-    it('should proxy the call to dataservice.create with group UUID', () => {
+    it('should proxy the call to createData.create with group UUID', () => {
       scheduler.schedule(() => service.create(resourcePolicy, resourceUUID, null, groupUUID));
       const params = [
         new RequestParam('resource', resourceUUID),
-        new RequestParam('group', groupUUID)
+        new RequestParam('group', groupUUID),
       ];
       scheduler.flush();
 
-      expect((service as any).dataService.create).toHaveBeenCalledWith(resourcePolicy, ...params);
+      expect((service as any).createData.create).toHaveBeenCalledWith(resourcePolicy, ...params);
     });
 
     it('should return a RemoteData<ResourcePolicy> for the object with the given id', () => {
@@ -188,31 +186,24 @@ describe('ResourcePolicyService', () => {
   });
 
   describe('delete', () => {
-    it('should proxy the call to dataservice.create', () => {
+    it('should proxy the call to deleteData.delete', () => {
       scheduler.schedule(() => service.delete(resourcePolicyId));
       scheduler.flush();
 
-      expect((service as any).dataService.delete).toHaveBeenCalledWith(resourcePolicyId);
+      expect((service as any).deleteData.delete).toHaveBeenCalledWith(resourcePolicyId);
     });
   });
 
   describe('update', () => {
-    it('should proxy the call to dataservice.update', () => {
+    it('should proxy the call to updateData.update', () => {
       scheduler.schedule(() => service.update(resourcePolicy));
       scheduler.flush();
 
-      expect((service as any).dataService.update).toHaveBeenCalledWith(resourcePolicy);
+      expect((service as any).patchData.update).toHaveBeenCalledWith(resourcePolicy);
     });
   });
 
   describe('findById', () => {
-    it('should proxy the call to dataservice.findById', () => {
-      scheduler.schedule(() => service.findById(resourcePolicyId));
-      scheduler.flush();
-
-      expect((service as any).dataService.findById).toHaveBeenCalledWith(resourcePolicyId, true, true);
-    });
-
     it('should return a RemoteData<ResourcePolicy> for the object with the given id', () => {
       const result = service.findById(resourcePolicyId);
       const expected = cold('a|', {
@@ -223,13 +214,6 @@ describe('ResourcePolicyService', () => {
   });
 
   describe('findByHref', () => {
-    it('should proxy the call to dataservice.findByHref', () => {
-      scheduler.schedule(() => service.findByHref(requestURL));
-      scheduler.flush();
-
-      expect((service as any).dataService.findByHref).toHaveBeenCalledWith(requestURL, true, true);
-    });
-
     it('should return a RemoteData<ResourcePolicy> for the object with the given URL', () => {
       const result = service.findByHref(requestURL);
       const expected = cold('a|', {
@@ -240,16 +224,16 @@ describe('ResourcePolicyService', () => {
   });
 
   describe('searchByEPerson', () => {
-    it('should proxy the call to dataservice.searchBy', () => {
+    it('should proxy the call to searchData.searchBy', () => {
       const options = new FindListOptions();
       options.searchParams = [new RequestParam('uuid', epersonUUID)];
       scheduler.schedule(() => service.searchByEPerson(epersonUUID));
       scheduler.flush();
 
-      expect((service as any).dataService.searchBy).toHaveBeenCalledWith((service as any).searchByEPersonMethod, options, true, true);
+      expect((service as any).searchData.searchBy).toHaveBeenCalledWith((service as any).searchByEPersonMethod, options, true, true);
     });
 
-    it('should proxy the call to dataservice.searchBy with additional search param', () => {
+    it('should proxy the call to searchData.searchBy with additional search param', () => {
       const options = new FindListOptions();
       options.searchParams = [
         new RequestParam('uuid', epersonUUID),
@@ -258,7 +242,7 @@ describe('ResourcePolicyService', () => {
       scheduler.schedule(() => service.searchByEPerson(epersonUUID, resourceUUID));
       scheduler.flush();
 
-      expect((service as any).dataService.searchBy).toHaveBeenCalledWith((service as any).searchByEPersonMethod, options, true, true);
+      expect((service as any).searchData.searchBy).toHaveBeenCalledWith((service as any).searchByEPersonMethod, options, true, true);
     });
 
     it('should return a RemoteData<PaginatedList<ResourcePolicy>) for the search', () => {
@@ -272,16 +256,16 @@ describe('ResourcePolicyService', () => {
   });
 
   describe('searchByGroup', () => {
-    it('should proxy the call to dataservice.searchBy', () => {
+    it('should proxy the call to searchData.searchBy', () => {
       const options = new FindListOptions();
       options.searchParams = [new RequestParam('uuid', groupUUID)];
       scheduler.schedule(() => service.searchByGroup(groupUUID));
       scheduler.flush();
 
-      expect((service as any).dataService.searchBy).toHaveBeenCalledWith((service as any).searchByGroupMethod, options, true, true);
+      expect((service as any).searchData.searchBy).toHaveBeenCalledWith((service as any).searchByGroupMethod, options, true, true);
     });
 
-    it('should proxy the call to dataservice.searchBy with additional search param', () => {
+    it('should proxy the call to searchData.searchBy with additional search param', () => {
       const options = new FindListOptions();
       options.searchParams = [
         new RequestParam('uuid', groupUUID),
@@ -290,7 +274,7 @@ describe('ResourcePolicyService', () => {
       scheduler.schedule(() => service.searchByGroup(groupUUID, resourceUUID));
       scheduler.flush();
 
-      expect((service as any).dataService.searchBy).toHaveBeenCalledWith((service as any).searchByGroupMethod, options, true, true);
+      expect((service as any).searchData.searchBy).toHaveBeenCalledWith((service as any).searchByGroupMethod, options, true, true);
     });
 
     it('should return a RemoteData<PaginatedList<ResourcePolicy>) for the search', () => {
@@ -304,16 +288,16 @@ describe('ResourcePolicyService', () => {
   });
 
   describe('searchByResource', () => {
-    it('should proxy the call to dataservice.searchBy', () => {
+    it('should proxy the call to searchData.searchBy', () => {
       const options = new FindListOptions();
       options.searchParams = [new RequestParam('uuid', resourceUUID)];
       scheduler.schedule(() => service.searchByResource(resourceUUID));
       scheduler.flush();
 
-      expect((service as any).dataService.searchBy).toHaveBeenCalledWith((service as any).searchByResourceMethod, options, true, true);
+      expect((service as any).searchData.searchBy).toHaveBeenCalledWith((service as any).searchByResourceMethod, options, true, true);
     });
 
-    it('should proxy the call to dataservice.searchBy with additional search param', () => {
+    it('should proxy the call to searchData.searchBy with additional search param', () => {
       const action = ActionType.READ;
       const options = new FindListOptions();
       options.searchParams = [
@@ -323,7 +307,7 @@ describe('ResourcePolicyService', () => {
       scheduler.schedule(() => service.searchByResource(resourceUUID, action));
       scheduler.flush();
 
-      expect((service as any).dataService.searchBy).toHaveBeenCalledWith((service as any).searchByResourceMethod, options, true, true);
+      expect((service as any).searchData.searchBy).toHaveBeenCalledWith((service as any).searchByResourceMethod, options, true, true);
     });
 
     it('should return a RemoteData<PaginatedList<ResourcePolicy>) for the search', () => {
diff --git a/src/app/core/resource-policy/resource-policy.service.ts b/src/app/core/resource-policy/resource-policy.service.ts
index b0b7a6bd97..2f5fb96c41 100644
--- a/src/app/core/resource-policy/resource-policy.service.ts
+++ b/src/app/core/resource-policy/resource-policy.service.ts
@@ -1,13 +1,8 @@
-/* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
-import { HttpClient, HttpHeaders } from '@angular/common/http';
-
-import { Store } from '@ngrx/store';
+import { HttpHeaders } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { dataService } from '../cache/builders/build-decorators';
-
-import { DataService } from '../data/data.service';
 import { RequestService } from '../data/request.service';
 import { Collection } from '../shared/collection.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -17,7 +12,6 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { RESOURCE_POLICY } from './models/resource-policy.resource-type';
-import { ChangeAnalyzer } from '../data/change-analyzer';
 import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { PaginatedList } from '../data/paginated-list.model';
 import { ActionType } from './models/action-type.model';
@@ -26,7 +20,6 @@ import { isNotEmpty } from '../../shared/empty.util';
 import { map, take } from 'rxjs/operators';
 import { NoContent } from '../shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from '../data/find-list-options.model';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { PutRequest } from '../data/request.models';
@@ -36,52 +29,43 @@ import { StatusCodeOnlyResponseParsingService } from '../data/status-code-only-r
 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.
- */
-class DataServiceImpl extends DataService<ResourcePolicy> {
-  protected linkPath = 'resourcepolicies';
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: ChangeAnalyzer<ResourcePolicy>,
-  ) {
-    super();
-  }
-
-}
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { CreateDataImpl } from '../data/base/create-data';
+import { SearchDataImpl } from '../data/base/search-data';
+import { PatchDataImpl } from '../data/base/patch-data';
+import { DeleteDataImpl } from '../data/base/delete-data';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the resourcepolicies endpoint
  */
 @Injectable()
 @dataService(RESOURCE_POLICY)
-export class ResourcePolicyService {
-  private dataService: DataServiceImpl;
+export class ResourcePolicyService extends IdentifiableDataService<ResourcePolicy> {
   protected searchByEPersonMethod = 'eperson';
   protected searchByGroupMethod = 'group';
   protected searchByResourceMethod = 'resource';
 
+  private createData: CreateDataImpl<ResourcePolicy>;
+  private searchData: SearchDataImpl<ResourcePolicy>;
+  private patchData: PatchDataImpl<ResourcePolicy>;
+  private deleteData: DeleteDataImpl<ResourcePolicy>;
+
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
-    protected http: HttpClient,
     protected comparator: DefaultChangeAnalyzer<ResourcePolicy>,
     protected ePersonService: EPersonDataService,
     protected groupService: GroupDataService,
   ) {
-    this.dataService = new DataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator);
+    super('resourcepolicies', requestService, rdbService, objectCache, halService);
+
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.patchData = new PatchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
@@ -105,7 +89,7 @@ export class ResourcePolicyService {
     } else if (isNotEmpty(groupUUID)) {
       params.push(new RequestParam('group', groupUUID));
     }
-    return this.dataService.create(resourcePolicy, ...params);
+    return this.createData.create(resourcePolicy, ...params);
   }
 
   /**
@@ -115,9 +99,9 @@ export class ResourcePolicyService {
    * @return an observable that emits true when the deletion was successful, false when it failed
    */
   delete(resourcePolicyID: string): Observable<boolean> {
-    return this.dataService.delete(resourcePolicyID).pipe(
+    return this.deleteData.delete(resourcePolicyID).pipe(
       getFirstCompletedRemoteData(),
-      map((response: RemoteData<NoContent>) => response.hasSucceeded)
+      map((response: RemoteData<NoContent>) => response.hasSucceeded),
     );
   }
 
@@ -127,37 +111,7 @@ export class ResourcePolicyService {
    * @param {ResourcePolicy} object The given object
    */
   update(object: ResourcePolicy): Observable<RemoteData<ResourcePolicy>> {
-    return this.dataService.update(object);
-  }
-
-  /**
-   * Returns an observable of {@link RemoteData} of a {@link ResourcePolicy}, based on an href, with a list of {@link FollowLinkConfig},
-   * to automatically resolve {@link HALLink}s of the {@link ResourcePolicy}
-   * @param href                        The url 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
-   */
-  findByHref(href: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<ResourcePolicy>[]): Observable<RemoteData<ResourcePolicy>> {
-    return this.dataService.findByHref(href, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-  }
-
-  /**
-   * Returns an observable of {@link RemoteData} of a {@link ResourcePolicy}, based on its ID, with a list of {@link FollowLinkConfig},
-   * to automatically resolve {@link HALLink}s of the object
-   * @param id                          ID of {@link ResourcePolicy} 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<ResourcePolicy>[]): Observable<RemoteData<ResourcePolicy>> {
-    return this.dataService.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+    return this.patchData.update(object);
   }
 
   /**
@@ -167,7 +121,7 @@ export class ResourcePolicyService {
    * @param findListOptions the {@link FindListOptions} for the request
    */
   getDefaultAccessConditionsFor(collection: Collection, findListOptions?: FindListOptions): Observable<RemoteData<PaginatedList<ResourcePolicy>>> {
-    return this.dataService.findAllByHref(collection._links.defaultAccessConditions.href, findListOptions);
+    return this.findAllByHref(collection._links.defaultAccessConditions.href, findListOptions);
   }
 
   /**
@@ -188,7 +142,7 @@ export class ResourcePolicyService {
     if (isNotEmpty(resourceUUID)) {
       options.searchParams.push(new RequestParam('resource', resourceUUID));
     }
-    return this.dataService.searchBy(this.searchByEPersonMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+    return this.searchData.searchBy(this.searchByEPersonMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
   /**
@@ -209,7 +163,7 @@ export class ResourcePolicyService {
     if (isNotEmpty(resourceUUID)) {
       options.searchParams.push(new RequestParam('resource', resourceUUID));
     }
-    return this.dataService.searchBy(this.searchByGroupMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+    return this.searchData.searchBy(this.searchByGroupMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
   /**
@@ -230,7 +184,7 @@ export class ResourcePolicyService {
     if (isNotEmpty(action)) {
       options.searchParams.push(new RequestParam('action', action));
     }
-    return this.dataService.searchBy(this.searchByResourceMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+    return this.searchData.searchBy(this.searchByResourceMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
   /**
@@ -256,7 +210,7 @@ export class ResourcePolicyService {
 
     const requestId = this.requestService.generateRequestId();
 
-    this.requestService.setStaleByHrefSubstring(`${this.dataService.getLinkPath()}/${resourcePolicyId}/${targetType}`);
+    this.requestService.setStaleByHrefSubstring(`${this.getLinkPath()}/${resourcePolicyId}/${targetType}`);
 
     targetEndpoint$.subscribe((targetEndpoint) => {
       const resourceEndpoint = resourcePolicyHref + '/' + targetType;
diff --git a/src/app/core/shared/search/search.service.ts b/src/app/core/shared/search/search.service.ts
index 5f38c6565a..7911db026d 100644
--- a/src/app/core/shared/search/search.service.ts
+++ b/src/app/core/shared/search/search.service.ts
@@ -1,14 +1,12 @@
 /* eslint-disable max-classes-per-file */
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { Injectable, OnDestroy } from '@angular/core';
-import { Router } from '@angular/router';
 import { map, switchMap, take } from 'rxjs/operators';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { LinkService } from '../../cache/builders/link.service';
 import { PaginatedList } from '../../data/paginated-list.model';
 import { ResponseParsingService } from '../../data/parsing.service';
 import { RemoteData } from '../../data/remote-data';
-import { GetRequest} from '../../data/request.models';
+import { GetRequest } from '../../data/request.models';
 import { RequestService } from '../../data/request.service';
 import { DSpaceObject } from '../dspace-object.model';
 import { GenericConstructor } from '../generic-constructor';
@@ -21,7 +19,6 @@ import { SearchResponseParsingService } from '../../data/search-response-parsing
 import { SearchObjects } from '../../../shared/search/models/search-objects.model';
 import { FacetValueResponseParsingService } from '../../data/facet-value-response-parsing.service';
 import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
-import { CommunityDataService } from '../../data/community-data.service';
 import { ViewMode } from '../view-mode.model';
 import { DSpaceObjectDataService } from '../../data/dspace-object-data.service';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
@@ -34,31 +31,19 @@ import { FacetValues } from '../../../shared/search/models/facet-values.model';
 import { PaginationService } from '../../pagination/pagination.service';
 import { SearchConfigurationService } from './search-configuration.service';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { DataService } from '../../data/data.service';
-import { Store } from '@ngrx/store';
-import { 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 { RestRequest } from '../../data/rest-request.model';
-import { CoreState } from '../../core-state.model';
+import { BaseDataService } from '../../data/base/base-data.service';
 
 /**
- * A class that lets us delegate some methods to DataService
+ * A limited data service implementation for the 'discover' endpoint
+ * - Overrides {@link BaseDataService.addEmbedParams} in order to make it public
+ *
+ * Doesn't use any of the service's dependencies, they are initialized as undefined
+ * Therefore, equest/response handling methods won't work even though they're defined
  */
-class DataServiceImpl extends DataService<any> {
-  protected linkPath = 'discover';
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DSOChangeAnalyzer<any>) {
-    super();
+class SearchDataService extends BaseDataService<any> {
+  constructor() {
+    super('discover', undefined, undefined, undefined, undefined);
   }
 
   /**
@@ -99,31 +84,20 @@ export class SearchService implements OnDestroy {
   private sub;
 
   /**
-   * Instance of DataServiceImpl that lets us delegate some methods to DataService
+   * Instance of SearchDataService to forward data service methods to
    */
-  private searchDataService: DataServiceImpl;
+  private searchDataService: SearchDataService;
 
-  constructor(private router: Router,
-              private routeService: RouteService,
-              protected requestService: RequestService,
-              private rdb: RemoteDataBuildService,
-              private linkService: LinkService,
-              private halService: HALEndpointService,
-              private communityService: CommunityDataService,
-              private dspaceObjectService: DSpaceObjectDataService,
-              private paginationService: PaginationService,
-              private searchConfigurationService: SearchConfigurationService
+  constructor(
+    private routeService: RouteService,
+    protected requestService: RequestService,
+    private rdb: RemoteDataBuildService,
+    private halService: HALEndpointService,
+    private dspaceObjectService: DSpaceObjectDataService,
+    private paginationService: PaginationService,
+    private searchConfigurationService: SearchConfigurationService,
   ) {
-    this.searchDataService = new DataServiceImpl(
-      undefined,
-      undefined,
-      undefined,
-      undefined,
-      undefined,
-      undefined,
-      undefined,
-      undefined
-    );
+    this.searchDataService = new SearchDataService();
   }
 
   /**
diff --git a/src/app/core/statistics/usage-report-data.service.ts b/src/app/core/statistics/usage-report-data.service.ts
index be23f71c48..7511264de8 100644
--- a/src/app/core/statistics/usage-report-data.service.ts
+++ b/src/app/core/statistics/usage-report-data.service.ts
@@ -1,41 +1,38 @@
-import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { DataService } from '../data/data.service';
 import { RequestService } from '../data/request.service';
-import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { USAGE_REPORT } from './models/usage-report.resource-type';
 import { UsageReport } from './models/usage-report.model';
 import { Observable } from 'rxjs';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../shared/operators';
+import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
 import { map } from 'rxjs/operators';
-import { CoreState } from '../core-state.model';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { SearchData, SearchDataImpl } from '../data/base/search-data';
+import { FindListOptions } from '../data/find-list-options.model';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteData } from '../data/remote-data';
+import { PaginatedList } from '../data/paginated-list.model';
 
 /**
  * A service to retrieve {@link UsageReport}s from the REST API
  */
 @Injectable()
 @dataService(USAGE_REPORT)
-export class UsageReportService extends DataService<UsageReport> {
-
-  protected linkPath = 'usagereports';
+export class UsageReportService extends IdentifiableDataService<UsageReport> implements SearchData<UsageReport> {
+  private searchData: SearchDataImpl<UsageReport>;
 
   constructor(
-    protected comparator: DefaultChangeAnalyzer<UsageReport>,
-    protected halService: HALEndpointService,
-    protected http: HttpClient,
-    protected notificationsService: NotificationsService,
-    protected objectCache: ObjectCacheService,
-    protected rdbService: RemoteDataBuildService,
     protected requestService: RequestService,
-    protected store: Store<CoreState>,
+    protected rdbService: RemoteDataBuildService,
+    protected halService: HALEndpointService,
+    protected objectCache: ObjectCacheService,
   ) {
-    super();
+    super('usagereports', requestService, rdbService, objectCache, halService);
+
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   getStatistic(scope: string, type: string): Observable<UsageReport> {
@@ -47,10 +44,12 @@ export class UsageReportService extends DataService<UsageReport> {
 
   searchStatistics(uri: string, page: number, size: number): Observable<UsageReport[]> {
     return this.searchBy('object', {
-      searchParams: [{
-        fieldName: `uri`,
-        fieldValue: uri,
-      }],
+      searchParams: [
+        {
+          fieldName: `uri`,
+          fieldValue: uri,
+        },
+      ],
       currentPage: page,
       elementsPerPage: size,
     }, true, false).pipe(
@@ -59,4 +58,8 @@ export class UsageReportService extends DataService<UsageReport> {
       map((list) => list.page),
     );
   }
+
+  public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<UsageReport>[]): Observable<RemoteData<PaginatedList<UsageReport>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
 }
diff --git a/src/app/core/submission/resolver/submission-object.resolver.ts b/src/app/core/submission/resolver/submission-object.resolver.ts
index 32f6c544e2..09561fbafa 100644
--- a/src/app/core/submission/resolver/submission-object.resolver.ts
+++ b/src/app/core/submission/resolver/submission-object.resolver.ts
@@ -1,14 +1,12 @@
-import { DSpaceObject } from './../../shared/dspace-object.model';
-import { followLink } from './../../../shared/utils/follow-link-config.model';
-import { ChildHALResource } from './../../shared/child-hal-resource.model';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 import { Store } from '@ngrx/store';
 import { switchMap } from 'rxjs/operators';
-import { DataService } from '../../data/data.service';
 import { RemoteData } from '../../data/remote-data';
 import { getFirstCompletedRemoteData } from '../../shared/operators';
+import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated
@@ -16,8 +14,8 @@ import { getFirstCompletedRemoteData } from '../../shared/operators';
 @Injectable()
 export class SubmissionObjectResolver<T> implements Resolve<RemoteData<T>> {
     constructor(
-        protected dataService: DataService<any>,
-        protected store: Store<any>
+      protected dataService: IdentifiableDataService<any>,
+      protected store: Store<any>,
     ) {
     }
 
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 4c92ad708a..1a2d2f3d7d 100644
--- a/src/app/core/submission/submission-cc-license-data.service.ts
+++ b/src/app/core/submission/submission-cc-license-data.service.ts
@@ -1,34 +1,49 @@
-import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { DataService } from '../data/data.service';
 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 { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
-import { CoreState } from '../core-state.model';
+import { BaseDataService } from '../data/base/base-data.service';
+import { FindAllData } 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';
+import { RemoteData } from '../data/remote-data';
+import { PaginatedList } from '../data/paginated-list.model';
 
 @Injectable()
 @dataService(SUBMISSION_CC_LICENSE)
-export class SubmissionCcLicenseDataService extends DataService<SubmissionCcLicence> {
+export class SubmissionCcLicenseDataService extends BaseDataService<SubmissionCcLicence> implements FindAllData<SubmissionCcLicence> {
 
   protected linkPath = 'submissioncclicenses';
 
   constructor(
-    protected comparator: DefaultChangeAnalyzer<SubmissionCcLicence>,
-    protected halService: HALEndpointService,
-    protected http: HttpClient,
-    protected notificationsService: NotificationsService,
-    protected objectCache: ObjectCacheService,
-    protected rdbService: RemoteDataBuildService,
     protected requestService: RequestService,
-    protected store: Store<CoreState>,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
   ) {
-    super();
+    super('submissioncclicenses', requestService, rdbService, objectCache, halService);
+  }
+
+  /**
+   * 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
+   */
+  public findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<SubmissionCcLicence>[]): Observable<RemoteData<PaginatedList<SubmissionCcLicence>>> {
+    return undefined;
   }
 }
diff --git a/src/app/core/submission/submission-cc-license-url-data.service.ts b/src/app/core/submission/submission-cc-license-url-data.service.ts
index 1e72f79193..d40e75cdef 100644
--- a/src/app/core/submission/submission-cc-license-url-data.service.ts
+++ b/src/app/core/submission/submission-cc-license-url-data.service.ts
@@ -1,40 +1,36 @@
-import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { DataService } from '../data/data.service';
 import { RequestService } from '../data/request.service';
-import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { SubmissionCcLicenceUrl } from './models/submission-cc-license-url.model';
 import { SUBMISSION_CC_LICENSE_URL } from './models/submission-cc-licence-link.resource-type';
 import { Field, Option, SubmissionCcLicence } from './models/submission-cc-license.model';
 import { Observable } from 'rxjs';
-import { filter, map, switchMap } from 'rxjs/operators';
+import { map, switchMap } from 'rxjs/operators';
 import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../shared/operators';
-import { isNotEmpty } from '../../shared/empty.util';
-import { CoreState } from '../core-state.model';
+import { BaseDataService } from '../data/base/base-data.service';
+import { SearchData, SearchDataImpl } from '../data/base/search-data';
+import { FindListOptions } from '../data/find-list-options.model';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteData } from '../data/remote-data';
+import { PaginatedList } from '../data/paginated-list.model';
 
 @Injectable()
 @dataService(SUBMISSION_CC_LICENSE_URL)
-export class SubmissionCcLicenseUrlDataService extends DataService<SubmissionCcLicenceUrl> {
-
-  protected linkPath = 'submissioncclicenseUrls-search';
+export class SubmissionCcLicenseUrlDataService extends BaseDataService<SubmissionCcLicenceUrl> implements SearchData<SubmissionCcLicenceUrl> {
+  private searchData: SearchData<SubmissionCcLicenceUrl>;
 
   constructor(
-    protected comparator: DefaultChangeAnalyzer<SubmissionCcLicenceUrl>,
-    protected halService: HALEndpointService,
-    protected http: HttpClient,
-    protected notificationsService: NotificationsService,
-    protected objectCache: ObjectCacheService,
-    protected rdbService: RemoteDataBuildService,
     protected requestService: RequestService,
-    protected store: Store<CoreState>,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
   ) {
-    super();
+    super('submissioncclicenseUrls-search', requestService, rdbService, objectCache, halService);
+
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive, (href, searchMethod) => `${href}/${searchMethod}`);
   }
 
   /**
@@ -68,9 +64,34 @@ export class SubmissionCcLicenseUrlDataService extends DataService<SubmissionCcL
     );
   }
 
-  protected getSearchEndpoint(searchMethod: string): Observable<string> {
-    return this.halService.getEndpoint(`${this.linkPath}`).pipe(
-      filter((href: string) => isNotEmpty(href)),
-      map((href: string) => `${href}/${searchMethod}`));
+  /**
+   * 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<SubmissionCcLicenceUrl>[]): Observable<string> {
+    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
+  }
+
+  /**
+   * 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
+   */
+  public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<SubmissionCcLicenceUrl>[]): Observable<RemoteData<PaginatedList<SubmissionCcLicenceUrl>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 }
diff --git a/src/app/core/submission/submission-object-data.service.ts b/src/app/core/submission/submission-object-data.service.ts
index 97256ea8da..18816fbfd2 100644
--- a/src/app/core/submission/submission-object-data.service.ts
+++ b/src/app/core/submission/submission-object-data.service.ts
@@ -7,11 +7,11 @@ import { SubmissionObject } from './models/submission-object.model';
 import { SubmissionScopeType } from './submission-scope-type';
 import { WorkflowItemDataService } from './workflowitem-data.service';
 import { WorkspaceitemDataService } from './workspaceitem-data.service';
-import { DataService } from '../data/data.service';
 import { map } from 'rxjs/operators';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { environment } from '../../../environments/environment';
 import { RequestEntryState } from '../data/request-entry-state.model';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
 
 /**
  * A service to retrieve submission objects (WorkspaceItem/WorkflowItem)
@@ -34,7 +34,7 @@ export class SubmissionObjectDataService {
    * @param id The identifier for the object
    */
   getHrefByID(id): Observable<string> {
-    const dataService: DataService<SubmissionObject> = this.submissionService.getSubmissionScope() === SubmissionScopeType.WorkspaceItem ? this.workspaceitemDataService : this.workflowItemDataService;
+    const dataService: IdentifiableDataService<SubmissionObject> = this.submissionService.getSubmissionScope() === SubmissionScopeType.WorkspaceItem ? this.workspaceitemDataService : this.workflowItemDataService;
 
     return this.halService.getEndpoint(dataService.getLinkPath()).pipe(
       map((endpoint: string) => dataService.getIDHref(endpoint, encodeURIComponent(id))));
diff --git a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.spec.ts b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.spec.ts
new file mode 100644
index 0000000000..8f9ed030d3
--- /dev/null
+++ b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.spec.ts
@@ -0,0 +1,16 @@
+/**
+ * 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 { testFindAllDataImplementation } from '../../data/base/find-all-data.spec';
+import { VocabularyEntryDetailsDataService } from './vocabulary-entry-details.data.service';
+import { testSearchDataImplementation } from '../../data/base/search-data.spec';
+
+describe('VocabularyEntryDetailsDataService', () => {
+  testFindAllDataImplementation(new VocabularyEntryDetailsDataService(null, null, null, null));
+  testSearchDataImplementation(new VocabularyEntryDetailsDataService(null, null, null, null));
+});
diff --git a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
new file mode 100644
index 0000000000..aaa0c23d20
--- /dev/null
+++ b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
@@ -0,0 +1,104 @@
+/**
+ * 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 { IdentifiableDataService } from '../../data/base/identifiable-data.service';
+import { VocabularyEntryDetail } from './models/vocabulary-entry-detail.model';
+import { RequestService } from '../../data/request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+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';
+import { RemoteData } from '../../data/remote-data';
+import { PaginatedList } from '../../data/paginated-list.model';
+import { SearchData, SearchDataImpl } from '../../data/base/search-data';
+import { Injectable } from '@angular/core';
+import { dataService } from '../../cache/builders/build-decorators';
+import { VOCABULARY_ENTRY_DETAIL } from './models/vocabularies.resource-type';
+
+@Injectable()
+@dataService(VOCABULARY_ENTRY_DETAIL)
+export class VocabularyEntryDetailsDataService extends IdentifiableDataService<VocabularyEntryDetail> implements FindAllData<VocabularyEntryDetail>, SearchData<VocabularyEntryDetail> {
+  private findAllData: FindAllData<VocabularyEntryDetail>;
+  private searchData: SearchData<VocabularyEntryDetail>;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super('vocabularyEntryDetails', requestService, rdbService, objectCache, halService);
+
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+
+  /**
+   * 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<VocabularyEntryDetail>[]): Observable<string> {
+    return this.findAllData.getFindAllHref(options, linkPath, ...linksToFollow);
+  }
+
+  /**
+   * 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
+   */
+  public findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<VocabularyEntryDetail>[]): Observable<RemoteData<PaginatedList<VocabularyEntryDetail>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * 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
+   */
+  public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<VocabularyEntryDetail>[]): Observable<RemoteData<PaginatedList<VocabularyEntryDetail>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...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): Observable<string> {
+    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
+  }
+}
diff --git a/src/app/core/submission/vocabularies/vocabulary.data.service.spec.ts b/src/app/core/submission/vocabularies/vocabulary.data.service.spec.ts
new file mode 100644
index 0000000000..d918ea8352
--- /dev/null
+++ b/src/app/core/submission/vocabularies/vocabulary.data.service.spec.ts
@@ -0,0 +1,14 @@
+/**
+ * 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 { VocabularyDataService } from './vocabulary.data.service';
+import { testFindAllDataImplementation } from '../../data/base/find-all-data.spec';
+
+
+describe('VocabularyDataService', () => {
+  testFindAllDataImplementation(new VocabularyDataService(null, null, null, null));
+});
diff --git a/src/app/core/submission/vocabularies/vocabulary.data.service.ts b/src/app/core/submission/vocabularies/vocabulary.data.service.ts
new file mode 100644
index 0000000000..3e19ee4653
--- /dev/null
+++ b/src/app/core/submission/vocabularies/vocabulary.data.service.ts
@@ -0,0 +1,70 @@
+/**
+ * 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 { IdentifiableDataService } from '../../data/base/identifiable-data.service';
+import { RequestService } from '../../data/request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { Vocabulary } from './models/vocabulary.model';
+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';
+import { RemoteData } from '../../data/remote-data';
+import { PaginatedList } from '../../data/paginated-list.model';
+import { Injectable } from '@angular/core';
+import { dataService } from '../../cache/builders/build-decorators';
+import { VOCABULARY } from './models/vocabularies.resource-type';
+
+@Injectable()
+@dataService(VOCABULARY)
+export class VocabularyDataService extends IdentifiableDataService<Vocabulary> implements FindAllData<Vocabulary> {
+  private findAllData: FindAllData<Vocabulary>;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super('vocabularies', requestService, rdbService, objectCache, halService);
+
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+
+  /**
+   * 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<Vocabulary>[]): Observable<string> {
+    return this.findAllData.getFindAllHref(options, linkPath, ...linksToFollow);
+  }
+
+  /**
+   * 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
+   */
+  public findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Vocabulary>[]): Observable<RemoteData<PaginatedList<Vocabulary>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+}
diff --git a/src/app/core/submission/vocabularies/vocabulary.service.spec.ts b/src/app/core/submission/vocabularies/vocabulary.service.spec.ts
index 8f733e0149..7255f029ec 100644
--- a/src/app/core/submission/vocabularies/vocabulary.service.spec.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.service.spec.ts
@@ -1,10 +1,7 @@
-import { HttpClient } from '@angular/common/http';
-
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
@@ -26,6 +23,8 @@ import { HrefOnlyDataService } from '../../data/href-only-data.service';
 import { getMockHrefOnlyDataService } from '../../../shared/mocks/href-only-data.service.mock';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { RequestEntry } from '../../data/request-entry.model';
+import { VocabularyDataService } from './vocabulary.data.service';
+import { VocabularyEntryDetailsDataService } from './vocabulary-entry-details.data.service';
 
 describe('VocabularyService', () => {
   let scheduler: TestScheduler;
@@ -203,24 +202,14 @@ describe('VocabularyService', () => {
       response: { isSuccessful: successful, payload: arrayEntries } as any
     } as RequestEntry);
   };
-  objectCache = {} as ObjectCacheService;
-  const notificationsService = {} as NotificationsService;
-  const http = {} as HttpClient;
-  const comparator = {} as any;
-  const comparatorEntry = {} as any;
 
   function initTestService() {
     hrefOnlyDataService = getMockHrefOnlyDataService();
+
     return new VocabularyService(
       requestService,
-      rdbService,
-      objectCache,
-      halService,
-      notificationsService,
-      hrefOnlyDataService,
-      http,
-      comparator,
-      comparatorEntry
+      new VocabularyDataService(requestService, rdbService, objectCache, halService),
+      new VocabularyEntryDetailsDataService(requestService, rdbService, objectCache, halService),
     );
   }
 
@@ -229,7 +218,7 @@ describe('VocabularyService', () => {
       scheduler = getTestScheduler();
 
       halService = jasmine.createSpyObj('halService', {
-        getEndpoint: cold('a', { a: endpointURL })
+        getEndpoint: cold('a', { a: endpointURL }),
       });
     });
 
@@ -237,7 +226,7 @@ describe('VocabularyService', () => {
       service = null;
     });
 
-    describe('', () => {
+    describe('vocabularies', () => {
       beforeEach(() => {
         responseCacheEntry = new RequestEntry();
         responseCacheEntry.request = { href: 'https://rest.api/' } as any;
@@ -255,7 +244,7 @@ describe('VocabularyService', () => {
             a: vocabularyRD
           }),
           buildList: hot('a|', {
-            a: paginatedListRD
+            a: paginatedListRD,
           }),
         });
 
@@ -264,8 +253,6 @@ describe('VocabularyService', () => {
         spyOn((service as any).vocabularyDataService, 'findById').and.callThrough();
         spyOn((service as any).vocabularyDataService, 'findAll').and.callThrough();
         spyOn((service as any).vocabularyDataService, 'findByHref').and.callThrough();
-        spyOn((service as any).vocabularyDataService, 'searchBy').and.callThrough();
-        spyOn((service as any).vocabularyDataService, 'getSearchByHref').and.returnValue(observableOf(searchRequestURL));
         spyOn((service as any).vocabularyDataService, 'getFindAllHref').and.returnValue(observableOf(entriesRequestURL));
       });
 
@@ -274,7 +261,7 @@ describe('VocabularyService', () => {
       });
 
       describe('findVocabularyById', () => {
-        it('should proxy the call to vocabularyDataService.findVocabularyById', () => {
+        it('should proxy the call to vocabularyDataService.findById', () => {
           scheduler.schedule(() => service.findVocabularyById(vocabularyId));
           scheduler.flush();
 
@@ -325,7 +312,7 @@ describe('VocabularyService', () => {
       });
     });
 
-    describe('', () => {
+    describe('vocabulary entries', () => {
 
       beforeEach(() => {
         requestService = getMockRequestService(getRequestEntries$(true));
diff --git a/src/app/core/submission/vocabularies/vocabulary.service.ts b/src/app/core/submission/vocabularies/vocabulary.service.ts
index c3b99dd927..deb26c5a2d 100644
--- a/src/app/core/submission/vocabularies/vocabulary.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.service.ts
@@ -1,104 +1,38 @@
-/* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-
-import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { map, switchMap, mergeMap } from 'rxjs/operators';
-
 import { FollowLinkConfig, followLink } from '../../../shared/utils/follow-link-config.model';
-import { dataService } from '../../cache/builders/build-decorators';
-import { DataService } from '../../data/data.service';
 import { RequestService } from '../../data/request.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { RemoteData } from '../../data/remote-data';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../../cache/object-cache.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ChangeAnalyzer } from '../../data/change-analyzer';
-import { DefaultChangeAnalyzer } from '../../data/default-change-analyzer.service';
 import { PaginatedList } from '../../data/paginated-list.model';
 import { Vocabulary } from './models/vocabulary.model';
-import { VOCABULARY } from './models/vocabularies.resource-type';
 import { VocabularyEntry } from './models/vocabulary-entry.model';
 import { isNotEmpty } from '../../../shared/empty.util';
 import {
   getFirstSucceededRemoteDataPayload,
-  getFirstSucceededRemoteListPayload
+  getFirstSucceededRemoteListPayload,
 } from '../../shared/operators';
 import { VocabularyFindOptions } from './models/vocabulary-find-options.model';
 import { VocabularyEntryDetail } from './models/vocabulary-entry-detail.model';
 import { RequestParam } from '../../cache/models/request-param.model';
 import { VocabularyOptions } from './models/vocabulary-options.model';
 import { PageInfo } from '../../shared/page-info.model';
-import { HrefOnlyDataService } from '../../data/href-only-data.service';
-import { CoreState } from '../../core-state.model';
 import { FindListOptions } from '../../data/find-list-options.model';
-
-
-/**
- * A private DataService implementation to delegate specific methods to.
- */
-class VocabularyDataServiceImpl extends DataService<Vocabulary> {
-  protected linkPath = 'vocabularies';
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: ChangeAnalyzer<Vocabulary>) {
-    super();
-  }
-
-}
-
-/**
- * A private DataService implementation to delegate specific methods to.
- */
-class VocabularyEntryDetailDataServiceImpl extends DataService<VocabularyEntryDetail> {
-  protected linkPath = 'vocabularyEntryDetails';
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected hrefOnlyDataService: HrefOnlyDataService,
-    protected http: HttpClient,
-    protected comparator: ChangeAnalyzer<VocabularyEntryDetail>) {
-    super();
-  }
-
-}
+import { VocabularyEntryDetailsDataService } from './vocabulary-entry-details.data.service';
+import { VocabularyDataService } from './vocabulary.data.service';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the vocabularies endpoint
  */
 @Injectable()
-@dataService(VOCABULARY)
 export class VocabularyService {
   protected searchTopMethod = 'top';
-  private vocabularyDataService: VocabularyDataServiceImpl;
-  private vocabularyEntryDetailDataService: VocabularyEntryDetailDataServiceImpl;
 
   constructor(
     protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected hrefOnlyDataService: HrefOnlyDataService,
-    protected http: HttpClient,
-    protected comparatorVocabulary: DefaultChangeAnalyzer<Vocabulary>,
-    protected comparatorEntry: DefaultChangeAnalyzer<VocabularyEntryDetail>) {
-    this.vocabularyDataService = new VocabularyDataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparatorVocabulary);
-    this.vocabularyEntryDetailDataService = new VocabularyEntryDetailDataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, hrefOnlyDataService, http, comparatorEntry);
+    protected vocabularyDataService: VocabularyDataService,
+    protected vocabularyEntryDetailDataService: VocabularyEntryDetailsDataService,
+  ) {
   }
 
   /**
diff --git a/src/app/core/submission/workflowitem-data.service.spec.ts b/src/app/core/submission/workflowitem-data.service.spec.ts
index fb974a9db3..7d1bcbb381 100644
--- a/src/app/core/submission/workflowitem-data.service.spec.ts
+++ b/src/app/core/submission/workflowitem-data.service.spec.ts
@@ -82,14 +82,11 @@ describe('WorkflowItemDataService test', () => {
   function initTestService() {
     hrefOnlyDataService = getMockHrefOnlyDataService();
     return new WorkflowItemDataService(
-      comparatorEntry,
-      halService,
-      http,
-      notificationsService,
       requestService,
       rdbService,
       objectCache,
-      store
+      halService,
+      notificationsService,
     );
   }
 
diff --git a/src/app/core/submission/workflowitem-data.service.ts b/src/app/core/submission/workflowitem-data.service.ts
index cc9ceab36c..f89f850c15 100644
--- a/src/app/core/submission/workflowitem-data.service.ts
+++ b/src/app/core/submission/workflowitem-data.service.ts
@@ -1,17 +1,12 @@
 import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-
-import { Store } from '@ngrx/store';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { DataService } from '../data/data.service';
 import { RequestService } from '../data/request.service';
 import { WorkflowItem } from './models/workflowitem.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { DeleteByIDRequest } from '../data/request.models';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
 import { Observable } from 'rxjs';
 import { find, map } from 'rxjs/operators';
 import { hasValue } from '../../shared/empty.util';
@@ -21,29 +16,36 @@ import { getFirstCompletedRemoteData } from '../shared/operators';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { WorkspaceItem } from './models/workspaceitem.model';
 import { RequestParam } from '../cache/models/request-param.model';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { SearchData, SearchDataImpl } from '../data/base/search-data';
+import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
+import { PaginatedList } from '../data/paginated-list.model';
 
 /**
  * A service that provides methods to make REST requests with workflow items endpoint.
  */
 @Injectable()
 @dataService(WorkflowItem.type)
-export class WorkflowItemDataService extends DataService<WorkflowItem> {
+export class WorkflowItemDataService extends IdentifiableDataService<WorkflowItem> implements SearchData<WorkflowItem>, DeleteData<WorkflowItem> {
   protected linkPath = 'workflowitems';
   protected searchByItemLinkPath = 'item';
   protected responseMsToLive = 10 * 1000;
 
+  private searchData: SearchDataImpl<WorkflowItem>;
+  private deleteData: DeleteDataImpl<WorkflowItem>;
+
   constructor(
-    protected comparator: DSOChangeAnalyzer<WorkflowItem>,
-    protected halService: HALEndpointService,
-    protected http: HttpClient,
-    protected notificationsService: NotificationsService,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
-    protected store: Store<CoreState>) {
-    super();
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('workspaceitems', requestService, rdbService, objectCache, halService);
+
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
@@ -78,8 +80,8 @@ export class WorkflowItemDataService extends DataService<WorkflowItem> {
     const requestId = this.requestService.generateRequestId();
 
     const hrefObs = this.halService.getEndpoint(this.linkPath).pipe(
-      map((endpoint: string) => this.getIDHref(endpoint, id)),
-      map((endpoint: string) => endpoint + '?expunge=' + expunge)
+      map((endpoint: string) => this.deleteData.getIDHref(endpoint, id)),
+      map((endpoint: string) => endpoint + '?expunge=' + expunge),
     );
 
     hrefObs.pipe(
@@ -110,4 +112,47 @@ export class WorkflowItemDataService extends DataService<WorkflowItem> {
     return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...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): Observable<string> {
+    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
+  }
+
+  /**
+   * 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
+   */
+  public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<WorkspaceItem>[]): Observable<RemoteData<PaginatedList<WorkspaceItem>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Delete an existing 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.
+   */
+  public deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.deleteByHref(href, copyVirtualMetadata);
+  }
 }
diff --git a/src/app/core/submission/workspaceitem-data.service.spec.ts b/src/app/core/submission/workspaceitem-data.service.spec.ts
index 6c2fa15e7c..2338d15257 100644
--- a/src/app/core/submission/workspaceitem-data.service.spec.ts
+++ b/src/app/core/submission/workspaceitem-data.service.spec.ts
@@ -82,14 +82,11 @@ describe('WorkspaceitemDataService test', () => {
   function initTestService() {
     hrefOnlyDataService = getMockHrefOnlyDataService();
     return new WorkspaceitemDataService(
-      comparatorEntry,
-      halService,
-      http,
-      notificationsService,
       requestService,
       rdbService,
       objectCache,
-      store
+      halService,
+      notificationsService,
     );
   }
 
diff --git a/src/app/core/submission/workspaceitem-data.service.ts b/src/app/core/submission/workspaceitem-data.service.ts
index 1b9782834c..551d40e665 100644
--- a/src/app/core/submission/workspaceitem-data.service.ts
+++ b/src/app/core/submission/workspaceitem-data.service.ts
@@ -1,42 +1,44 @@
 import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-
-import { Store } from '@ngrx/store';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { DataService } from '../data/data.service';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
 import { WorkspaceItem } from './models/workspaceitem.model';
 import { Observable } from 'rxjs';
 import { RemoteData } from '../data/remote-data';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RequestParam } from '../cache/models/request-param.model';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { SearchData, SearchDataImpl } from '../data/base/search-data';
+import { PaginatedList } from '../data/paginated-list.model';
+import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
+import { NoContent } from '../shared/NoContent.model';
 
 /**
  * A service that provides methods to make REST requests with workspaceitems endpoint.
  */
 @Injectable()
 @dataService(WorkspaceItem.type)
-export class WorkspaceitemDataService extends DataService<WorkspaceItem> {
-  protected linkPath = 'workspaceitems';
+export class WorkspaceitemDataService extends IdentifiableDataService<WorkspaceItem> implements SearchData<WorkspaceItem>, DeleteData<WorkspaceItem> {
   protected searchByItemLinkPath = 'item';
 
+  private searchData: SearchDataImpl<WorkspaceItem>;
+  private deleteData: DeleteDataImpl<WorkspaceItem>;
+
   constructor(
-    protected comparator: DSOChangeAnalyzer<WorkspaceItem>,
-    protected halService: HALEndpointService,
-    protected http: HttpClient,
-    protected notificationsService: NotificationsService,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
-    protected store: Store<CoreState>) {
-    super();
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('workspaceitems', requestService, rdbService, objectCache, halService);
+
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
@@ -57,4 +59,60 @@ export class WorkspaceitemDataService extends DataService<WorkspaceItem> {
     return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...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): Observable<string> {
+    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
+  }
+
+  /**
+   * 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
+   */
+  public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<WorkspaceItem>[]): Observable<RemoteData<PaginatedList<WorkspaceItem>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Delete an existing 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
+   */
+  public delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.delete(objectId, copyVirtualMetadata);
+  }
+
+  /**
+   * Delete an existing 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.
+   */
+  public deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.deleteByHref(href, copyVirtualMetadata);
+  }
+
 }
diff --git a/src/app/core/tasks/claimed-task-data.service.spec.ts b/src/app/core/tasks/claimed-task-data.service.spec.ts
index 722324d94c..e49bbef96e 100644
--- a/src/app/core/tasks/claimed-task-data.service.spec.ts
+++ b/src/app/core/tasks/claimed-task-data.service.spec.ts
@@ -1,11 +1,8 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
-
-import { Store } from '@ngrx/store';
+import { HttpHeaders } from '@angular/common/http';
 
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ClaimedTaskDataService } from './claimed-task-data.service';
 import { of as observableOf } from 'rxjs/internal/observable/of';
 import { RequestParam } from '../cache/models/request-param.model';
@@ -13,7 +10,6 @@ import { getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from '../data/find-list-options.model';
 
 describe('ClaimedTaskDataService', () => {
@@ -25,9 +21,6 @@ describe('ClaimedTaskDataService', () => {
   const requestService: any = getMockRequestService();
   const halService: any = new HALEndpointServiceStub(taskEndpoint);
   const rdbService = {} as RemoteDataBuildService;
-  const notificationsService = {} as NotificationsService;
-  const http = {} as HttpClient;
-  const comparator = {} as any;
   const objectCache = {
     addPatch: () => {
       /* empty */
@@ -36,18 +29,13 @@ describe('ClaimedTaskDataService', () => {
       /* empty */
     }
   } as any;
-  const store = {} as Store<CoreState>;
 
   function initTestService(): ClaimedTaskDataService {
     return new ClaimedTaskDataService(
       requestService,
       rdbService,
-      store,
       objectCache,
       halService,
-      notificationsService,
-      http,
-      comparator
     );
   }
 
diff --git a/src/app/core/tasks/claimed-task-data.service.ts b/src/app/core/tasks/claimed-task-data.service.ts
index 3860f84870..3f3edcb09e 100644
--- a/src/app/core/tasks/claimed-task-data.service.ts
+++ b/src/app/core/tasks/claimed-task-data.service.ts
@@ -1,13 +1,9 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-
-import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ClaimedTask } from './models/claimed-task-object.model';
@@ -18,7 +14,6 @@ import { RemoteData } from '../data/remote-data';
 import { RequestParam } from '../cache/models/request-param.model';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { getFirstSucceededRemoteData } from '../shared/operators';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from '../data/find-list-options.model';
 
 /**
@@ -28,35 +23,21 @@ import { FindListOptions } from '../data/find-list-options.model';
 @dataService(CLAIMED_TASK)
 export class ClaimedTaskDataService extends TasksService<ClaimedTask> {
 
-  protected responseMsToLive = 1000;
-
-  /**
-   * The endpoint link name
-   */
-  protected linkPath = 'claimedtasks';
-
   /**
    * Initialize instance variables
    *
    * @param {RequestService} requestService
    * @param {RemoteDataBuildService} rdbService
-   * @param {Store<CoreState>} store
    * @param {ObjectCacheService} objectCache
    * @param {HALEndpointService} halService
-   * @param {NotificationsService} notificationsService
-   * @param {HttpClient} http
-   * @param {DSOChangeAnalyzer<ClaimedTask} comparator
    */
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DSOChangeAnalyzer<ClaimedTask>) {
-    super();
+  ) {
+    super('claimedtasks', requestService, rdbService, objectCache, halService, 1000);
   }
 
   /**
diff --git a/src/app/core/tasks/pool-task-data.service.spec.ts b/src/app/core/tasks/pool-task-data.service.spec.ts
index 77c3708888..6845dff5b9 100644
--- a/src/app/core/tasks/pool-task-data.service.spec.ts
+++ b/src/app/core/tasks/pool-task-data.service.spec.ts
@@ -1,11 +1,8 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
-
-import { Store } from '@ngrx/store';
+import { HttpHeaders } from '@angular/common/http';
 
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { PoolTaskDataService } from './pool-task-data.service';
 import { getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
@@ -13,7 +10,6 @@ import { of as observableOf } from 'rxjs';
 import { RequestParam } from '../cache/models/request-param.model';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from '../data/find-list-options.model';
 
 describe('PoolTaskDataService', () => {
@@ -21,13 +17,9 @@ describe('PoolTaskDataService', () => {
   let service: PoolTaskDataService;
   let options: HttpOptions;
   const taskEndpoint = 'https://rest.api/task';
-  const linkPath = 'pooltasks';
   const requestService = getMockRequestService();
   const halService: any = new HALEndpointServiceStub(taskEndpoint);
   const rdbService = {} as RemoteDataBuildService;
-  const notificationsService = {} as NotificationsService;
-  const http = {} as HttpClient;
-  const comparator = {} as any;
   const objectCache = {
     addPatch: () => {
       /* empty */
@@ -36,18 +28,13 @@ describe('PoolTaskDataService', () => {
       /* empty */
     }
   } as any;
-  const store = {} as Store<CoreState>;
 
   function initTestService(): PoolTaskDataService {
     return new PoolTaskDataService(
       requestService,
       rdbService,
-      store,
       objectCache,
       halService,
-      notificationsService,
-      http,
-      comparator
     );
   }
 
diff --git a/src/app/core/tasks/pool-task-data.service.ts b/src/app/core/tasks/pool-task-data.service.ts
index 042c9a3455..fe0218eba1 100644
--- a/src/app/core/tasks/pool-task-data.service.ts
+++ b/src/app/core/tasks/pool-task-data.service.ts
@@ -1,13 +1,9 @@
-import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
 
 import { Observable } from 'rxjs';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { PoolTask } from './models/pool-task-object.model';
@@ -16,7 +12,6 @@ import { TasksService } from './tasks.service';
 import { RemoteData } from '../data/remote-data';
 import { RequestParam } from '../cache/models/request-param.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from '../data/find-list-options.model';
 
 /**
@@ -25,37 +20,21 @@ import { FindListOptions } from '../data/find-list-options.model';
 @Injectable()
 @dataService(POOL_TASK)
 export class PoolTaskDataService extends TasksService<PoolTask> {
-
-  /**
-   * The endpoint link name
-   */
-  protected linkPath = 'pooltasks';
-
-  protected responseMsToLive = 1000;
-
   /**
    * Initialize instance variables
    *
    * @param {RequestService} requestService
    * @param {RemoteDataBuildService} rdbService
-   * @param {NormalizedObjectBuildService} linkService
-   * @param {Store<CoreState>} store
    * @param {ObjectCacheService} objectCache
    * @param {HALEndpointService} halService
-   * @param {NotificationsService} notificationsService
-   * @param {HttpClient} http
-   * @param {DSOChangeAnalyzer<ClaimedTask} comparator
    */
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DSOChangeAnalyzer<PoolTask>) {
-    super();
+  ) {
+    super('pooltasks', requestService, rdbService, objectCache, halService, 1000);
   }
 
   /**
diff --git a/src/app/core/tasks/tasks.service.spec.ts b/src/app/core/tasks/tasks.service.spec.ts
index 6341cd3c07..5d9d57a11e 100644
--- a/src/app/core/tasks/tasks.service.spec.ts
+++ b/src/app/core/tasks/tasks.service.spec.ts
@@ -12,16 +12,12 @@ import { TaskObject } from './models/task-object.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { Store } from '@ngrx/store';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
+import { HttpHeaders } from '@angular/common/http';
 import { ChangeAnalyzer } from '../data/change-analyzer';
 import { compare, Operation } from 'fast-json-patch';
 import { of as observableOf } from 'rxjs';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { of } from 'rxjs';
 import { CoreState } from '../core-state.model';
 import { FindListOptions } from '../data/find-list-options.model';
 
@@ -36,13 +32,10 @@ class TestService extends TasksService<TestTask> {
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DSOChangeAnalyzer<TestTask>) {
-    super();
+  ) {
+    super('testtasks', requestService, rdbService, objectCache, halService);
   }
 }
 
@@ -62,9 +55,6 @@ describe('TasksService', () => {
   const requestService = getMockRequestService();
   const halService: any = new HALEndpointServiceStub(taskEndpoint);
   const rdbService = getMockRemoteDataBuildService();
-  const notificationsService = new NotificationsServiceStub() as any;
-  const http = {} as HttpClient;
-  const comparator = new DummyChangeAnalyzer() as any;
   const objectCache = {
     addPatch: () => {
       /* empty */
@@ -79,12 +69,8 @@ describe('TasksService', () => {
     return new TestService(
       requestService,
       rdbService,
-      store,
       objectCache,
       halService,
-      notificationsService,
-      http,
-      comparator
     );
   }
 
@@ -126,7 +112,7 @@ describe('TasksService', () => {
     it('should call findByHref with the href generated by getSearchByHref', () => {
 
       spyOn(service, 'getSearchByHref').and.returnValue(observableOf('generatedHref'));
-      spyOn(service, 'findByHref').and.returnValue(of(null));
+      spyOn(service, 'findByHref').and.returnValue(observableOf(null));
 
       const followLinks = {};
       const options = new FindListOptions();
diff --git a/src/app/core/tasks/tasks.service.ts b/src/app/core/tasks/tasks.service.ts
index 2b76412a9c..c2112d8e80 100644
--- a/src/app/core/tasks/tasks.service.ts
+++ b/src/app/core/tasks/tasks.service.ts
@@ -2,14 +2,7 @@ import { HttpHeaders } from '@angular/common/http';
 
 import { Observable } from 'rxjs';
 import { distinctUntilChanged, filter, find, map, mergeMap, tap } from 'rxjs/operators';
-
-import { DataService } from '../data/data.service';
-import {
-  DeleteRequest,
-  PostRequest,
-  TaskDeleteRequest,
-  TaskPostRequest
-} from '../data/request.models';
+import { DeleteRequest, PostRequest, TaskDeleteRequest, TaskPostRequest } from '../data/request.models';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { ProcessTaskResponse } from './models/process-task-response';
@@ -18,11 +11,32 @@ import { RemoteData } from '../data/remote-data';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { CacheableObject } from '../cache/cacheable-object.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { SearchData, SearchDataImpl } from '../data/base/search-data';
+import { RequestService } from '../data/request.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { PaginatedList } from '../data/paginated-list.model';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
 
 /**
- * An abstract class that provides methods to handle task requests.
+ * An abstract class that provides methods to handle task requests.  todo: data in name
  */
-export abstract class TasksService<T extends CacheableObject> extends DataService<T> {
+export abstract class TasksService<T extends CacheableObject> extends IdentifiableDataService<T> implements SearchData<T> {
+  private searchData: SearchData<T>;
+
+  protected constructor(
+    protected linkPath: string,
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected responseMsToLive?: number,
+  ) {
+    super(linkPath, requestService, rdbService, objectCache, halService);
+
+    this.searchData = new SearchDataImpl<T>(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
 
   /**
    * Create the HREF for a specific submission object based on its identifier
@@ -146,4 +160,36 @@ export abstract class TasksService<T extends CacheableObject> extends DataServic
     options.headers = headers;
     return options;
   }
+
+  /**
+   * 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> {
+    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
+  }
+
+  /**
+   * 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
+   */
+  public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
 }
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
index a71fe5b385..f179ebc325 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
@@ -117,7 +117,6 @@ export class ItemCollectionMapperComponent implements OnInit {
    * Load mappedCollectionsRD$ to only obtain collections that don't own this item
    */
   loadCollectionLists() {
-    console.log('loadCollectionLists');
     this.shouldUpdate$ = new BehaviorSubject<boolean>(true);
     this.itemCollectionsRD$ = observableCombineLatest(this.itemRD$.pipe(getFirstSucceededRemoteDataPayload()), this.shouldUpdate$).pipe(
       switchMap(([item, shouldUpdate]) => {
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
index 4312d35be9..ac87d0c2cc 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
@@ -20,7 +20,7 @@ import { NotificationsServiceStub } from '../../../shared/testing/notifications-
 import { OrcidSyncSettingsComponent } from './orcid-sync-settings.component';
 import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
 
-describe('OrcidAuthComponent test suite', () => {
+describe('OrcidSyncSettingsComponent test suite', () => {
   let comp: OrcidSyncSettingsComponent;
   let fixture: ComponentFixture<OrcidSyncSettingsComponent>;
   let scheduler: TestScheduler;
@@ -130,7 +130,7 @@ describe('OrcidAuthComponent test suite', () => {
   beforeEach(waitForAsync(() => {
     researcherProfileService = jasmine.createSpyObj('researcherProfileService', {
       findByRelatedItem: jasmine.createSpy('findByRelatedItem'),
-      updateByOrcidOperations: jasmine.createSpy('updateByOrcidOperations')
+      patch: jasmine.createSpy('patch'),
     });
 
     void TestBed.configureTestingModule({
@@ -198,7 +198,7 @@ describe('OrcidAuthComponent test suite', () => {
 
     it('should call updateByOrcidOperations properly', () => {
       researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
-      researcherProfileService.updateByOrcidOperations.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
+      researcherProfileService.patch.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
       const expectedOps: Operation[] = [
         {
           path: '/orcid/mode',
@@ -222,12 +222,12 @@ describe('OrcidAuthComponent test suite', () => {
       scheduler.schedule(() => comp.onSubmit(formGroup));
       scheduler.flush();
 
-      expect(researcherProfileService.updateByOrcidOperations).toHaveBeenCalledWith(mockResearcherProfile, expectedOps);
+      expect(researcherProfileService.patch).toHaveBeenCalledWith(mockResearcherProfile, expectedOps);
     });
 
     it('should show notification on success', () => {
       researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
-      researcherProfileService.updateByOrcidOperations.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
+      researcherProfileService.patch.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
 
       scheduler.schedule(() => comp.onSubmit(formGroup));
       scheduler.flush();
@@ -248,7 +248,7 @@ describe('OrcidAuthComponent test suite', () => {
 
     it('should show notification on error', () => {
       researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
-      researcherProfileService.updateByOrcidOperations.and.returnValue(createFailedRemoteDataObject$());
+      researcherProfileService.patch.and.returnValue(createFailedRemoteDataObject$());
 
       scheduler.schedule(() => comp.onSubmit(formGroup));
       scheduler.flush();
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
index 6e8b0c8216..05b8ea4b5f 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
@@ -148,8 +148,8 @@ export class OrcidSyncSettingsComponent implements OnInit {
       getFirstCompletedRemoteData(),
       switchMap((profileRD: RemoteData<ResearcherProfile>) => {
         if (profileRD.hasSucceeded) {
-          return this.researcherProfileService.updateByOrcidOperations(profileRD.payload, operations).pipe(
-            getFirstCompletedRemoteData()
+          return this.researcherProfileService.patch(profileRD.payload, operations).pipe(
+            getFirstCompletedRemoteData(),
           );
         } else {
           return of(profileRD);
diff --git a/src/app/lookup-by-id/lookup-by-id.module.ts b/src/app/lookup-by-id/lookup-by-id.module.ts
index 0202a43033..8a09d369e8 100644
--- a/src/app/lookup-by-id/lookup-by-id.module.ts
+++ b/src/app/lookup-by-id/lookup-by-id.module.ts
@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
 import { SharedModule } from '../shared/shared.module';
 import { LookupRoutingModule } from './lookup-by-id-routing.module';
 import { ObjectNotFoundComponent } from './objectnotfound/objectnotfound.component';
-import { DsoRedirectDataService } from '../core/data/dso-redirect-data.service';
+import { DsoRedirectService } from '../core/data/dso-redirect.service';
 import { ThemedObjectNotFoundComponent } from './objectnotfound/themed-objectnotfound.component';
 
 @NgModule({
@@ -17,7 +17,7 @@ import { ThemedObjectNotFoundComponent } from './objectnotfound/themed-objectnot
     ThemedObjectNotFoundComponent
   ],
   providers: [
-    DsoRedirectDataService
+    DsoRedirectService,
   ]
 })
 export class LookupIdModule {
diff --git a/src/app/lookup-by-id/lookup-guard.ts b/src/app/lookup-by-id/lookup-guard.ts
index 2146e56245..299eb3cda9 100644
--- a/src/app/lookup-by-id/lookup-guard.ts
+++ b/src/app/lookup-by-id/lookup-guard.ts
@@ -4,7 +4,7 @@ import { IdentifierType } from '../core/data/request.models';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { RemoteData } from '../core/data/remote-data';
-import { DsoRedirectDataService } from '../core/data/dso-redirect-data.service';
+import { DsoRedirectService } from '../core/data/dso-redirect.service';
 import { DSpaceObject } from '../core/shared/dspace-object.model';
 
 interface LookupParams {
@@ -15,7 +15,7 @@ interface LookupParams {
 @Injectable()
 export class LookupGuard implements CanActivate {
 
-  constructor(private dsoService: DsoRedirectDataService) {
+  constructor(private dsoService: DsoRedirectService) {
   }
 
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean>  {
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts
index aa0d1d187d..c05a55d4ed 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts
@@ -165,7 +165,7 @@ describe('ProfilePageResearcherFormComponent', () => {
 
     it('should delete the profile', () => {
 
-      expect(researcherProfileService.delete).toHaveBeenCalledWith(profile);
+      expect(researcherProfileService.delete).toHaveBeenCalledWith(profile.id);
     });
 
   });
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
index f7662e0522..8b90b0376f 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
@@ -4,7 +4,7 @@ import { Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { mergeMap, switchMap, take, tap } from 'rxjs/operators';
+import { map, mergeMap, switchMap, take, tap } from 'rxjs/operators';
 
 import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
 import { ProfileClaimItemModalComponent } from '../profile-claim-item-modal/profile-claim-item-modal.component';
@@ -18,6 +18,7 @@ import { RemoteData } from '../../core/data/remote-data';
 import { isNotEmpty } from '../../shared/empty.util';
 import { followLink } from '../../shared/utils/follow-link-config.model';
 import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
+import { NoContent } from '../../core/shared/NoContent.model';
 
 @Component({
   selector: 'ds-profile-page-researcher-form',
@@ -125,14 +126,16 @@ export class ProfilePageResearcherFormComponent implements OnInit {
     modalRef.componentInstance.response.pipe(take(1)).subscribe((confirm: boolean) => {
       if (confirm) {
         this.processingDelete$.next(true);
-        this.researcherProfileService.delete(researcherProfile)
-          .subscribe((deleted) => {
-            if (deleted) {
-              this.researcherProfile$.next(null);
-              this.researcherProfileItemId = null;
-            }
-            this.processingDelete$.next(false);
-          });
+        this.researcherProfileService.delete(researcherProfile.id).pipe(
+          getFirstCompletedRemoteData(),
+          map((response: RemoteData<NoContent>) => response.isSuccess),
+        ).subscribe((deleted) => {
+          if (deleted) {
+            this.researcherProfile$.next(null);
+            this.researcherProfileItemId = null;
+          }
+          this.processingDelete$.next(false);
+        });
       }
     });
   }
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts
index a785e3b26d..ce67da1349 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts
@@ -35,15 +35,15 @@ describe('ClaimedTaskActionsApproveComponent', () => {
   });
 
   beforeEach(waitForAsync(() => {
-    mockPoolTaskDataService = new PoolTaskDataService(null, null, null, null, null, null, null, null);
+    mockPoolTaskDataService = new PoolTaskDataService(null, null, null, null);
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       providers: [
         { provide: ClaimedTaskDataService, useValue: claimedTaskService },
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
index 386d2c2805..f9bf22fa86 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
@@ -62,12 +62,13 @@ export class ClaimedTaskActionsComponent extends MyDSpaceActionsComponent<Claime
    * @param workflowActionService
    */
   constructor(protected injector: Injector,
-              protected router: Router,
-              protected notificationsService: NotificationsService,
-              protected translate: TranslateService,
-              protected searchService: SearchService,
-              protected requestService: RequestService,
-              protected workflowActionService: WorkflowActionDataService) {
+    protected router: Router,
+    protected notificationsService: NotificationsService,
+    protected translate: TranslateService,
+    protected searchService: SearchService,
+    protected requestService: RequestService,
+    protected workflowActionService: WorkflowActionDataService,
+  ) {
     super(ClaimedTask.type, injector, router, notificationsService, translate, searchService, requestService);
   }
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts
index 1a958f5a49..5bcddc9b11 100644
--- a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts
@@ -28,16 +28,16 @@ let mockPoolTaskDataService: PoolTaskDataService;
 
 describe('ClaimedTaskActionsEditMetadataComponent', () => {
   const object = Object.assign(new ClaimedTask(), { id: 'claimed-task-1' });
-  mockPoolTaskDataService = new PoolTaskDataService(null, null, null, null, null, null, null, null);
+  mockPoolTaskDataService = new PoolTaskDataService(null, null, null, null);
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       providers: [
         { provide: ClaimedTaskDataService, useValue: {} },
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.spec.ts
index c38fa49a42..2ccb671d83 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.spec.ts
@@ -42,7 +42,7 @@ let mockPoolTaskDataService: PoolTaskDataService;
 
 describe('ClaimedTaskActionsRejectComponent', () => {
   beforeEach(waitForAsync(() => {
-    mockPoolTaskDataService = new PoolTaskDataService(null, null, null, null, null, null, null, null);
+    mockPoolTaskDataService = new PoolTaskDataService(null, null, null, null);
     TestBed.configureTestingModule({
       imports: [
         NgbModule,
@@ -50,9 +50,9 @@ describe('ClaimedTaskActionsRejectComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [ClaimedTaskActionsRejectComponent],
       providers: [
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.spec.ts
index e53daccf0d..46e89d9d3a 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.spec.ts
@@ -35,15 +35,15 @@ describe('ClaimedTaskActionsReturnToPoolComponent', () => {
   });
 
   beforeEach(waitForAsync(() => {
-    mockPoolTaskDataService = new PoolTaskDataService(null, null, null, null, null, null, null, null);
+    mockPoolTaskDataService = new PoolTaskDataService(null, null, null, null);
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       providers: [
         { provide: ClaimedTaskDataService, useValue: claimedTaskService },
diff --git a/src/app/shared/mydspace-actions/mydspace-actions-service.factory.ts b/src/app/shared/mydspace-actions/mydspace-actions-service.factory.ts
index 4a0c5f1fb2..6408dddac6 100644
--- a/src/app/shared/mydspace-actions/mydspace-actions-service.factory.ts
+++ b/src/app/shared/mydspace-actions/mydspace-actions-service.factory.ts
@@ -1,4 +1,3 @@
-import { DataService } from '../../core/data/data.service';
 import { ResourceType } from '../../core/shared/resource-type';
 import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
 import { ClaimedTaskDataService } from '../../core/tasks/claimed-task-data.service';
@@ -11,11 +10,12 @@ import { ClaimedTask } from '../../core/tasks/models/claimed-task-object.model';
 import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
 import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
 import { CacheableObject } from '../../core/cache/cacheable-object.model';
+import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service';
 
 /**
  * Class to return DataService for given ResourceType
  */
-export class MydspaceActionsServiceFactory<T extends CacheableObject, TService extends DataService<T>> {
+export class MyDSpaceActionsServiceFactory<T extends CacheableObject, TService extends IdentifiableDataService<T>> {
   public getConstructor(type: ResourceType): TService {
     switch (type) {
       case Item.type: {
diff --git a/src/app/shared/mydspace-actions/mydspace-actions.ts b/src/app/shared/mydspace-actions/mydspace-actions.ts
index 9c64699ac6..931929ccce 100644
--- a/src/app/shared/mydspace-actions/mydspace-actions.ts
+++ b/src/app/shared/mydspace-actions/mydspace-actions.ts
@@ -3,9 +3,8 @@ import { Component, EventEmitter, Injector, Input, Output } from '@angular/core'
 
 import { take, tap } from 'rxjs/operators';
 
-import { MydspaceActionsServiceFactory } from './mydspace-actions-service.factory';
+import { MyDSpaceActionsServiceFactory } from './mydspace-actions-service.factory';
 import { RemoteData } from '../../core/data/remote-data';
-import { DataService } from '../../core/data/data.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { ResourceType } from '../../core/shared/resource-type';
 import { NotificationOptions } from '../notifications/models/notification-options.model';
@@ -15,6 +14,7 @@ import { RequestService } from '../../core/data/request.service';
 import { BehaviorSubject, Subscription } from 'rxjs';
 import { SearchService } from '../../core/shared/search/search.service';
 import { getFirstSucceededRemoteData } from '../../core/shared/operators';
+import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service';
 
 export interface MyDSpaceActionsResult {
   result: boolean;
@@ -28,7 +28,7 @@ export interface MyDSpaceActionsResult {
   selector: 'ds-mydspace-actions-abstract',
   template: '',
 })
-export abstract class MyDSpaceActionsComponent<T extends DSpaceObject, TService extends DataService<T>> {
+export abstract class MyDSpaceActionsComponent<T extends DSpaceObject, TService extends IdentifiableDataService<T>> {
 
   /**
    * The target mydspace object
@@ -71,8 +71,9 @@ export abstract class MyDSpaceActionsComponent<T extends DSpaceObject, TService
     protected notificationsService: NotificationsService,
     protected translate: TranslateService,
     protected searchService: SearchService,
-    protected requestService: RequestService) {
-    const factory = new MydspaceActionsServiceFactory<T, TService>();
+    protected requestService: RequestService,
+  ) {
+    const factory = new MyDSpaceActionsServiceFactory<T, TService>();
     this.objectDataService = injector.get(factory.getConstructor(objectType));
   }
 
diff --git a/src/app/shared/mydspace-actions/mydspace-reloadable-actions.spec.ts b/src/app/shared/mydspace-actions/mydspace-reloadable-actions.spec.ts
index 83a5c2277c..30c7db3c4b 100644
--- a/src/app/shared/mydspace-actions/mydspace-reloadable-actions.spec.ts
+++ b/src/app/shared/mydspace-actions/mydspace-reloadable-actions.spec.ts
@@ -73,16 +73,16 @@ mockObject = Object.assign(new PoolTask(), { workflowitem: observableOf(rdWorkfl
 
 describe('MyDSpaceReloadableActionsComponent', () => {
   beforeEach(fakeAsync(() => {
-    mockDataService = new PoolTaskDataService(null, null, null, null, null, null, null, null);
-    mockClaimedTaskDataService = new ClaimedTaskDataService(null, null, null, null, null, null, null, null);
+    mockDataService = new PoolTaskDataService(null, null, null, null);
+    mockClaimedTaskDataService = new ClaimedTaskDataService(null, null, null, null);
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [PoolTaskActionsComponent],
       providers: [
@@ -141,7 +141,7 @@ describe('MyDSpaceReloadableActionsComponent', () => {
 
     beforeEach(() => {
 
-      mockDataService = new PoolTaskDataService(null, null, null, null, null, null, null, null);
+      mockDataService = new PoolTaskDataService(null, null, null, null);
 
       const poolTaskHref = 'poolTaskHref';
       remoteClaimTaskErrorResponse = new ProcessTaskResponse(false, null, null);
@@ -188,7 +188,7 @@ describe('MyDSpaceReloadableActionsComponent', () => {
 
     beforeEach(() => {
 
-      mockDataService = new PoolTaskDataService(null, null, null, null, null, null, null, null);
+      mockDataService = new PoolTaskDataService(null, null, null, null);
 
       const poolTaskHref = 'poolTaskHref';
       const remoteClaimTaskResponse: any = new ProcessTaskResponse(true, null, null);
@@ -234,7 +234,7 @@ describe('MyDSpaceReloadableActionsComponent', () => {
 
     beforeEach(() => {
 
-      mockDataService = new PoolTaskDataService(null, null, null, null, null, null, null, null);
+      mockDataService = new PoolTaskDataService(null, null, null, null);
 
       const poolTaskHref = 'poolTaskHref';
       const remoteClaimTaskResponse: any = new ProcessTaskResponse(true, null, null);
diff --git a/src/app/shared/mydspace-actions/mydspace-reloadable-actions.ts b/src/app/shared/mydspace-actions/mydspace-reloadable-actions.ts
index cef0311bc6..c126c8c53b 100644
--- a/src/app/shared/mydspace-actions/mydspace-reloadable-actions.ts
+++ b/src/app/shared/mydspace-actions/mydspace-reloadable-actions.ts
@@ -4,7 +4,6 @@ import { Component, Injector, OnInit } from '@angular/core';
 import { map, switchMap, take, tap } from 'rxjs/operators';
 
 import { RemoteData } from '../../core/data/remote-data';
-import { DataService } from '../../core/data/data.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { ResourceType } from '../../core/shared/resource-type';
 import { NotificationOptions } from '../notifications/models/notification-options.model';
@@ -17,15 +16,16 @@ import { ProcessTaskResponse } from '../../core/tasks/models/process-task-respon
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { getSearchResultFor } from '../search/search-result-element-decorator';
 import { MyDSpaceActionsComponent } from './mydspace-actions';
+import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service';
 
 /**
  * Abstract class for all different representations of mydspace actions
  */
 @Component({
   selector: 'ds-mydspace-reloadable-actions',
-  template: ''
+  template: '',
 })
-export abstract class MyDSpaceReloadableActionsComponent<T extends DSpaceObject, TService extends DataService<T>>
+export abstract class MyDSpaceReloadableActionsComponent<T extends DSpaceObject, TService extends IdentifiableDataService<T>>
   extends MyDSpaceActionsComponent<T, TService> implements OnInit {
 
   protected constructor(
@@ -35,7 +35,8 @@ export abstract class MyDSpaceReloadableActionsComponent<T extends DSpaceObject,
     protected notificationsService: NotificationsService,
     protected translate: TranslateService,
     protected searchService: SearchService,
-    protected requestService: RequestService) {
+    protected requestService: RequestService,
+  ) {
     super(objectType, injector, router, notificationsService, translate, searchService, requestService);
   }
 
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts
index 5686030510..8c0de55138 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts
@@ -75,16 +75,16 @@ mockObject = Object.assign(new PoolTask(), { workflowitem: observableOf(rdWorkfl
 
 describe('PoolTaskActionsComponent', () => {
   beforeEach(waitForAsync(() => {
-    mockDataService = new PoolTaskDataService(null, null, null, null, null, null, null, null);
-    mockClaimedTaskDataService = new ClaimedTaskDataService(null, null, null, null, null, null, null, null);
+    mockDataService = new PoolTaskDataService(null, null, null, null);
+    mockClaimedTaskDataService = new ClaimedTaskDataService(null, null, null, null);
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [PoolTaskActionsComponent],
       providers: [
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
index 45f51a5d4a..193739ec0d 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
@@ -54,6 +54,7 @@ export class PoolTaskActionsComponent extends MyDSpaceReloadableActionsComponent
    * @param {Injector} injector
    * @param {Router} router
    * @param {NotificationsService} notificationsService
+   * @param {ClaimedTaskDataService} claimedTaskService
    * @param {TranslateService} translate
    * @param {SearchService} searchService
    * @param {RequestService} requestService
diff --git a/src/app/shared/object-select/item-select/item-select.component.spec.ts b/src/app/shared/object-select/item-select/item-select.component.spec.ts
index 25340ee862..49754c40dd 100644
--- a/src/app/shared/object-select/item-select/item-select.component.spec.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.spec.ts
@@ -74,7 +74,7 @@ describe('ItemSelectComponent', () => {
 
   paginationService = new PaginationServiceStub(mockPaginationOptions);
 
-  const authorizationDataService = new AuthorizationDataService(null, null, null, null, null, null, null, null, null, null);
+  const authorizationDataService = new AuthorizationDataService(null, null, null, null, null);
 
   const linkHeadService = jasmine.createSpyObj('linkHeadService', {
     addTag: ''
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.ts b/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.ts
index 3277f724a2..3bb697beee 100644
--- a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.ts
+++ b/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.ts
@@ -8,7 +8,6 @@ import { RemoteData } from '../../../../core/data/remote-data';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model';
-import { DataService } from '../../../../core/data/data.service';
 import { hasValue, isNotEmpty } from '../../../empty.util';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { getDataServiceFor } from '../../../../core/cache/builders/build-decorators';
@@ -75,7 +74,7 @@ export class EpersonGroupListComponent implements OnInit, OnDestroy {
    * The data service used to make request.
    * It could be EPersonDataService or GroupDataService
    */
-  private dataService: DataService<DSpaceObject>;
+  private dataService: EPersonDataService | GroupDataService;
 
   /**
    * A list of eperson or group
diff --git a/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts b/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts
index 743ec69f36..db1340eb54 100644
--- a/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts
+++ b/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts
@@ -5,22 +5,21 @@ import { Observable } from 'rxjs';
 
 import { getDataServiceFor } from '../../../core/cache/builders/build-decorators';
 import { ResourceType } from '../../../core/shared/resource-type';
-import { DataService } from '../../../core/data/data.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { isEmpty } from '../../empty.util';
 import { RemoteData } from '../../../core/data/remote-data';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated
  */
 @Injectable()
 export class ResourcePolicyTargetResolver implements Resolve<RemoteData<DSpaceObject>> {
-
   /**
    * The data service used to make request.
    */
-  private dataService: DataService<DSpaceObject>;
+  private dataService: IdentifiableDataService<DSpaceObject>;
 
   constructor(private parentInjector: Injector, private router: Router) {
   }

From cd4ed018ddc19b5fbaed48098cf3505e031d38ad Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Wed, 24 Aug 2022 14:53:56 +0200
Subject: [PATCH 10/48] 93803: Remove legacy DataService class

---
 src/app/core/data/data.service.spec.ts | 1011 ------------------------
 src/app/core/data/data.service.ts      |  693 ----------------
 2 files changed, 1704 deletions(-)
 delete mode 100644 src/app/core/data/data.service.spec.ts
 delete mode 100644 src/app/core/data/data.service.ts

diff --git a/src/app/core/data/data.service.spec.ts b/src/app/core/data/data.service.spec.ts
deleted file mode 100644
index dc661e12d7..0000000000
--- a/src/app/core/data/data.service.spec.ts
+++ /dev/null
@@ -1,1011 +0,0 @@
-/* eslint-disable max-classes-per-file */
-import { HttpClient } from '@angular/common/http';
-import { Store } from '@ngrx/store';
-import { compare, Operation } from 'fast-json-patch';
-import { Observable, of as observableOf } from 'rxjs';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { SortDirection, SortOptions } from '../cache/models/sort-options.model';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { DSpaceObject } from '../shared/dspace-object.model';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { Item } from '../shared/item.model';
-import {
-  createFailedRemoteDataObject,
-  createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$,
-} from '../../shared/remote-data.utils';
-import { ChangeAnalyzer } from './change-analyzer';
-import { DataService } from './data.service';
-import { PatchRequest } from './request.models';
-import { RequestService } from './request.service';
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { RequestParam } from '../cache/models/request-param.model';
-import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
-import { TestScheduler } from 'rxjs/testing';
-import { RemoteData } from './remote-data';
-import { RequestEntryState } from './request-entry-state.model';
-import { CoreState } from '../core-state.model';
-import { FindListOptions } from './find-list-options.model';
-import { fakeAsync, tick } from '@angular/core/testing';
-
-const endpoint = 'https://rest.api/core';
-
-const BOOLEAN = { f: false, t: true };
-
-class TestService extends DataService<any> {
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected linkPath: string,
-    protected halService: HALEndpointService,
-    protected objectCache: ObjectCacheService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: ChangeAnalyzer<Item>
-  ) {
-    super();
-  }
-
-  public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
-    return observableOf(endpoint);
-  }
-}
-
-class DummyChangeAnalyzer implements ChangeAnalyzer<Item> {
-  diff(object1: Item, object2: Item): Operation[] {
-    return compare((object1 as any).metadata, (object2 as any).metadata);
-  }
-
-}
-
-describe('DataService', () => {
-  let service: TestService;
-  let options: FindListOptions;
-  let requestService;
-  let halService;
-  let rdbService;
-  let notificationsService;
-  let http;
-  let comparator;
-  let objectCache;
-  let store;
-  let selfLink;
-  let linksToFollow;
-  let testScheduler;
-  let remoteDataMocks;
-
-  function initTestService(): TestService {
-    requestService = getMockRequestService();
-    halService = new HALEndpointServiceStub('url') as any;
-    rdbService = getMockRemoteDataBuildService();
-    notificationsService = {} as NotificationsService;
-    http = {} as HttpClient;
-    comparator = new DummyChangeAnalyzer() as any;
-    objectCache = {
-
-      addPatch: () => {
-        /* empty */
-      },
-      getObjectBySelfLink: () => {
-        /* empty */
-      },
-      getByHref: () => {
-        /* empty */
-      }
-    } as any;
-    store = {} as Store<CoreState>;
-    selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
-    linksToFollow = [
-      followLink('a'),
-      followLink('b')
-    ];
-
-    testScheduler = new TestScheduler((actual, expected) => {
-      // asserting the two objects are equal
-      // e.g. using chai.
-      expect(actual).toEqual(expected);
-    });
-
-    const timeStamp = new Date().getTime();
-    const msToLive = 15 * 60 * 1000;
-    const payload = { foo: 'bar' };
-    const statusCodeSuccess = 200;
-    const statusCodeError = 404;
-    const errorMessage = 'not found';
-    remoteDataMocks = {
-      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
-      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
-      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
-      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
-      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
-      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
-    };
-
-
-    return new TestService(
-      requestService,
-      rdbService,
-      store,
-      endpoint,
-      halService,
-      objectCache,
-      notificationsService,
-      http,
-      comparator,
-    );
-  }
-
-  beforeEach(() => {
-    service = initTestService();
-  });
-
-  describe('getFindAllHref', () => {
-
-    it('should return an observable with the endpoint', () => {
-      options = {};
-
-      (service as any).getFindAllHref(options).subscribe((value) => {
-          expect(value).toBe(endpoint);
-        }
-      );
-    });
-
-    it('should include page in href if currentPage provided in options', () => {
-      options = { currentPage: 2 };
-      const expected = `${endpoint}?page=${options.currentPage - 1}`;
-
-      (service as any).getFindAllHref(options).subscribe((value) => {
-        expect(value).toBe(expected);
-      });
-    });
-
-    it('should include size in href if elementsPerPage provided in options', () => {
-      options = { elementsPerPage: 5 };
-      const expected = `${endpoint}?size=${options.elementsPerPage}`;
-
-      (service as any).getFindAllHref(options).subscribe((value) => {
-        expect(value).toBe(expected);
-      });
-    });
-
-    it('should include sort href if SortOptions provided in options', () => {
-      const sortOptions = new SortOptions('field1', SortDirection.ASC);
-      options = { sort: sortOptions };
-      const expected = `${endpoint}?sort=${sortOptions.field},${sortOptions.direction}`;
-
-      (service as any).getFindAllHref(options).subscribe((value) => {
-        expect(value).toBe(expected);
-      });
-    });
-
-    it('should include startsWith in href if startsWith provided in options', () => {
-      options = { startsWith: 'ab' };
-      const expected = `${endpoint}?startsWith=${options.startsWith}`;
-
-      (service as any).getFindAllHref(options).subscribe((value) => {
-        expect(value).toBe(expected);
-      });
-    });
-
-    it('should include all provided options in href', () => {
-      const sortOptions = new SortOptions('field1', SortDirection.DESC);
-      options = {
-        currentPage: 6,
-        elementsPerPage: 10,
-        sort: sortOptions,
-        startsWith: 'ab',
-
-      };
-      const expected = `${endpoint}?page=${options.currentPage - 1}&size=${options.elementsPerPage}` +
-        `&sort=${sortOptions.field},${sortOptions.direction}&startsWith=${options.startsWith}`;
-
-      (service as any).getFindAllHref(options).subscribe((value) => {
-        expect(value).toBe(expected);
-      });
-    });
-
-    it('should include all searchParams in href if any provided in options', () => {
-      options = {
-        searchParams: [
-          new RequestParam('param1', 'test'),
-          new RequestParam('param2', 'test2'),
-        ]
-      };
-      const expected = `${endpoint}?param1=test&param2=test2`;
-
-      (service as any).getFindAllHref(options).subscribe((value) => {
-        expect(value).toBe(expected);
-      });
-    });
-
-    it('should include linkPath in href if any provided', () => {
-      const expected = `${endpoint}/test/entries`;
-
-      (service as any).getFindAllHref({}, 'test/entries').subscribe((value) => {
-        expect(value).toBe(expected);
-      });
-    });
-
-    it('should include single linksToFollow as embed', () => {
-      const expected = `${endpoint}?embed=bundles`;
-
-      (service as any).getFindAllHref({}, null, followLink('bundles')).subscribe((value) => {
-        expect(value).toBe(expected);
-      });
-    });
-
-    it('should include single linksToFollow as embed and its size', () => {
-      const expected = `${endpoint}?embed.size=bundles=5&embed=bundles`;
-      const config: FindListOptions = Object.assign(new FindListOptions(), {
-        elementsPerPage: 5
-      });
-      (service as any).getFindAllHref({}, null, followLink('bundles', { findListOptions: config })).subscribe((value) => {
-        expect(value).toBe(expected);
-      });
-    });
-
-    it('should include multiple linksToFollow as embed', () => {
-      const expected = `${endpoint}?embed=bundles&embed=owningCollection&embed=templateItemOf`;
-
-      (service as any).getFindAllHref({}, null, followLink('bundles'), followLink('owningCollection'), followLink('templateItemOf')).subscribe((value) => {
-        expect(value).toBe(expected);
-      });
-    });
-
-    it('should include multiple linksToFollow as embed and its sizes if given', () => {
-      const expected = `${endpoint}?embed=bundles&embed.size=owningCollection=2&embed=owningCollection&embed=templateItemOf`;
-
-      const config: FindListOptions = Object.assign(new FindListOptions(), {
-        elementsPerPage: 2
-      });
-
-      (service as any).getFindAllHref({}, null, followLink('bundles'), followLink('owningCollection', { findListOptions: config }), followLink('templateItemOf')).subscribe((value) => {
-        expect(value).toBe(expected);
-      });
-    });
-
-    it('should not include linksToFollow with shouldEmbed = false', () => {
-      const expected = `${endpoint}?embed=templateItemOf`;
-
-      (service as any).getFindAllHref(
-        {},
-        null,
-        followLink('bundles', { shouldEmbed: false }),
-        followLink('owningCollection', { shouldEmbed: false }),
-        followLink('templateItemOf')
-      ).subscribe((value) => {
-        expect(value).toBe(expected);
-      });
-    });
-
-    it('should include nested linksToFollow 3lvl', () => {
-      const expected = `${endpoint}?embed=owningCollection/itemtemplate/relationships`;
-
-      (service as any).getFindAllHref({}, null, followLink('owningCollection', {}, followLink('itemtemplate', {}, followLink('relationships')))).subscribe((value) => {
-        expect(value).toBe(expected);
-      });
-    });
-
-    it('should include nested linksToFollow 2lvl and nested embed\'s size', () => {
-      const expected = `${endpoint}?embed.size=owningCollection/itemtemplate=4&embed=owningCollection/itemtemplate`;
-      const config: FindListOptions = Object.assign(new FindListOptions(), {
-        elementsPerPage: 4
-      });
-      (service as any).getFindAllHref({}, null, followLink('owningCollection', {}, followLink('itemtemplate', { findListOptions: config }))).subscribe((value) => {
-        expect(value).toBe(expected);
-      });
-    });
-  });
-
-  describe('getIDHref', () => {
-    const endpointMock = 'https://dspace7-internal.atmire.com/server/api/core/items';
-    const resourceIdMock = '003c99b4-d4fe-44b0-a945-e12182a7ca89';
-
-    it('should return endpoint', () => {
-      const result = (service as any).getIDHref(endpointMock, resourceIdMock);
-      expect(result).toEqual(endpointMock + '/' + resourceIdMock);
-    });
-
-    it('should include single linksToFollow as embed', () => {
-      const expected = `${endpointMock}/${resourceIdMock}?embed=bundles`;
-      const result = (service as any).getIDHref(endpointMock, resourceIdMock, followLink('bundles'));
-      expect(result).toEqual(expected);
-    });
-
-    it('should include multiple linksToFollow as embed', () => {
-      const expected = `${endpointMock}/${resourceIdMock}?embed=bundles&embed=owningCollection&embed=templateItemOf`;
-      const result = (service as any).getIDHref(endpointMock, resourceIdMock, followLink('bundles'), followLink('owningCollection'), followLink('templateItemOf'));
-      expect(result).toEqual(expected);
-    });
-
-    it('should not include linksToFollow with shouldEmbed = false', () => {
-      const expected = `${endpointMock}/${resourceIdMock}?embed=templateItemOf`;
-      const result = (service as any).getIDHref(
-        endpointMock,
-        resourceIdMock,
-        followLink('bundles', { shouldEmbed: false }),
-        followLink('owningCollection', { shouldEmbed: false }),
-        followLink('templateItemOf')
-      );
-      expect(result).toEqual(expected);
-    });
-
-    it('should include nested linksToFollow 3lvl', () => {
-      const expected = `${endpointMock}/${resourceIdMock}?embed=owningCollection/itemtemplate/relationships`;
-      const result = (service as any).getIDHref(endpointMock, resourceIdMock, followLink('owningCollection', {}, followLink('itemtemplate', {}, followLink('relationships'))));
-      expect(result).toEqual(expected);
-    });
-  });
-
-  describe('patch', () => {
-    const dso = {
-      uuid: 'dso-uuid'
-    };
-    const operations = [
-      Object.assign({
-        op: 'move',
-        from: '/1',
-        path: '/5'
-      }) as Operation
-    ];
-
-    beforeEach(() => {
-      service.patch(dso, operations);
-    });
-
-    it('should send a PatchRequest', () => {
-      expect(requestService.send).toHaveBeenCalledWith(jasmine.any(PatchRequest));
-    });
-  });
-
-  describe('update', () => {
-    let operations;
-    let dso;
-    let dso2;
-    const name1 = 'random string';
-    const name2 = 'another random string';
-    beforeEach(() => {
-      operations = [{ op: 'replace', path: '/0/value', value: name2 } as Operation];
-
-      dso = Object.assign(new DSpaceObject(), {
-        _links: { self: { href: selfLink } },
-        metadata: [{ key: 'dc.title', value: name1 }]
-      });
-
-      dso2 = Object.assign(new DSpaceObject(), {
-        _links: { self: { href: selfLink } },
-        metadata: [{ key: 'dc.title', value: name2 }]
-      });
-
-      spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(dso));
-      spyOn(objectCache, 'addPatch');
-    });
-
-    it('should call addPatch on the object cache with the right parameters when there are differences', () => {
-      service.update(dso2).subscribe();
-      expect(objectCache.addPatch).toHaveBeenCalledWith(selfLink, operations);
-    });
-
-    it('should not call addPatch on the object cache with the right parameters when there are no differences', () => {
-      service.update(dso).subscribe();
-      expect(objectCache.addPatch).not.toHaveBeenCalled();
-    });
-  });
-
-  describe(`reRequestStaleRemoteData`, () => {
-    let callback: jasmine.Spy<jasmine.Func>;
-
-    beforeEach(() => {
-      callback = jasmine.createSpy();
-    });
-
-
-    describe(`when shouldReRequest is false`, () => {
-      it(`shouldn't do anything`, () => {
-        testScheduler.run(({ cold, expectObservable, flush }) => {
-          const expected = 'a-b-c-d-e-f';
-          const values = {
-            a: remoteDataMocks.RequestPending,
-            b: remoteDataMocks.ResponsePending,
-            c: remoteDataMocks.Success,
-            d: remoteDataMocks.SuccessStale,
-            e: remoteDataMocks.Error,
-            f: remoteDataMocks.ErrorStale,
-          };
-
-          expectObservable((service as any).reRequestStaleRemoteData(false, callback)(cold(expected, values))).toBe(expected, values);
-          // since the callback happens in a tap(), flush to ensure it has been executed
-          flush();
-          expect(callback).not.toHaveBeenCalled();
-        });
-      });
-    });
-
-    describe(`when shouldReRequest is true`, () => {
-      it(`should call the callback for stale RemoteData objects, but still pass the source observable unmodified`, () => {
-        testScheduler.run(({ cold, expectObservable, flush }) => {
-          const expected = 'a-b';
-          const values = {
-            a: remoteDataMocks.SuccessStale,
-            b: remoteDataMocks.ErrorStale,
-          };
-
-          expectObservable((service as any).reRequestStaleRemoteData(true, callback)(cold(expected, values))).toBe(expected, values);
-          // since the callback happens in a tap(), flush to ensure it has been executed
-          flush();
-          expect(callback).toHaveBeenCalledTimes(2);
-        });
-      });
-
-      it(`should only call the callback for stale RemoteData objects if something is subscribed to it`, (done) => {
-        testScheduler.run(({ cold, expectObservable }) => {
-          const expected = 'a';
-          const values = {
-            a: remoteDataMocks.SuccessStale,
-          };
-
-          const result$ = (service as any).reRequestStaleRemoteData(true, callback)(cold(expected, values));
-          expectObservable(result$).toBe(expected, values);
-          expect(callback).not.toHaveBeenCalled();
-          result$.subscribe(() => {
-            expect(callback).toHaveBeenCalled();
-            done();
-          });
-        });
-      });
-
-      it(`shouldn't do anything for RemoteData objects that aren't stale`, () => {
-        testScheduler.run(({ cold, expectObservable, flush }) => {
-          const expected = 'a-b-c-d';
-          const values = {
-            a: remoteDataMocks.RequestPending,
-            b: remoteDataMocks.ResponsePending,
-            c: remoteDataMocks.Success,
-            d: remoteDataMocks.Error,
-          };
-
-          expectObservable((service as any).reRequestStaleRemoteData(true, callback)(cold(expected, values))).toBe(expected, values);
-          // since the callback happens in a tap(), flush to ensure it has been executed
-          flush();
-          expect(callback).not.toHaveBeenCalled();
-        });
-      });
-    });
-
-  });
-
-  describe(`findByHref`, () => {
-    beforeEach(() => {
-      spyOn(service as any, 'createAndSendGetRequest').and.callFake((href$) => { href$.subscribe().unsubscribe(); });
-    });
-
-    it(`should call buildHrefFromFindOptions with href and linksToFollow`, () => {
-      testScheduler.run(({ cold }) => {
-        spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
-        spyOn(rdbService, 'buildSingle').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
-        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
-
-        service.findByHref(selfLink, true, true, ...linksToFollow);
-        expect(service.buildHrefFromFindOptions).toHaveBeenCalledWith(selfLink, {}, [], ...linksToFollow);
-      });
-    });
-
-    it(`should call createAndSendGetRequest with the result from buildHrefFromFindOptions and useCachedVersionIfAvailable`, () => {
-      testScheduler.run(({ cold, expectObservable }) => {
-        spyOn(service, 'buildHrefFromFindOptions').and.returnValue('bingo!');
-        spyOn(rdbService, 'buildSingle').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
-        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
-
-        service.findByHref(selfLink, true, true, ...linksToFollow);
-        expect((service as any).createAndSendGetRequest).toHaveBeenCalledWith(jasmine.anything(), true);
-        expectObservable(rdbService.buildSingle.calls.argsFor(0)[0]).toBe('(a|)', { a: 'bingo!' });
-
-        service.findByHref(selfLink, false, true, ...linksToFollow);
-        expect((service as any).createAndSendGetRequest).toHaveBeenCalledWith(jasmine.anything(), false);
-        expectObservable(rdbService.buildSingle.calls.argsFor(1)[0]).toBe('(a|)', { a: 'bingo!' });
-      });
-    });
-
-    it(`should call rdbService.buildSingle with the result from buildHrefFromFindOptions and linksToFollow`, () => {
-      testScheduler.run(({ cold, expectObservable }) => {
-        spyOn(service, 'buildHrefFromFindOptions').and.returnValue('bingo!');
-        spyOn(rdbService, 'buildSingle').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
-        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
-
-        service.findByHref(selfLink, true, true, ...linksToFollow);
-        expect(rdbService.buildSingle).toHaveBeenCalledWith(jasmine.anything() as any, ...linksToFollow);
-        expectObservable(rdbService.buildSingle.calls.argsFor(0)[0]).toBe('(a|)', { a: 'bingo!' });
-      });
-    });
-
-    it(`should return a the output from reRequestStaleRemoteData`, () => {
-      testScheduler.run(({ cold, expectObservable }) => {
-        spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
-        spyOn(rdbService, 'buildSingle').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
-        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: 'bingo!' }));
-        const expected = 'a';
-        const values = {
-          a: 'bingo!',
-        };
-
-        expectObservable(service.findByHref(selfLink, true, true, ...linksToFollow)).toBe(expected, values);
-      });
-    });
-
-    it(`should call reRequestStaleRemoteData with reRequestOnStale and the exact same findByHref call as a callback`, () => {
-      testScheduler.run(({ cold, expectObservable }) => {
-        spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
-        spyOn(rdbService, 'buildSingle').and.returnValue(cold('a', { a: remoteDataMocks.SuccessStale }));
-        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.SuccessStale }));
-
-        service.findByHref(selfLink, true, true, ...linksToFollow);
-        expect((service as any).reRequestStaleRemoteData.calls.argsFor(0)[0]).toBeTrue();
-        spyOn(service, 'findByHref').and.returnValue(cold('a', { a: remoteDataMocks.SuccessStale }));
-        // prove that the spy we just added hasn't been called yet
-        expect(service.findByHref).not.toHaveBeenCalled();
-        // call the callback passed to reRequestStaleRemoteData
-        (service as any).reRequestStaleRemoteData.calls.argsFor(0)[1]();
-        // verify that findByHref _has_ been called now, with the same params as the original call
-        expect(service.findByHref).toHaveBeenCalledWith(jasmine.anything(), true, true, ...linksToFollow);
-        // ... except for selflink, which will have been turned in to an observable.
-        expectObservable((service.findByHref as jasmine.Spy).calls.argsFor(0)[0]).toBe('(a|)', { a: selfLink });
-      });
-    });
-
-    describe(`when useCachedVersionIfAvailable is true`, () => {
-      beforeEach(() => {
-        spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
-        spyOn(service as any, 'reRequestStaleRemoteData').and.callFake(() => (source) => source);
-      });
-
-      it(`should emit a cached completed RemoteData immediately, and keep emitting if it gets rerequested`, () => {
-        testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.Success,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
-          }));
-          const expected = 'a-b-c-d-e';
-          const values = {
-            a: remoteDataMocks.Success,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
-          };
-
-          expectObservable(service.findByHref(selfLink, true, true, ...linksToFollow)).toBe(expected, values);
-        });
-      });
-
-      it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
-        testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.SuccessStale,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
-          }));
-          const expected = '--b-c-d-e';
-          const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
-          };
-
-          expectObservable(service.findByHref(selfLink, true, true, ...linksToFollow)).toBe(expected, values);
-        });
-      });
-
-    });
-
-    describe(`when useCachedVersionIfAvailable is false`, () => {
-      beforeEach(() => {
-        spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
-        spyOn(service as any, 'reRequestStaleRemoteData').and.callFake(() => (source) => source);
-      });
-
-
-      it(`should not emit a cached completed RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
-        testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.Success,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
-          }));
-          const expected = '--b-c-d-e';
-          const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
-          };
-
-          expectObservable(service.findByHref(selfLink, false, true, ...linksToFollow)).toBe(expected, values);
-        });
-      });
-
-      it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
-        testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.SuccessStale,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
-          }));
-          const expected = '--b-c-d-e';
-          const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
-          };
-
-          expectObservable(service.findByHref(selfLink, false, true, ...linksToFollow)).toBe(expected, values);
-        });
-      });
-
-    });
-
-  });
-
-  describe(`findAllByHref`, () => {
-    let findListOptions;
-    beforeEach(() => {
-      findListOptions = { currentPage: 5 };
-      spyOn(service as any, 'createAndSendGetRequest').and.callFake((href$) => { href$.subscribe().unsubscribe(); });
-    });
-
-    it(`should call buildHrefFromFindOptions with href and linksToFollow`, () => {
-      testScheduler.run(({ cold }) => {
-        spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
-        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
-        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
-
-        service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow);
-        expect(service.buildHrefFromFindOptions).toHaveBeenCalledWith(selfLink, findListOptions, [], ...linksToFollow);
-      });
-    });
-
-    it(`should call createAndSendGetRequest with the result from buildHrefFromFindOptions and useCachedVersionIfAvailable`, () => {
-      testScheduler.run(({ cold, expectObservable }) => {
-        spyOn(service, 'buildHrefFromFindOptions').and.returnValue('bingo!');
-        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
-        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
-
-        service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow);
-        expect((service as any).createAndSendGetRequest).toHaveBeenCalledWith(jasmine.anything(), true);
-        expectObservable(rdbService.buildList.calls.argsFor(0)[0]).toBe('(a|)', { a: 'bingo!' });
-
-        service.findAllByHref(selfLink, findListOptions, false, true, ...linksToFollow);
-        expect((service as any).createAndSendGetRequest).toHaveBeenCalledWith(jasmine.anything(), false);
-        expectObservable(rdbService.buildList.calls.argsFor(1)[0]).toBe('(a|)', { a: 'bingo!' });
-      });
-    });
-
-    it(`should call rdbService.buildList with the result from buildHrefFromFindOptions and linksToFollow`, () => {
-      testScheduler.run(({ cold, expectObservable }) => {
-        spyOn(service, 'buildHrefFromFindOptions').and.returnValue('bingo!');
-        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
-        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
-
-        service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow);
-        expect(rdbService.buildList).toHaveBeenCalledWith(jasmine.anything() as any, ...linksToFollow);
-        expectObservable(rdbService.buildList.calls.argsFor(0)[0]).toBe('(a|)', { a: 'bingo!' });
-      });
-    });
-
-    it(`should call reRequestStaleRemoteData with reRequestOnStale and the exact same findAllByHref call as a callback`, () => {
-      testScheduler.run(({ cold, expectObservable }) => {
-        spyOn(service, 'buildHrefFromFindOptions').and.returnValue('bingo!');
-        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.SuccessStale }));
-        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.SuccessStale }));
-
-        service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow);
-        expect((service as any).reRequestStaleRemoteData.calls.argsFor(0)[0]).toBeTrue();
-        spyOn(service, 'findAllByHref').and.returnValue(cold('a', { a: remoteDataMocks.SuccessStale }));
-        // prove that the spy we just added hasn't been called yet
-        expect(service.findAllByHref).not.toHaveBeenCalled();
-        // call the callback passed to reRequestStaleRemoteData
-        (service as any).reRequestStaleRemoteData.calls.argsFor(0)[1]();
-        // verify that findAllByHref _has_ been called now, with the same params as the original call
-        expect(service.findAllByHref).toHaveBeenCalledWith(jasmine.anything(), findListOptions, true, true, ...linksToFollow);
-        // ... except for selflink, which will have been turned in to an observable.
-        expectObservable((service.findAllByHref as jasmine.Spy).calls.argsFor(0)[0]).toBe('(a|)', { a: selfLink });
-      });
-    });
-
-    it(`should return a the output from reRequestStaleRemoteData`, () => {
-      testScheduler.run(({ cold, expectObservable }) => {
-        spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
-        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
-        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: 'bingo!' }));
-        const expected = 'a';
-        const values = {
-          a: 'bingo!',
-        };
-
-        expectObservable(service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow)).toBe(expected, values);
-      });
-    });
-
-    describe(`when useCachedVersionIfAvailable is true`, () => {
-      beforeEach(() => {
-        spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
-        spyOn(service as any, 'reRequestStaleRemoteData').and.callFake(() => (source) => source);
-      });
-
-      it(`should emit a cached completed RemoteData immediately, and keep emitting if it gets rerequested`, () => {
-        testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.Success,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
-          }));
-          const expected = 'a-b-c-d-e';
-          const values = {
-            a: remoteDataMocks.Success,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
-          };
-
-          expectObservable(service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow)).toBe(expected, values);
-        });
-      });
-
-      it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
-        testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.SuccessStale,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
-          }));
-          const expected = '--b-c-d-e';
-          const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
-          };
-
-          expectObservable(service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow)).toBe(expected, values);
-        });
-      });
-
-    });
-
-    describe(`when useCachedVersionIfAvailable is false`, () => {
-      beforeEach(() => {
-        spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
-        spyOn(service as any, 'reRequestStaleRemoteData').and.callFake(() => (source) => source);
-      });
-
-
-      it(`should not emit a cached completed RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
-        testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.Success,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
-          }));
-          const expected = '--b-c-d-e';
-          const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
-          };
-
-          expectObservable(service.findAllByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
-        });
-      });
-
-      it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
-        testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.SuccessStale,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
-          }));
-          const expected = '--b-c-d-e';
-          const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
-          };
-
-          expectObservable(service.findAllByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
-        });
-      });
-
-    });
-  });
-
-  describe('invalidateByHref', () => {
-    let getByHrefSpy: jasmine.Spy;
-
-    beforeEach(() => {
-      getByHrefSpy = spyOn(objectCache, 'getByHref').and.returnValue(observableOf({
-        requestUUIDs: ['request1', 'request2', 'request3']
-      }));
-
-    });
-
-    it('should call setStaleByUUID for every request associated with this DSO', (done) => {
-      service.invalidateByHref('some-href').subscribe((ok) => {
-        expect(ok).toBeTrue();
-        expect(getByHrefSpy).toHaveBeenCalledWith('some-href');
-        expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request1');
-        expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request2');
-        expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request3');
-        done();
-      });
-    });
-
-    it('should call setStaleByUUID even if not subscribing to returned Observable', fakeAsync(() => {
-      service.invalidateByHref('some-href');
-      tick();
-
-      expect(getByHrefSpy).toHaveBeenCalledWith('some-href');
-      expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request1');
-      expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request2');
-      expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request3');
-    }));
-
-    it('should return an Observable that only emits true once all requests are stale', () => {
-      testScheduler.run(({ cold, expectObservable }) => {
-        requestService.setStaleByUUID.and.callFake((uuid) => {
-          switch (uuid) {   // fake requests becoming stale at different times
-            case 'request1':
-              return cold('--(t|)', BOOLEAN);
-            case 'request2':
-              return cold('----(t|)', BOOLEAN);
-            case 'request3':
-              return cold('------(t|)', BOOLEAN);
-          }
-        });
-
-        const done$ = service.invalidateByHref('some-href');
-
-        // emit true as soon as the final request is stale
-        expectObservable(done$).toBe('------(t|)', BOOLEAN);
-      });
-    });
-
-    it('should only fire for the current state of the object (instead of tracking it)', () => {
-      testScheduler.run(({ cold, flush }) => {
-        getByHrefSpy.and.returnValue(cold('a---b---c---', {
-          a: { requestUUIDs: ['request1'] },  // this is the state at the moment we're invalidating the cache
-          b: { requestUUIDs: ['request2'] },  // we shouldn't keep tracking the state
-          c: { requestUUIDs: ['request3'] },  // because we may invalidate when we shouldn't
-        }));
-
-        service.invalidateByHref('some-href');
-        flush();
-
-        // requests from the first state are marked as stale
-        expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request1');
-
-        // request from subsequent states are ignored
-        expect(requestService.setStaleByUUID).not.toHaveBeenCalledWith('request2');
-        expect(requestService.setStaleByUUID).not.toHaveBeenCalledWith('request3');
-      });
-    });
-  });
-
-  describe('delete', () => {
-    let MOCK_SUCCEEDED_RD;
-    let MOCK_FAILED_RD;
-
-    let invalidateByHrefSpy: jasmine.Spy;
-    let buildFromRequestUUIDSpy: 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();
-      getIDHrefObsSpy = spyOn(service, 'getIDHrefObs').and.callThrough();
-      deleteByHrefSpy = spyOn(service, 'deleteByHref').and.callThrough();
-
-      MOCK_SUCCEEDED_RD = createSuccessfulRemoteDataObject({});
-      MOCK_FAILED_RD = createFailedRemoteDataObject('something went wrong');
-    });
-
-    it('should retrieve href by ID and call deleteByHref', () => {
-      getIDHrefObsSpy.and.returnValue(observableOf('some-href'));
-      buildFromRequestUUIDSpy.and.returnValue(createSuccessfulRemoteDataObject$({}));
-
-      service.delete('some-id', ['a', 'b', 'c']).subscribe(rd => {
-        expect(getIDHrefObsSpy).toHaveBeenCalledWith('some-id');
-        expect(deleteByHrefSpy).toHaveBeenCalledWith('some-href', ['a', 'b', 'c']);
-      });
-    });
-
-    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();
-        });
-      });
-
-      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/data.service.ts b/src/app/core/data/data.service.ts
deleted file mode 100644
index 6176694d9d..0000000000
--- a/src/app/core/data/data.service.ts
+++ /dev/null
@@ -1,693 +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 { DSpaceObject } from '../shared/dspace-object.model';
-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, DeleteRequest, GetRequest, PatchRequest, 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$;
-  }
-
-  /**
-   * 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(
-      take(1),
-      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;
-  }
-}

From a76555c5188ed7296fd037725a05f307e595b004 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Wed, 24 Aug 2022 16:34:18 +0200
Subject: [PATCH 11/48] 93803: Stricter typing for dataService decorator &
 LinkService

The initial idea was to type dataService decorator strictly to BaseDataService.
However, HrefOnlyDataService should not expose methods other than findByHref & findAllByHref, but must still work with LinkService.

To address this we introduce HALDataService: an interface with the minimal requirements for a data service to work with HAL links
- dataService decorator can only decorate a class that implements HALDataService
- services retrieved from DATA_SERVICE_FACTORY should therefore work in LinkService
---
 .../cache/builders/build-decorators.spec.ts   | 15 +++++--
 .../core/cache/builders/build-decorators.ts   | 24 +++++------
 src/app/core/cache/builders/link.service.ts   | 14 ++++---
 src/app/core/data/base/base-data.service.ts   |  3 +-
 .../data/base/hal-data-service.interface.ts   | 41 +++++++++++++++++++
 src/app/core/data/href-only-data.service.ts   | 15 ++++++-
 6 files changed, 87 insertions(+), 25 deletions(-)
 create mode 100644 src/app/core/data/base/hal-data-service.interface.ts

diff --git a/src/app/core/cache/builders/build-decorators.spec.ts b/src/app/core/cache/builders/build-decorators.spec.ts
index 064a2b3f83..e397ca6516 100644
--- a/src/app/core/cache/builders/build-decorators.spec.ts
+++ b/src/app/core/cache/builders/build-decorators.spec.ts
@@ -2,12 +2,21 @@
 import { HALLink } from '../../shared/hal-link.model';
 import { HALResource } from '../../shared/hal-resource.model';
 import { ResourceType } from '../../shared/resource-type';
-import { dataService, getDataServiceFor, getLinkDefinition, link, } from './build-decorators';
+import { dataService, getDataServiceFor, getLinkDefinition, link } from './build-decorators';
+import { HALDataService } from '../../data/base/hal-data-service.interface';
+import { BaseDataService } from '../../data/base/base-data.service';
 
-class TestService {
+class TestService extends BaseDataService<any> {
 }
 
-class AnotherTestService {
+class AnotherTestService implements HALDataService<any> {
+  public findAllByHref(href$, findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow): any {
+    return undefined;
+  }
+
+  public findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow): any {
+    return undefined;
+  }
 }
 
 class TestHALResource implements HALResource {
diff --git a/src/app/core/cache/builders/build-decorators.ts b/src/app/core/cache/builders/build-decorators.ts
index 193eeb57e8..b421c927b3 100644
--- a/src/app/core/cache/builders/build-decorators.ts
+++ b/src/app/core/cache/builders/build-decorators.ts
@@ -3,20 +3,19 @@ import { hasNoValue, hasValue } from '../../../shared/empty.util';
 import { GenericConstructor } from '../../shared/generic-constructor';
 import { HALResource } from '../../shared/hal-resource.model';
 import { ResourceType } from '../../shared/resource-type';
-import {
-  getResourceTypeValueFor
-} from '../object-cache.reducer';
+import { getResourceTypeValueFor } from '../object-cache.reducer';
 import { InjectionToken } from '@angular/core';
 import { CacheableObject } from '../cacheable-object.model';
 import { TypedObject } from '../typed-object.model';
+import { HALDataService } from '../../data/base/hal-data-service.interface';
 
-export const DATA_SERVICE_FACTORY = new InjectionToken<(resourceType: ResourceType) => GenericConstructor<any>>('getDataServiceFor', {
+export const DATA_SERVICE_FACTORY = new InjectionToken<(resourceType: ResourceType) => GenericConstructor<HALDataService<any>>>('getDataServiceFor', {
   providedIn: 'root',
-  factory: () => getDataServiceFor
+  factory: () => getDataServiceFor,
 });
 export const LINK_DEFINITION_FACTORY = new InjectionToken<<T extends HALResource>(source: GenericConstructor<T>, linkName: keyof T['_links']) => LinkDefinition<T>>('getLinkDefinition', {
   providedIn: 'root',
-  factory: () => getLinkDefinition
+  factory: () => getLinkDefinition,
 });
 export const LINK_DEFINITION_MAP_FACTORY = new InjectionToken<<T extends HALResource>(source: GenericConstructor<T>) => Map<keyof T['_links'], LinkDefinition<T>>>('getLinkDefinitions', {
   providedIn: 'root',
@@ -47,16 +46,15 @@ export function getClassForType(type: string | ResourceType) {
 }
 
 /**
- * A class decorator to indicate that this class is a dataservice
- * for a given resource type.
+ * A class decorator to indicate that this class is a data service for a given HAL resource type.
  *
- * "dataservice" in this context means that it has findByHref and
- * findAllByHref methods.
+ * In most cases, a data service should extend {@link BaseDataService}.
+ * At the very least it must implement {@link HALDataService} in order for it to work with {@link LinkService}.
  *
  * @param resourceType the resource type the class is a dataservice for
  */
-export function dataService(resourceType: ResourceType): any {
-  return (target: any) => {
+export function dataService(resourceType: ResourceType) {
+  return (target: GenericConstructor<HALDataService<any>>): void => {
     if (hasNoValue(resourceType)) {
       throw new Error(`Invalid @dataService annotation on ${target}, resourceType needs to be defined`);
     }
@@ -75,7 +73,7 @@ export function dataService(resourceType: ResourceType): any {
  *
  * @param resourceType the resource type you want the matching dataservice for
  */
-export function getDataServiceFor<T extends CacheableObject>(resourceType: ResourceType) {
+export function getDataServiceFor<T extends CacheableObject>(resourceType: ResourceType): GenericConstructor<HALDataService<any>> {
   return dataServiceMap.get(resourceType.value);
 }
 
diff --git a/src/app/core/cache/builders/link.service.ts b/src/app/core/cache/builders/link.service.ts
index af616332c0..8d54d46d2d 100644
--- a/src/app/core/cache/builders/link.service.ts
+++ b/src/app/core/cache/builders/link.service.ts
@@ -7,24 +7,26 @@ import {
   DATA_SERVICE_FACTORY,
   LINK_DEFINITION_FACTORY,
   LINK_DEFINITION_MAP_FACTORY,
-  LinkDefinition
+  LinkDefinition,
 } from './build-decorators';
 import { RemoteData } from '../../data/remote-data';
 import { EMPTY, Observable } from 'rxjs';
 import { ResourceType } from '../../shared/resource-type';
+import { HALDataService } from '../../data/base/hal-data-service.interface';
+import { PaginatedList } from '../../data/paginated-list.model';
 
 /**
  * A Service to handle the resolving and removing
  * of resolved {@link HALLink}s on HALResources
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class LinkService {
 
   constructor(
     protected parentInjector: Injector,
-    @Inject(DATA_SERVICE_FACTORY) private getDataServiceFor: (resourceType: ResourceType) => GenericConstructor<any>,
+    @Inject(DATA_SERVICE_FACTORY) private getDataServiceFor: (resourceType: ResourceType) => GenericConstructor<HALDataService<any>>,
     @Inject(LINK_DEFINITION_FACTORY) private getLinkDefinition: <T extends HALResource>(source: GenericConstructor<T>, linkName: keyof T['_links']) => LinkDefinition<T>,
     @Inject(LINK_DEFINITION_MAP_FACTORY) private getLinkDefinitions: <T extends HALResource>(source: GenericConstructor<T>) => Map<keyof T['_links'], LinkDefinition<T>>,
   ) {
@@ -51,7 +53,7 @@ export class LinkService {
    * @param model the {@link HALResource} to resolve the link for
    * @param linkToFollow the {@link FollowLinkConfig} to resolve
    */
-  public resolveLinkWithoutAttaching<T extends HALResource, U extends HALResource>(model, linkToFollow: FollowLinkConfig<T>): Observable<RemoteData<U>> {
+  public resolveLinkWithoutAttaching<T extends HALResource, U extends HALResource>(model, linkToFollow: FollowLinkConfig<T>): Observable<RemoteData<U | PaginatedList<U>>> {
     const matchingLinkDef = this.getLinkDefinition(model.constructor, linkToFollow.name);
 
     if (hasValue(matchingLinkDef)) {
@@ -61,9 +63,9 @@ export class LinkService {
         throw new Error(`The @link() for ${linkToFollow.name} on ${model.constructor.name} models uses the resource type ${matchingLinkDef.resourceType.value.toUpperCase()}, but there is no service with an @dataService(${matchingLinkDef.resourceType.value.toUpperCase()}) annotation in order to retrieve it`);
       }
 
-      const service = Injector.create({
+      const service: HALDataService<any> = Injector.create({
         providers: [],
-        parent: this.parentInjector
+        parent: this.parentInjector,
       }).get(provider);
 
       const link = model._links[matchingLinkDef.linkName];
diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index 9679bddf1b..faf8a4bead 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -22,6 +22,7 @@ import { FindListOptions } from '../find-list-options.model';
 import { PaginatedList } from '../paginated-list.model';
 import { ObjectCacheEntry } from '../../cache/object-cache.reducer';
 import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALDataService } from './hal-data-service.interface';
 
 /**
  * Common functionality for data services.
@@ -47,7 +48,7 @@ import { ObjectCacheService } from '../../cache/object-cache.service';
  * }
  * ```
  */
-export class BaseDataService<T extends CacheableObject> {
+export class BaseDataService<T extends CacheableObject> implements HALDataService<T> {
   constructor(
     protected linkPath: string,
     protected requestService: RequestService,
diff --git a/src/app/core/data/base/hal-data-service.interface.ts b/src/app/core/data/base/hal-data-service.interface.ts
new file mode 100644
index 0000000000..af39edd7cf
--- /dev/null
+++ b/src/app/core/data/base/hal-data-service.interface.ts
@@ -0,0 +1,41 @@
+/**
+ * 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 { Observable } from 'rxjs';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { RemoteData } from '../remote-data';
+import { FindListOptions } from '../find-list-options.model';
+import { PaginatedList } from '../paginated-list.model';
+import { HALResource } from '../../shared/hal-resource.model';
+
+/**
+ * An interface defining the minimum functionality needed for a data service to resolve HAL resources.
+ */
+export interface HALDataService<T extends HALResource> {
+  /**
+   * 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.
+   * @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?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<T>>;
+
+  /**
+   * Returns an Observable of a {@link RemoteData} of a {@link PaginatedList} 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 list we want to retrieve. Can be a string or an Observable<string>
+   * @param findListOptions             The options for to use for this find list request.
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's no valid cached version.
+   * @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?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>>;
+}
diff --git a/src/app/core/data/href-only-data.service.ts b/src/app/core/data/href-only-data.service.ts
index ba5abe9340..9a36dcc128 100644
--- a/src/app/core/data/href-only-data.service.ts
+++ b/src/app/core/data/href-only-data.service.ts
@@ -14,6 +14,7 @@ import { LICENSE } from '../shared/license.resource-type';
 import { CacheableObject } from '../cache/cacheable-object.model';
 import { FindListOptions } from './find-list-options.model';
 import { BaseDataService } from './base/base-data.service';
+import { HALDataService } from './base/hal-data-service.interface';
 
 /**
  * A DataService with only findByHref methods. Its purpose is to be used for resources that don't
@@ -21,6 +22,15 @@ import { BaseDataService } from './base/base-data.service';
  * for their links to be resolved by the LinkService.
  *
  * an @dataService annotation can be added for any number of these resource types
+ *
+ *
+ * Additionally, this service may be used to retrieve objects by `href` regardless of their type
+ * For example
+ * ```
+ * const items$: Observable<RemoteData<PaginatedList<Item>>> = hrefOnlyDataService.findAllByHref<Item>(href);
+ * const sites$: Observable<RemoteData<PaginatedList<Site>>> = hrefOnlyDataService.findAllByHref<Site>(href);
+ * ```
+ * This means we cannot extend from {@link BaseDataService} directly because the method signatures would not match.
  */
 @Injectable({
   providedIn: 'root',
@@ -28,9 +38,10 @@ import { BaseDataService } from './base/base-data.service';
 @dataService(VOCABULARY_ENTRY)
 @dataService(ITEM_TYPE)
 @dataService(LICENSE)
-export class HrefOnlyDataService {
+export class HrefOnlyDataService implements HALDataService<any> {
   /**
-   * Not all BaseDataService methods should be exposed, so
+   * Works with a {@link BaseDataService} internally, but only exposes two of its methods
+   * with altered signatures to (optionally) constrain the arbitrary return type.
    * @private
    */
   private dataService: BaseDataService<any>;

From ad316f73160417943148717d9d9edd83b1310eca Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 25 Aug 2022 10:06:37 +0200
Subject: [PATCH 12/48] 93803: Resolve circular dependency

src/app/core/cache/builders/build-decorators.ts > src/app/core/data/base/hal-data-service.interface.ts > src/app/core/data/paginated-list.model.ts
---
 .../browse/browse-definition-data.service.ts  |  2 +-
 .../cache/builders/build-decorators.spec.ts   | 43 +--------------
 .../core/cache/builders/build-decorators.ts   | 39 -------------
 .../core/cache/builders/link.service.spec.ts  |  3 +-
 src/app/core/cache/builders/link.service.ts   |  2 +-
 .../submission-accesses-config.service.ts     |  2 +-
 .../config/submission-forms-config.service.ts |  2 +-
 .../submission-uploads-config.service.ts      |  2 +-
 .../core/data/access-status-data.service.ts   |  2 +-
 .../data/base/data-service.decorator.spec.ts  | 55 +++++++++++++++++++
 .../core/data/base/data-service.decorator.ts  | 51 +++++++++++++++++
 src/app/core/data/bitstream-data.service.ts   |  2 +-
 .../data/bitstream-format-data.service.ts     |  2 +-
 src/app/core/data/bundle-data.service.ts      |  2 +-
 src/app/core/data/collection-data.service.ts  |  2 +-
 src/app/core/data/community-data.service.ts   |  2 +-
 .../core/data/configuration-data.service.ts   |  2 +-
 .../core/data/dspace-object-data.service.ts   |  2 +-
 .../authorization-data.service.ts             |  2 +-
 .../feature-data.service.ts                   |  2 +-
 src/app/core/data/href-only-data.service.ts   |  2 +-
 src/app/core/data/item-data.service.ts        |  2 +-
 .../core/data/metadata-field-data.service.ts  |  2 +-
 .../core/data/metadata-schema-data.service.ts |  2 +-
 .../data/processes/process-data.service.ts    |  2 +-
 .../data/processes/script-data.service.ts     |  2 +-
 .../core/data/relationship-type.service.ts    |  2 +-
 src/app/core/data/relationship.service.ts     |  2 +-
 src/app/core/data/root-data.service.ts        |  2 +-
 src/app/core/data/site-data.service.ts        |  2 +-
 src/app/core/data/version-data.service.ts     |  2 +-
 .../core/data/version-history-data.service.ts |  2 +-
 .../core/data/workflow-action-data.service.ts |  2 +-
 src/app/core/eperson/eperson-data.service.ts  |  2 +-
 src/app/core/eperson/group-data.service.ts    |  2 +-
 .../core/feedback/feedback-data.service.ts    |  2 +-
 .../core/orcid/orcid-history-data.service.ts  |  2 +-
 src/app/core/orcid/orcid-queue.service.ts     |  2 +-
 .../profile/researcher-profile.service.ts     |  2 +-
 .../resource-policy.service.ts                |  2 +-
 .../statistics/usage-report-data.service.ts   |  2 +-
 .../submission-cc-license-data.service.ts     |  2 +-
 .../submission-cc-license-url-data.service.ts |  2 +-
 .../vocabulary-entry-details.data.service.ts  |  2 +-
 .../vocabularies/vocabulary.data.service.ts   |  2 +-
 .../submission/workflowitem-data.service.ts   |  2 +-
 .../submission/workspaceitem-data.service.ts  |  2 +-
 .../core/tasks/claimed-task-data.service.ts   |  2 +-
 src/app/core/tasks/pool-task-data.service.ts  |  2 +-
 .../eperson-group-list.component.ts           |  2 +-
 .../resource-policy-target.resolver.ts        |  2 +-
 51 files changed, 155 insertions(+), 128 deletions(-)
 create mode 100644 src/app/core/data/base/data-service.decorator.spec.ts
 create mode 100644 src/app/core/data/base/data-service.decorator.ts

diff --git a/src/app/core/browse/browse-definition-data.service.ts b/src/app/core/browse/browse-definition-data.service.ts
index 3c9f6d6983..1c68885432 100644
--- a/src/app/core/browse/browse-definition-data.service.ts
+++ b/src/app/core/browse/browse-definition-data.service.ts
@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core';
-import { dataService } from '../cache/builders/build-decorators';
 import { BROWSE_DEFINITION } from '../shared/browse-definition.resource-type';
 import { BrowseDefinition } from '../shared/browse-definition.model';
 import { RequestService } from '../data/request.service';
@@ -13,6 +12,7 @@ import { PaginatedList } from '../data/paginated-list.model';
 import { FindListOptions } from '../data/find-list-options.model';
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';
 import { FindAllData, FindAllDataImpl } from '../data/base/find-all-data';
+import { dataService } from '../data/base/data-service.decorator';
 
 @Injectable({
   providedIn: 'root',
diff --git a/src/app/core/cache/builders/build-decorators.spec.ts b/src/app/core/cache/builders/build-decorators.spec.ts
index e397ca6516..150a07f006 100644
--- a/src/app/core/cache/builders/build-decorators.spec.ts
+++ b/src/app/core/cache/builders/build-decorators.spec.ts
@@ -1,23 +1,7 @@
-/* eslint-disable max-classes-per-file */
 import { HALLink } from '../../shared/hal-link.model';
 import { HALResource } from '../../shared/hal-resource.model';
 import { ResourceType } from '../../shared/resource-type';
-import { dataService, getDataServiceFor, getLinkDefinition, link } from './build-decorators';
-import { HALDataService } from '../../data/base/hal-data-service.interface';
-import { BaseDataService } from '../../data/base/base-data.service';
-
-class TestService extends BaseDataService<any> {
-}
-
-class AnotherTestService implements HALDataService<any> {
-  public findAllByHref(href$, findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow): any {
-    return undefined;
-  }
-
-  public findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow): any {
-    return undefined;
-  }
-}
+import { getLinkDefinition, link } from './build-decorators';
 
 class TestHALResource implements HALResource {
   _links: {
@@ -34,31 +18,6 @@ describe('build decorators', () => {
   beforeEach(() => {
     testType = new ResourceType('testType-' + new Date().getTime());
   });
-  describe('@dataService/getDataServiceFor', () => {
-
-    it('should register a resourcetype for a dataservice', () => {
-      dataService(testType)(TestService);
-      expect(getDataServiceFor(testType)).toBe(TestService);
-    });
-
-    describe(`when the resource type isn't specified`, () => {
-      it(`should throw an error`, () => {
-        expect(() => {
-          dataService(undefined)(TestService);
-        }).toThrow();
-      });
-    });
-
-    describe(`when there already is a registered dataservice for a resourcetype`, () => {
-      it(`should throw an error`, () => {
-        dataService(testType)(TestService);
-        expect(() => {
-          dataService(testType)(AnotherTestService);
-        }).toThrow();
-      });
-    });
-
-  });
 
   describe(`@link/getLinkDefinitions`, () => {
     it(`should register a link`, () => {
diff --git a/src/app/core/cache/builders/build-decorators.ts b/src/app/core/cache/builders/build-decorators.ts
index b421c927b3..9e5ebaed85 100644
--- a/src/app/core/cache/builders/build-decorators.ts
+++ b/src/app/core/cache/builders/build-decorators.ts
@@ -5,14 +5,8 @@ import { HALResource } from '../../shared/hal-resource.model';
 import { ResourceType } from '../../shared/resource-type';
 import { getResourceTypeValueFor } from '../object-cache.reducer';
 import { InjectionToken } from '@angular/core';
-import { CacheableObject } from '../cacheable-object.model';
 import { TypedObject } from '../typed-object.model';
-import { HALDataService } from '../../data/base/hal-data-service.interface';
 
-export const DATA_SERVICE_FACTORY = new InjectionToken<(resourceType: ResourceType) => GenericConstructor<HALDataService<any>>>('getDataServiceFor', {
-  providedIn: 'root',
-  factory: () => getDataServiceFor,
-});
 export const LINK_DEFINITION_FACTORY = new InjectionToken<<T extends HALResource>(source: GenericConstructor<T>, linkName: keyof T['_links']) => LinkDefinition<T>>('getLinkDefinition', {
   providedIn: 'root',
   factory: () => getLinkDefinition,
@@ -26,7 +20,6 @@ const resolvedLinkKey = Symbol('resolvedLink');
 
 const resolvedLinkMap = new Map();
 const typeMap = new Map();
-const dataServiceMap = new Map();
 const linkMap = new Map();
 
 /**
@@ -45,38 +38,6 @@ export function getClassForType(type: string | ResourceType) {
   return typeMap.get(getResourceTypeValueFor(type));
 }
 
-/**
- * A class decorator to indicate that this class is a data service for a given HAL resource type.
- *
- * In most cases, a data service should extend {@link BaseDataService}.
- * At the very least it must implement {@link HALDataService} in order for it to work with {@link LinkService}.
- *
- * @param resourceType the resource type the class is a dataservice for
- */
-export function dataService(resourceType: ResourceType) {
-  return (target: GenericConstructor<HALDataService<any>>): void => {
-    if (hasNoValue(resourceType)) {
-      throw new Error(`Invalid @dataService annotation on ${target}, resourceType needs to be defined`);
-    }
-    const existingDataservice = dataServiceMap.get(resourceType.value);
-
-    if (hasValue(existingDataservice)) {
-      throw new Error(`Multiple dataservices for ${resourceType.value}: ${existingDataservice} and ${target}`);
-    }
-
-    dataServiceMap.set(resourceType.value, target);
-  };
-}
-
-/**
- * Return the dataservice matching the given resource type
- *
- * @param resourceType the resource type you want the matching dataservice for
- */
-export function getDataServiceFor<T extends CacheableObject>(resourceType: ResourceType): GenericConstructor<HALDataService<any>> {
-  return dataServiceMap.get(resourceType.value);
-}
-
 /**
  * A class to represent the data that can be set by the @link decorator
  */
diff --git a/src/app/core/cache/builders/link.service.spec.ts b/src/app/core/cache/builders/link.service.spec.ts
index 5e71a45053..ee44cfccb4 100644
--- a/src/app/core/cache/builders/link.service.spec.ts
+++ b/src/app/core/cache/builders/link.service.spec.ts
@@ -6,9 +6,10 @@ import { HALLink } from '../../shared/hal-link.model';
 import { HALResource } from '../../shared/hal-resource.model';
 import { ResourceType } from '../../shared/resource-type';
 import { LinkService } from './link.service';
-import { DATA_SERVICE_FACTORY, LINK_DEFINITION_FACTORY, LINK_DEFINITION_MAP_FACTORY } from './build-decorators';
+import { LINK_DEFINITION_FACTORY, LINK_DEFINITION_MAP_FACTORY } from './build-decorators';
 import { isEmpty } from 'rxjs/operators';
 import { FindListOptions } from '../../data/find-list-options.model';
+import { DATA_SERVICE_FACTORY } from '../../data/base/data-service.decorator';
 
 const TEST_MODEL = new ResourceType('testmodel');
 let result: any;
diff --git a/src/app/core/cache/builders/link.service.ts b/src/app/core/cache/builders/link.service.ts
index 8d54d46d2d..a02f9841ad 100644
--- a/src/app/core/cache/builders/link.service.ts
+++ b/src/app/core/cache/builders/link.service.ts
@@ -3,8 +3,8 @@ import { hasNoValue, hasValue, isNotEmpty } from '../../../shared/empty.util';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { GenericConstructor } from '../../shared/generic-constructor';
 import { HALResource } from '../../shared/hal-resource.model';
+import { DATA_SERVICE_FACTORY } from '../../data/base/data-service.decorator';
 import {
-  DATA_SERVICE_FACTORY,
   LINK_DEFINITION_FACTORY,
   LINK_DEFINITION_MAP_FACTORY,
   LinkDefinition,
diff --git a/src/app/core/config/submission-accesses-config.service.ts b/src/app/core/config/submission-accesses-config.service.ts
index 4841e2e39d..3632bd0ead 100644
--- a/src/app/core/config/submission-accesses-config.service.ts
+++ b/src/app/core/config/submission-accesses-config.service.ts
@@ -3,7 +3,6 @@ import { ConfigService } from './config.service';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { dataService } from '../cache/builders/build-decorators';
 import { SUBMISSION_ACCESSES_TYPE } from './models/config-type';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { Store } from '@ngrx/store';
@@ -16,6 +15,7 @@ import { RemoteData } from '../data/remote-data';
 import { Observable } from 'rxjs';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { CoreState } from '../core-state.model';
+import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * Provides methods to retrieve, from REST server, bitstream access conditions configurations applicable during the submission process.
diff --git a/src/app/core/config/submission-forms-config.service.ts b/src/app/core/config/submission-forms-config.service.ts
index abd3332cae..652f333247 100644
--- a/src/app/core/config/submission-forms-config.service.ts
+++ b/src/app/core/config/submission-forms-config.service.ts
@@ -6,12 +6,12 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { ConfigObject } from './models/config.model';
-import { dataService } from '../cache/builders/build-decorators';
 import { SUBMISSION_FORMS_TYPE } from './models/config-type';
 import { SubmissionFormsModel } from './models/config-submission-forms.model';
 import { RemoteData } from '../data/remote-data';
 import { Observable } from 'rxjs';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { dataService } from '../data/base/data-service.decorator';
 
 @Injectable()
 @dataService(SUBMISSION_FORMS_TYPE)
diff --git a/src/app/core/config/submission-uploads-config.service.ts b/src/app/core/config/submission-uploads-config.service.ts
index b166b895ac..bcb564d690 100644
--- a/src/app/core/config/submission-uploads-config.service.ts
+++ b/src/app/core/config/submission-uploads-config.service.ts
@@ -3,7 +3,6 @@ import { ConfigService } from './config.service';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { dataService } from '../cache/builders/build-decorators';
 import { SUBMISSION_UPLOADS_TYPE } from './models/config-type';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ConfigObject } from './models/config.model';
@@ -11,6 +10,7 @@ import { SubmissionUploadsModel } from './models/config-submission-uploads.model
 import { RemoteData } from '../data/remote-data';
 import { Observable } from 'rxjs';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * Provides methods to retrieve, from REST server, bitstream access conditions configurations applicable during the submission process.
diff --git a/src/app/core/data/access-status-data.service.ts b/src/app/core/data/access-status-data.service.ts
index 2b1dfd319a..aac9cc9136 100644
--- a/src/app/core/data/access-status-data.service.ts
+++ b/src/app/core/data/access-status-data.service.ts
@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -10,6 +9,7 @@ import { Observable } from 'rxjs';
 import { RemoteData } from './remote-data';
 import { Item } from '../shared/item.model';
 import { BaseDataService } from './base/base-data.service';
+import { dataService } from './base/data-service.decorator';
 
 @Injectable()
 @dataService(ACCESS_STATUS)
diff --git a/src/app/core/data/base/data-service.decorator.spec.ts b/src/app/core/data/base/data-service.decorator.spec.ts
new file mode 100644
index 0000000000..ec4c1c8f6f
--- /dev/null
+++ b/src/app/core/data/base/data-service.decorator.spec.ts
@@ -0,0 +1,55 @@
+/* eslint-disable max-classes-per-file */
+/**
+ * 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 { ResourceType } from '../../shared/resource-type';
+import { BaseDataService } from './base-data.service';
+import { HALDataService } from './hal-data-service.interface';
+import { dataService, getDataServiceFor } from './data-service.decorator';
+
+class TestService extends BaseDataService<any> {
+}
+
+class AnotherTestService implements HALDataService<any> {
+  public findListByHref(href$, findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow): any {
+    return undefined;
+  }
+
+  public findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow): any {
+    return undefined;
+  }
+}
+
+let testType;
+
+describe('@dataService/getDataServiceFor', () => {
+  beforeEach(() => {
+    testType = new ResourceType('testType-' + new Date().getTime());
+  });
+
+  it('should register a resourcetype for a dataservice', () => {
+    dataService(testType)(TestService);
+    expect(getDataServiceFor(testType)).toBe(TestService);
+  });
+
+  describe(`when the resource type isn't specified`, () => {
+    it(`should throw an error`, () => {
+      expect(() => {
+        dataService(undefined)(TestService);
+      }).toThrow();
+    });
+  });
+
+  describe(`when there already is a registered dataservice for a resourcetype`, () => {
+    it(`should throw an error`, () => {
+      dataService(testType)(TestService);
+      expect(() => {
+        dataService(testType)(AnotherTestService);
+      }).toThrow();
+    });
+  });
+});
diff --git a/src/app/core/data/base/data-service.decorator.ts b/src/app/core/data/base/data-service.decorator.ts
new file mode 100644
index 0000000000..fbde9bd94f
--- /dev/null
+++ b/src/app/core/data/base/data-service.decorator.ts
@@ -0,0 +1,51 @@
+/**
+ * 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 { InjectionToken } from '@angular/core';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { ResourceType } from '../../shared/resource-type';
+import { GenericConstructor } from '../../shared/generic-constructor';
+import { hasNoValue, hasValue } from '../../../shared/empty.util';
+import { HALDataService } from './hal-data-service.interface';
+
+export const DATA_SERVICE_FACTORY = new InjectionToken<(resourceType: ResourceType) => GenericConstructor<HALDataService<any>>>('getDataServiceFor', {
+  providedIn: 'root',
+  factory: () => getDataServiceFor,
+});
+const dataServiceMap = new Map();
+
+/**
+ * A class decorator to indicate that this class is a data service for a given HAL resource type.
+ *
+ * In most cases, a data service should extend {@link BaseDataService}.
+ * At the very least it must implement {@link HALDataService} in order for it to work with {@link LinkService}.
+ *
+ * @param resourceType the resource type the class is a dataservice for
+ */
+export function dataService(resourceType: ResourceType) {
+  return (target: GenericConstructor<HALDataService<any>>): void => {
+    if (hasNoValue(resourceType)) {
+      throw new Error(`Invalid @dataService annotation on ${target}, resourceType needs to be defined`);
+    }
+    const existingDataservice = dataServiceMap.get(resourceType.value);
+
+    if (hasValue(existingDataservice)) {
+      throw new Error(`Multiple dataservices for ${resourceType.value}: ${existingDataservice} and ${target}`);
+    }
+
+    dataServiceMap.set(resourceType.value, target);
+  };
+}
+
+/**
+ * Return the dataservice matching the given resource type
+ *
+ * @param resourceType the resource type you want the matching dataservice for
+ */
+export function getDataServiceFor<T extends CacheableObject>(resourceType: ResourceType): GenericConstructor<HALDataService<any>> {
+  return dataServiceMap.get(resourceType.value);
+}
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index ab0a4c301c..6952f50214 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -4,7 +4,6 @@ import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { map, switchMap, take } from 'rxjs/operators';
 import { hasValue } from '../../shared/empty.util';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { Bitstream } from '../shared/bitstream.model';
@@ -33,6 +32,7 @@ import { DeleteData, DeleteDataImpl } from './base/delete-data';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { NoContent } from '../shared/NoContent.model';
 import { IdentifiableDataService } from './base/identifiable-data.service';
+import { dataService } from './base/data-service.decorator';
 
 /**
  * A service to retrieve {@link Bitstream}s from the REST API
diff --git a/src/app/core/data/bitstream-format-data.service.ts b/src/app/core/data/bitstream-format-data.service.ts
index 72d14fbf68..0104389815 100644
--- a/src/app/core/data/bitstream-format-data.service.ts
+++ b/src/app/core/data/bitstream-format-data.service.ts
@@ -5,7 +5,6 @@ import { distinctUntilChanged, map, tap } from 'rxjs/operators';
 import { BitstreamFormatsRegistryDeselectAction, BitstreamFormatsRegistryDeselectAllAction, BitstreamFormatsRegistrySelectAction } from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions';
 import { BitstreamFormatRegistryState } from '../../admin/admin-registries/bitstream-formats/bitstream-format.reducers';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { coreSelector } from '../core.selectors';
@@ -25,6 +24,7 @@ import { FollowLinkConfig } from 'src/app/shared/utils/follow-link-config.model'
 import { FindListOptions } from './find-list-options.model';
 import { PaginatedList } from './paginated-list.model';
 import { NoContent } from '../shared/NoContent.model';
+import { dataService } from './base/data-service.decorator';
 
 const bitstreamFormatsStateSelector = createSelector(
   coreSelector,
diff --git a/src/app/core/data/bundle-data.service.ts b/src/app/core/data/bundle-data.service.ts
index bc559b4b65..77df37c510 100644
--- a/src/app/core/data/bundle-data.service.ts
+++ b/src/app/core/data/bundle-data.service.ts
@@ -3,7 +3,6 @@ import { Observable } from 'rxjs';
 import { map, switchMap, take } from 'rxjs/operators';
 import { hasValue } from '../../shared/empty.util';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { Bundle } from '../shared/bundle.model';
@@ -23,6 +22,7 @@ import { PatchData, PatchDataImpl } from './base/patch-data';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
 import { RestRequestMethod } from './rest-request-method';
 import { Operation } from 'fast-json-patch';
+import { dataService } from './base/data-service.decorator';
 
 /**
  * A service to retrieve {@link Bundle}s from the REST API
diff --git a/src/app/core/data/collection-data.service.ts b/src/app/core/data/collection-data.service.ts
index c9ebc0e74f..36791520a9 100644
--- a/src/app/core/data/collection-data.service.ts
+++ b/src/app/core/data/collection-data.service.ts
@@ -8,7 +8,6 @@ import { NotificationOptions } from '../../shared/notifications/models/notificat
 import { INotification } from '../../shared/notifications/models/notification.model';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
@@ -34,6 +33,7 @@ import { BitstreamDataService } from './bitstream-data.service';
 import { RestRequest } from './rest-request.model';
 import { FindListOptions } from './find-list-options.model';
 import { Community } from '../shared/community.model';
+import { dataService } from './base/data-service.decorator';
 
 @Injectable()
 @dataService(COLLECTION)
diff --git a/src/app/core/data/community-data.service.ts b/src/app/core/data/community-data.service.ts
index 3062b15b1e..e40ad06ddb 100644
--- a/src/app/core/data/community-data.service.ts
+++ b/src/app/core/data/community-data.service.ts
@@ -3,7 +3,6 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { filter, map, switchMap, take } from 'rxjs/operators';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { Community } from '../shared/community.model';
@@ -18,6 +17,7 @@ import { BitstreamDataService } from './bitstream-data.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { isNotEmpty } from '../../shared/empty.util';
 import { FindListOptions } from './find-list-options.model';
+import { dataService } from './base/data-service.decorator';
 
 @Injectable()
 @dataService(COMMUNITY)
diff --git a/src/app/core/data/configuration-data.service.ts b/src/app/core/data/configuration-data.service.ts
index ed62ee4933..de044e25e3 100644
--- a/src/app/core/data/configuration-data.service.ts
+++ b/src/app/core/data/configuration-data.service.ts
@@ -1,7 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -10,6 +9,7 @@ import { RequestService } from './request.service';
 import { ConfigurationProperty } from '../shared/configuration-property.model';
 import { CONFIG_PROPERTY } from '../shared/config-property.resource-type';
 import { IdentifiableDataService } from './base/identifiable-data.service';
+import { dataService } from './base/data-service.decorator';
 
 @Injectable()
 @dataService(CONFIG_PROPERTY)
diff --git a/src/app/core/data/dspace-object-data.service.ts b/src/app/core/data/dspace-object-data.service.ts
index 7ab29506aa..2ad024133c 100644
--- a/src/app/core/data/dspace-object-data.service.ts
+++ b/src/app/core/data/dspace-object-data.service.ts
@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { DSpaceObject } from '../shared/dspace-object.model';
@@ -7,6 +6,7 @@ import { DSPACE_OBJECT } from '../shared/dspace-object.resource-type';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RequestService } from './request.service';
 import { IdentifiableDataService } from './base/identifiable-data.service';
+import { dataService } from './base/data-service.decorator';
 
 @Injectable()
 @dataService(DSPACE_OBJECT)
diff --git a/src/app/core/data/feature-authorization/authorization-data.service.ts b/src/app/core/data/feature-authorization/authorization-data.service.ts
index 85df98f399..a9aded4bfe 100644
--- a/src/app/core/data/feature-authorization/authorization-data.service.ts
+++ b/src/app/core/data/feature-authorization/authorization-data.service.ts
@@ -1,7 +1,6 @@
 import { Observable, of as observableOf } from 'rxjs';
 import { Injectable } from '@angular/core';
 import { AUTHORIZATION } from '../../shared/authorization.resource-type';
-import { dataService } from '../../cache/builders/build-decorators';
 import { Authorization } from '../../shared/authorization.model';
 import { RequestService } from '../request.service';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
@@ -21,6 +20,7 @@ import { getFirstCompletedRemoteData } from '../../shared/operators';
 import { FindListOptions } from '../find-list-options.model';
 import { BaseDataService } from '../base/base-data.service';
 import { SearchData, SearchDataImpl } from '../base/search-data';
+import { dataService } from '../base/data-service.decorator';
 
 /**
  * A service to retrieve {@link Authorization}s from the REST API
diff --git a/src/app/core/data/feature-authorization/feature-data.service.ts b/src/app/core/data/feature-authorization/feature-data.service.ts
index bed6cd114d..eda8791153 100644
--- a/src/app/core/data/feature-authorization/feature-data.service.ts
+++ b/src/app/core/data/feature-authorization/feature-data.service.ts
@@ -1,12 +1,12 @@
 import { Injectable } from '@angular/core';
 import { FEATURE } from '../../shared/feature.resource-type';
-import { dataService } from '../../cache/builders/build-decorators';
 import { Feature } from '../../shared/feature.model';
 import { RequestService } from '../request.service';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { BaseDataService } from '../base/base-data.service';
+import { dataService } from '../base/data-service.decorator';
 
 /**
  * A service to retrieve {@link Feature}s from the REST API
diff --git a/src/app/core/data/href-only-data.service.ts b/src/app/core/data/href-only-data.service.ts
index 9a36dcc128..b234d5d85a 100644
--- a/src/app/core/data/href-only-data.service.ts
+++ b/src/app/core/data/href-only-data.service.ts
@@ -5,7 +5,6 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Injectable } from '@angular/core';
 import { VOCABULARY_ENTRY } from '../submission/vocabularies/models/vocabularies.resource-type';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteData } from './remote-data';
 import { Observable } from 'rxjs';
 import { PaginatedList } from './paginated-list.model';
@@ -15,6 +14,7 @@ import { CacheableObject } from '../cache/cacheable-object.model';
 import { FindListOptions } from './find-list-options.model';
 import { BaseDataService } from './base/base-data.service';
 import { HALDataService } from './base/hal-data-service.interface';
+import { dataService } from './base/data-service.decorator';
 
 /**
  * A DataService with only findByHref methods. Its purpose is to be used for resources that don't
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index ecc9e0e502..11179d1e77 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -13,7 +13,6 @@ import { distinctUntilChanged, filter, find, map, switchMap, take } from 'rxjs/o
 import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { BrowseService } from '../browse/browse.service';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
@@ -46,6 +45,7 @@ import { DeleteData, DeleteDataImpl } from './base/delete-data';
 import { RestRequestMethod } from './rest-request-method';
 import { CreateData, CreateDataImpl } from './base/create-data';
 import { RequestParam } from '../cache/models/request-param.model';
+import { dataService } from './base/data-service.decorator';
 
 /**
  * An abstract service for CRUD operations on Items
diff --git a/src/app/core/data/metadata-field-data.service.ts b/src/app/core/data/metadata-field-data.service.ts
index e54ccb71c3..db9361ee4c 100644
--- a/src/app/core/data/metadata-field-data.service.ts
+++ b/src/app/core/data/metadata-field-data.service.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
 import { hasValue } from '../../shared/empty.util';
-import { dataService } from '../cache/builders/build-decorators';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
@@ -22,6 +21,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { DeleteData, DeleteDataImpl } from './base/delete-data';
 import { IdentifiableDataService } from './base/identifiable-data.service';
+import { dataService } from './base/data-service.decorator';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the metadatafields endpoint
diff --git a/src/app/core/data/metadata-schema-data.service.ts b/src/app/core/data/metadata-schema-data.service.ts
index 97f806d237..6bd633b8c6 100644
--- a/src/app/core/data/metadata-schema-data.service.ts
+++ b/src/app/core/data/metadata-schema-data.service.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
@@ -20,6 +19,7 @@ import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { PaginatedList } from './paginated-list.model';
 import { IdentifiableDataService } from './base/identifiable-data.service';
 import { DeleteData, DeleteDataImpl } from './base/delete-data';
+import { dataService } from './base/data-service.decorator';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the metadataschemas endpoint
diff --git a/src/app/core/data/processes/process-data.service.ts b/src/app/core/data/processes/process-data.service.ts
index 0168ded7c9..0a276cd7f2 100644
--- a/src/app/core/data/processes/process-data.service.ts
+++ b/src/app/core/data/processes/process-data.service.ts
@@ -4,7 +4,6 @@ import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.s
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { Process } from '../../../process-page/processes/process.model';
-import { dataService } from '../../cache/builders/build-decorators';
 import { PROCESS } from '../../../process-page/processes/process.resource-type';
 import { Observable } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
@@ -16,6 +15,7 @@ import { IdentifiableDataService } from '../base/identifiable-data.service';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { FindAllData, FindAllDataImpl } from '../base/find-all-data';
 import { FindListOptions } from '../find-list-options.model';
+import { dataService } from '../base/data-service.decorator';
 
 @Injectable()
 @dataService(PROCESS)
diff --git a/src/app/core/data/processes/script-data.service.ts b/src/app/core/data/processes/script-data.service.ts
index a05599c36c..ed228612ef 100644
--- a/src/app/core/data/processes/script-data.service.ts
+++ b/src/app/core/data/processes/script-data.service.ts
@@ -10,7 +10,6 @@ import { RemoteData } from '../remote-data';
 import { MultipartPostRequest } from '../request.models';
 import { RequestService } from '../request.service';
 import { Observable } from 'rxjs';
-import { dataService } from '../../cache/builders/build-decorators';
 import { SCRIPT } from '../../../process-page/scripts/script.resource-type';
 import { Process } from '../../../process-page/processes/process.model';
 import { hasValue } from '../../../shared/empty.util';
@@ -21,6 +20,7 @@ import { FindAllData, FindAllDataImpl } from '../base/find-all-data';
 import { FindListOptions } from '../find-list-options.model';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { PaginatedList } from '../paginated-list.model';
+import { dataService } from '../base/data-service.decorator';
 
 export const METADATA_IMPORT_SCRIPT_NAME = 'metadata-import';
 export const METADATA_EXPORT_SCRIPT_NAME = 'metadata-export';
diff --git a/src/app/core/data/relationship-type.service.ts b/src/app/core/data/relationship-type.service.ts
index e3b01c3024..20f1bca9bc 100644
--- a/src/app/core/data/relationship-type.service.ts
+++ b/src/app/core/data/relationship-type.service.ts
@@ -3,7 +3,6 @@ import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { map, mergeMap, switchMap, toArray } from 'rxjs/operators';
 import { hasValue } from '../../shared/empty.util';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ItemType } from '../shared/item-relationships/item-type.model';
@@ -17,6 +16,7 @@ import { BaseDataService } from './base/base-data.service';
 import { FindAllDataImpl } from './base/find-all-data';
 import { SearchDataImpl } from './base/search-data';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from './base/data-service.decorator';
 
 /**
  * Check if one side of a RelationshipType is the ItemType with the given label
diff --git a/src/app/core/data/relationship.service.ts b/src/app/core/data/relationship.service.ts
index 8773b61473..50c84912f6 100644
--- a/src/app/core/data/relationship.service.ts
+++ b/src/app/core/data/relationship.service.ts
@@ -16,7 +16,6 @@ import {
 } from '../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.actions';
 import { NameVariantListState } from '../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
@@ -45,6 +44,7 @@ import { FindListOptions } from './find-list-options.model';
 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';
 
 const relationshipListsStateSelector = (state: AppState) => state.relationshipLists;
 
diff --git a/src/app/core/data/root-data.service.ts b/src/app/core/data/root-data.service.ts
index 4fbef3e556..54fe614d3e 100644
--- a/src/app/core/data/root-data.service.ts
+++ b/src/app/core/data/root-data.service.ts
@@ -1,7 +1,6 @@
 import { Root } from './root.model';
 import { Injectable } from '@angular/core';
 import { ROOT } from './root.resource-type';
-import { dataService } from '../cache/builders/build-decorators';
 import { RequestService } from './request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -13,6 +12,7 @@ import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { catchError, map } from 'rxjs/operators';
 import { BaseDataService } from './base/base-data.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from './base/data-service.decorator';
 
 /**
  * A service to retrieve the {@link Root} object from the REST API.
diff --git a/src/app/core/data/site-data.service.ts b/src/app/core/data/site-data.service.ts
index 4b61cc5d9d..c2c4ffa466 100644
--- a/src/app/core/data/site-data.service.ts
+++ b/src/app/core/data/site-data.service.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { getFirstSucceededRemoteData } from '../shared/operators';
@@ -15,6 +14,7 @@ import { FindAllData, FindAllDataImpl } from './base/find-all-data';
 import { FollowLinkConfig } from 'src/app/shared/utils/follow-link-config.model';
 import { FindListOptions } from './find-list-options.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from './base/data-service.decorator';
 
 /**
  * Service responsible for handling requests related to the Site object
diff --git a/src/app/core/data/version-data.service.ts b/src/app/core/data/version-data.service.ts
index 0c677a5541..ee7bdb2028 100644
--- a/src/app/core/data/version-data.service.ts
+++ b/src/app/core/data/version-data.service.ts
@@ -5,7 +5,6 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { EMPTY, Observable } from 'rxjs';
-import { dataService } from '../cache/builders/build-decorators';
 import { VERSION } from '../shared/version.resource-type';
 import { VersionHistory } from '../shared/version-history.model';
 import { followLink } from '../../shared/utils/follow-link-config.model';
@@ -17,6 +16,7 @@ import { PatchData, PatchDataImpl } from './base/patch-data';
 import { RestRequestMethod } from './rest-request-method';
 import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { IdentifiableDataService } from './base/identifiable-data.service';
+import { dataService } from './base/data-service.decorator';
 
 /**
  * Service responsible for handling requests related to the Version object
diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts
index 4c6891d5ea..75bc1a4b14 100644
--- a/src/app/core/data/version-history-data.service.ts
+++ b/src/app/core/data/version-history-data.service.ts
@@ -12,7 +12,6 @@ import { RemoteData } from './remote-data';
 import { PaginatedList } from './paginated-list.model';
 import { Version } from '../shared/version.model';
 import { filter, map, switchMap, take } from 'rxjs/operators';
-import { dataService } from '../cache/builders/build-decorators';
 import { VERSION_HISTORY } from '../shared/version-history.resource-type';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { VersionDataService } from './version-data.service';
@@ -25,6 +24,7 @@ import { FindListOptions } from './find-list-options.model';
 import { sendRequest } from '../shared/request.operators';
 import { RestRequest } from './rest-request.model';
 import { IdentifiableDataService } from './base/identifiable-data.service';
+import { dataService } from './base/data-service.decorator';
 
 /**
  * Service responsible for handling requests related to the VersionHistory object
diff --git a/src/app/core/data/workflow-action-data.service.ts b/src/app/core/data/workflow-action-data.service.ts
index a89e997474..b2c4f0bd7b 100644
--- a/src/app/core/data/workflow-action-data.service.ts
+++ b/src/app/core/data/workflow-action-data.service.ts
@@ -4,9 +4,9 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Injectable } from '@angular/core';
-import { dataService } from '../cache/builders/build-decorators';
 import { WORKFLOW_ACTION } from '../tasks/models/workflow-action-object.resource-type';
 import { BaseDataService } from './base/base-data.service';
+import { dataService } from './base/data-service.decorator';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the workflowactions endpoint
diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts
index 2c2d52b258..2313d2b20e 100644
--- a/src/app/core/eperson/eperson-data.service.ts
+++ b/src/app/core/eperson/eperson-data.service.ts
@@ -9,7 +9,6 @@ import { AppState } from '../../app.reducer';
 import { hasNoValue, hasValue } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
@@ -31,6 +30,7 @@ import { SearchData, SearchDataImpl } from '../data/base/search-data';
 import { PatchData, PatchDataImpl } from '../data/base/patch-data';
 import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
 import { RestRequestMethod } from '../data/rest-request-method';
+import { dataService } from '../data/base/data-service.decorator';
 
 const ePeopleRegistryStateSelector = (state: AppState) => state.epeopleRegistry;
 const editEPersonSelector = createSelector(ePeopleRegistryStateSelector, (ePeopleRegistryState: EPeopleRegistryState) => ePeopleRegistryState.editEPerson);
diff --git a/src/app/core/eperson/group-data.service.ts b/src/app/core/eperson/group-data.service.ts
index 615132dca1..6e6d1fbb9b 100644
--- a/src/app/core/eperson/group-data.service.ts
+++ b/src/app/core/eperson/group-data.service.ts
@@ -26,7 +26,6 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 import { EPerson } from './models/eperson.model';
 import { Group } from './models/group.model';
-import { dataService } from '../cache/builders/build-decorators';
 import { GROUP } from './models/group.resource-type';
 import { DSONameService } from '../breadcrumbs/dso-name.service';
 import { Community } from '../shared/community.model';
@@ -40,6 +39,7 @@ import { PatchData, PatchDataImpl } from '../data/base/patch-data';
 import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
 import { Operation } from 'fast-json-patch';
 import { RestRequestMethod } from '../data/rest-request-method';
+import { dataService } from '../data/base/data-service.decorator';
 
 const groupRegistryStateSelector = (state: AppState) => state.groupRegistry;
 const editGroupSelector = createSelector(groupRegistryStateSelector, (groupRegistryState: GroupRegistryState) => groupRegistryState.editGroup);
diff --git a/src/app/core/feedback/feedback-data.service.ts b/src/app/core/feedback/feedback-data.service.ts
index bc8a44b6f5..3cc7df7653 100644
--- a/src/app/core/feedback/feedback-data.service.ts
+++ b/src/app/core/feedback/feedback-data.service.ts
@@ -2,7 +2,6 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { Feedback } from './models/feedback.model';
 import { FEEDBACK } from './models/feedback.resource-type';
-import { dataService } from '../cache/builders/build-decorators';
 import { RequestService } from '../data/request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { Store } from '@ngrx/store';
@@ -14,6 +13,7 @@ import { IdentifiableDataService } from '../data/base/identifiable-data.service'
 import { RemoteData } from '../data/remote-data';
 import { RequestParam } from '../cache/models/request-param.model';
 import { CreateData, CreateDataImpl } from '../data/base/create-data';
+import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * Service for checking and managing the feedback
diff --git a/src/app/core/orcid/orcid-history-data.service.ts b/src/app/core/orcid/orcid-history-data.service.ts
index 9abcbac63b..f06a270a44 100644
--- a/src/app/core/orcid/orcid-history-data.service.ts
+++ b/src/app/core/orcid/orcid-history-data.service.ts
@@ -2,7 +2,6 @@ import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { RemoteData } from '../data/remote-data';
@@ -16,6 +15,7 @@ import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { RestRequest } from '../data/rest-request.model';
 import { sendRequest } from '../shared/request.operators';
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * A service that provides methods to make REST requests with Orcid History endpoint.
diff --git a/src/app/core/orcid/orcid-queue.service.ts b/src/app/core/orcid/orcid-queue.service.ts
index 9b3f47747d..db61514b82 100644
--- a/src/app/core/orcid/orcid-queue.service.ts
+++ b/src/app/core/orcid/orcid-queue.service.ts
@@ -5,7 +5,6 @@ import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { Injectable } from '@angular/core';
-import { dataService } from '../cache/builders/build-decorators';
 import { ORCID_QUEUE } from './model/orcid-queue.resource-type';
 import { Observable } from 'rxjs';
 import { RemoteData } from '../data/remote-data';
@@ -16,6 +15,7 @@ import { NoContent } from '../shared/NoContent.model';
 import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
 import { SearchData, SearchDataImpl } from '../data/base/search-data';
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * A service that provides methods to make REST requests with Orcid Queue endpoint.
diff --git a/src/app/core/profile/researcher-profile.service.ts b/src/app/core/profile/researcher-profile.service.ts
index 2f9e7b3d18..1331a88bed 100644
--- a/src/app/core/profile/researcher-profile.service.ts
+++ b/src/app/core/profile/researcher-profile.service.ts
@@ -6,7 +6,6 @@ import { Operation, ReplaceOperation } from 'fast-json-patch';
 import { Observable } from 'rxjs';
 import { find, map } from 'rxjs/operators';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
@@ -33,6 +32,7 @@ import { RestRequestMethod } from '../data/rest-request-method';
 import { RequestParam } from '../cache/models/request-param.model';
 import { FindListOptions } from '../data/find-list-options.model';
 import { PaginatedList } from '../data/paginated-list.model';
+import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * A service that provides methods to make REST requests with researcher profile endpoint.
diff --git a/src/app/core/resource-policy/resource-policy.service.ts b/src/app/core/resource-policy/resource-policy.service.ts
index 2f5fb96c41..ac5236dd4e 100644
--- a/src/app/core/resource-policy/resource-policy.service.ts
+++ b/src/app/core/resource-policy/resource-policy.service.ts
@@ -2,7 +2,6 @@ import { Injectable } from '@angular/core';
 import { HttpHeaders } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { dataService } from '../cache/builders/build-decorators';
 import { RequestService } from '../data/request.service';
 import { Collection } from '../shared/collection.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -34,6 +33,7 @@ import { CreateDataImpl } from '../data/base/create-data';
 import { SearchDataImpl } from '../data/base/search-data';
 import { PatchDataImpl } from '../data/base/patch-data';
 import { DeleteDataImpl } from '../data/base/delete-data';
+import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the resourcepolicies endpoint
diff --git a/src/app/core/statistics/usage-report-data.service.ts b/src/app/core/statistics/usage-report-data.service.ts
index 7511264de8..d2f3bef2fc 100644
--- a/src/app/core/statistics/usage-report-data.service.ts
+++ b/src/app/core/statistics/usage-report-data.service.ts
@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -15,6 +14,7 @@ import { FindListOptions } from '../data/find-list-options.model';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteData } from '../data/remote-data';
 import { PaginatedList } from '../data/paginated-list.model';
+import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * A service to retrieve {@link UsageReport}s from the REST API
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 1a2d2f3d7d..976f2acf90 100644
--- a/src/app/core/submission/submission-cc-license-data.service.ts
+++ b/src/app/core/submission/submission-cc-license-data.service.ts
@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -13,6 +12,7 @@ import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { Observable } from 'rxjs';
 import { RemoteData } from '../data/remote-data';
 import { PaginatedList } from '../data/paginated-list.model';
+import { dataService } from '../data/base/data-service.decorator';
 
 @Injectable()
 @dataService(SUBMISSION_CC_LICENSE)
diff --git a/src/app/core/submission/submission-cc-license-url-data.service.ts b/src/app/core/submission/submission-cc-license-url-data.service.ts
index d40e75cdef..3934ea7cb2 100644
--- a/src/app/core/submission/submission-cc-license-url-data.service.ts
+++ b/src/app/core/submission/submission-cc-license-url-data.service.ts
@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -16,6 +15,7 @@ import { FindListOptions } from '../data/find-list-options.model';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteData } from '../data/remote-data';
 import { PaginatedList } from '../data/paginated-list.model';
+import { dataService } from '../data/base/data-service.decorator';
 
 @Injectable()
 @dataService(SUBMISSION_CC_LICENSE_URL)
diff --git a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
index aaa0c23d20..f19c0c00c2 100644
--- a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
@@ -19,8 +19,8 @@ import { RemoteData } from '../../data/remote-data';
 import { PaginatedList } from '../../data/paginated-list.model';
 import { SearchData, SearchDataImpl } from '../../data/base/search-data';
 import { Injectable } from '@angular/core';
-import { dataService } from '../../cache/builders/build-decorators';
 import { VOCABULARY_ENTRY_DETAIL } from './models/vocabularies.resource-type';
+import { dataService } from '../../data/base/data-service.decorator';
 
 @Injectable()
 @dataService(VOCABULARY_ENTRY_DETAIL)
diff --git a/src/app/core/submission/vocabularies/vocabulary.data.service.ts b/src/app/core/submission/vocabularies/vocabulary.data.service.ts
index 3e19ee4653..e4e17b7e73 100644
--- a/src/app/core/submission/vocabularies/vocabulary.data.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.data.service.ts
@@ -18,8 +18,8 @@ import { Observable } from 'rxjs';
 import { RemoteData } from '../../data/remote-data';
 import { PaginatedList } from '../../data/paginated-list.model';
 import { Injectable } from '@angular/core';
-import { dataService } from '../../cache/builders/build-decorators';
 import { VOCABULARY } from './models/vocabularies.resource-type';
+import { dataService } from '../../data/base/data-service.decorator';
 
 @Injectable()
 @dataService(VOCABULARY)
diff --git a/src/app/core/submission/workflowitem-data.service.ts b/src/app/core/submission/workflowitem-data.service.ts
index f89f850c15..c8cf9dd02f 100644
--- a/src/app/core/submission/workflowitem-data.service.ts
+++ b/src/app/core/submission/workflowitem-data.service.ts
@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestService } from '../data/request.service';
 import { WorkflowItem } from './models/workflowitem.model';
@@ -21,6 +20,7 @@ import { IdentifiableDataService } from '../data/base/identifiable-data.service'
 import { SearchData, SearchDataImpl } from '../data/base/search-data';
 import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
 import { PaginatedList } from '../data/paginated-list.model';
+import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * A service that provides methods to make REST requests with workflow items endpoint.
diff --git a/src/app/core/submission/workspaceitem-data.service.ts b/src/app/core/submission/workspaceitem-data.service.ts
index 551d40e665..f285fb6eca 100644
--- a/src/app/core/submission/workspaceitem-data.service.ts
+++ b/src/app/core/submission/workspaceitem-data.service.ts
@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -16,6 +15,7 @@ import { SearchData, SearchDataImpl } from '../data/base/search-data';
 import { PaginatedList } from '../data/paginated-list.model';
 import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
 import { NoContent } from '../shared/NoContent.model';
+import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * A service that provides methods to make REST requests with workspaceitems endpoint.
diff --git a/src/app/core/tasks/claimed-task-data.service.ts b/src/app/core/tasks/claimed-task-data.service.ts
index 3f3edcb09e..4e5c43c146 100644
--- a/src/app/core/tasks/claimed-task-data.service.ts
+++ b/src/app/core/tasks/claimed-task-data.service.ts
@@ -1,7 +1,6 @@
 import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { RequestService } from '../data/request.service';
@@ -15,6 +14,7 @@ import { RequestParam } from '../cache/models/request-param.model';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { getFirstSucceededRemoteData } from '../shared/operators';
 import { FindListOptions } from '../data/find-list-options.model';
+import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * The service handling all REST requests for ClaimedTask
diff --git a/src/app/core/tasks/pool-task-data.service.ts b/src/app/core/tasks/pool-task-data.service.ts
index fe0218eba1..ec44184934 100644
--- a/src/app/core/tasks/pool-task-data.service.ts
+++ b/src/app/core/tasks/pool-task-data.service.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 
 import { Observable } from 'rxjs';
-import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { RequestService } from '../data/request.service';
@@ -13,6 +12,7 @@ import { RemoteData } from '../data/remote-data';
 import { RequestParam } from '../cache/models/request-param.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 import { FindListOptions } from '../data/find-list-options.model';
+import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * The service handling all REST requests for PoolTask
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.ts b/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.ts
index 3bb697beee..b120c3e016 100644
--- a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.ts
+++ b/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.ts
@@ -10,7 +10,6 @@ import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model';
 import { hasValue, isNotEmpty } from '../../../empty.util';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { getDataServiceFor } from '../../../../core/cache/builders/build-decorators';
 import { EPERSON } from '../../../../core/eperson/models/eperson.resource-type';
 import { GROUP } from '../../../../core/eperson/models/group.resource-type';
 import { ResourceType } from '../../../../core/shared/resource-type';
@@ -20,6 +19,7 @@ import { fadeInOut } from '../../../animations/fade';
 import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { FindListOptions } from '../../../../core/data/find-list-options.model';
+import { getDataServiceFor } from '../../../../core/data/base/data-service.decorator';
 
 export interface SearchEvent {
   scope: string;
diff --git a/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts b/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts
index db1340eb54..95f27c7934 100644
--- a/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts
+++ b/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts
@@ -3,13 +3,13 @@ import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@a
 
 import { Observable } from 'rxjs';
 
-import { getDataServiceFor } from '../../../core/cache/builders/build-decorators';
 import { ResourceType } from '../../../core/shared/resource-type';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { isEmpty } from '../../empty.util';
 import { RemoteData } from '../../../core/data/remote-data';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service';
+import { getDataServiceFor } from '../../../core/data/base/data-service.decorator';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated

From 05b131edb92a90d3c141fca5339a6c40ed901da6 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Wed, 24 Aug 2022 17:05:08 +0200
Subject: [PATCH 13/48] 93803: Rename findAllByHref to findListByHref

To avoid confusion with FindAllData:
- findAll is a "feature" to retrieve all resources from the endpoint itself ~ a plain GET
- findAllByHref is retrieves lists of resources in general
---
 .../eperson-form.component.spec.ts            |  2 +-
 .../eperson-form/eperson-form.component.ts    |  6 ++--
 .../members-list.component.spec.ts            |  2 +-
 .../members-list/members-list.component.ts    |  4 +--
 .../subgroups-list.component.spec.ts          |  2 +-
 .../subgroup-list/subgroups-list.component.ts |  4 +--
 .../groups-registry.component.spec.ts         |  4 +--
 .../groups-registry.component.ts              |  4 +--
 .../collection-item-mapper.component.spec.ts  |  4 +--
 .../collection-item-mapper.component.ts       |  2 +-
 ...page-sub-collection-list.component.spec.ts |  2 +-
 ...-page-sub-community-list.component.spec.ts |  2 +-
 src/app/core/browse/browse.service.spec.ts    | 16 ++++-----
 src/app/core/browse/browse.service.ts         | 14 ++++----
 .../core/cache/builders/link.service.spec.ts  | 10 +++---
 src/app/core/cache/builders/link.service.ts   |  2 +-
 .../core/data/base/base-data.service.spec.ts  | 34 +++++++++----------
 src/app/core/data/base/base-data.service.ts   |  4 +--
 src/app/core/data/base/find-all-data.ts       |  2 +-
 .../data/base/hal-data-service.interface.ts   |  2 +-
 src/app/core/data/base/search-data.ts         |  2 +-
 src/app/core/data/bitstream-data.service.ts   |  2 +-
 src/app/core/data/bundle-data.service.spec.ts |  6 ++--
 src/app/core/data/bundle-data.service.ts      |  2 +-
 src/app/core/data/collection-data.service.ts  |  2 +-
 src/app/core/data/comcol-data.service.ts      |  2 +-
 src/app/core/data/community-data.service.ts   |  2 +-
 src/app/core/data/entity-type.service.ts      |  2 +-
 src/app/core/data/external-source.service.ts  |  2 +-
 .../core/data/href-only-data.service.spec.ts  | 20 +++++------
 src/app/core/data/href-only-data.service.ts   |  8 ++---
 .../data/processes/process-data.service.ts    |  2 +-
 src/app/core/data/relationship.service.ts     |  2 +-
 .../data/version-history-data.service.spec.ts | 10 +++---
 .../core/data/version-history-data.service.ts |  2 +-
 .../core/metadata/metadata.service.spec.ts    |  4 +--
 src/app/core/metadata/metadata.service.ts     |  2 +-
 .../resource-policy.service.ts                |  2 +-
 .../vocabularies/vocabulary.service.spec.ts   |  4 +--
 .../vocabularies/vocabulary.service.ts        |  2 +-
 ...top-level-community-list.component.spec.ts |  2 +-
 .../item-collection-mapper.component.spec.ts  |  2 +-
 .../item-collection-mapper.component.ts       |  2 +-
 .../edit-relationship-list.component.spec.ts  |  2 +-
 .../browse-by/browse-by.component.spec.ts     |  2 +-
 .../mocks/href-only-data.service.mock.ts      |  4 +--
 .../collection-select.component.spec.ts       |  2 +-
 .../item-select/item-select.component.spec.ts |  2 +-
 src/app/shared/rss-feed/rss.component.spec.ts |  2 +-
 49 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
index 4957958658..a96c238f93 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
@@ -177,7 +177,7 @@ describe('EPersonFormComponent', () => {
 
     });
     groupsDataService = jasmine.createSpyObj('groupsDataService', {
-      findAllByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+      findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
       getGroupRegistryRouterLink: ''
     });
 
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index 05fc3189d0..7d607647e3 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -265,7 +265,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
       this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
       this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
         if (eperson != null) {
-          this.groups = this.groupsDataService.findAllByHref(eperson._links.groups.href, {
+          this.groups = this.groupsDataService.findListByHref(eperson._links.groups.href, {
             currentPage: 1,
             elementsPerPage: this.config.pageSize
           });
@@ -297,7 +297,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
         }),
         switchMap(([eperson, findListOptions]) => {
           if (eperson != null) {
-            return this.groupsDataService.findAllByHref(eperson._links.groups.href, findListOptions, true, true, followLink('object'));
+            return this.groupsDataService.findListByHref(eperson._links.groups.href, findListOptions, true, true, followLink('object'));
           }
           return observableOf(undefined);
         })
@@ -554,7 +554,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    */
   private updateGroups(options) {
     this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
-      this.groups = this.groupsDataService.findAllByHref(eperson._links.groups.href, options);
+      this.groups = this.groupsDataService.findListByHref(eperson._links.groups.href, options);
     }));
   }
 }
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
index 0b19b17100..8d0ddf0a85 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
@@ -53,7 +53,7 @@ describe('MembersListComponent', () => {
       activeGroup: activeGroup,
       epersonMembers: epersonMembers,
       subgroupMembers: subgroupMembers,
-      findAllByHref(href: string): Observable<RemoteData<PaginatedList<EPerson>>> {
+      findListByHref(href: string): Observable<RemoteData<PaginatedList<EPerson>>> {
         return createSuccessfulRemoteDataObject$(buildPaginatedList<EPerson>(new PageInfo(), groupsDataServiceStub.getEPersonMembers()));
       },
       searchByScope(scope: string, query: string): Observable<RemoteData<PaginatedList<EPerson>>> {
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..eb6a38b5cf 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
@@ -129,7 +129,7 @@ export class MembersListComponent implements OnInit, OnDestroy {
     this.subs.set(SubKey.MembersDTO,
       this.paginationService.getCurrentPagination(this.config.id, this.config).pipe(
         switchMap((currentPagination) => {
-          return this.ePersonDataService.findAllByHref(this.groupBeingEdited._links.epersons.href, {
+          return this.ePersonDataService.findListByHref(this.groupBeingEdited._links.epersons.href, {
               currentPage: currentPagination.currentPage,
               elementsPerPage: currentPagination.pageSize
             }
@@ -171,7 +171,7 @@ export class MembersListComponent implements OnInit, OnDestroy {
     return this.groupDataService.getActiveGroup().pipe(take(1),
       mergeMap((group: Group) => {
         if (group != null) {
-          return this.ePersonDataService.findAllByHref(group._links.epersons.href, {
+          return this.ePersonDataService.findListByHref(group._links.epersons.href, {
             currentPage: 1,
             elementsPerPage: 9999
           }, false)
diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
index bee5126e09..1ca6c88c5f 100644
--- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
+++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
@@ -65,7 +65,7 @@ describe('SubgroupsListComponent', () => {
       getSubgroups(): Group {
         return this.activeGroup;
       },
-      findAllByHref(href: string): Observable<RemoteData<PaginatedList<Group>>> {
+      findListByHref(href: string): Observable<RemoteData<PaginatedList<Group>>> {
         return this.subgroups$.pipe(
           map((currentGroups: Group[]) => {
             return createSuccessfulRemoteDataObject(buildPaginatedList<Group>(new PageInfo(), currentGroups));
diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
index 9930dd61ea..5f1700e07d 100644
--- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
@@ -115,7 +115,7 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
     this.subs.set(
       SubKey.Members,
       this.paginationService.getCurrentPagination(this.config.id, this.config).pipe(
-        switchMap((config) => this.groupDataService.findAllByHref(this.groupBeingEdited._links.subgroups.href, {
+        switchMap((config) => this.groupDataService.findListByHref(this.groupBeingEdited._links.subgroups.href, {
             currentPage: config.currentPage,
             elementsPerPage: config.pageSize
           },
@@ -139,7 +139,7 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
           if (activeGroup.uuid === possibleSubgroup.uuid) {
             return observableOf(false);
           } else {
-            return this.groupDataService.findAllByHref(activeGroup._links.subgroups.href, {
+            return this.groupDataService.findListByHref(activeGroup._links.subgroups.href, {
               currentPage: 1,
               elementsPerPage: 9999
             })
diff --git a/src/app/access-control/group-registry/groups-registry.component.spec.ts b/src/app/access-control/group-registry/groups-registry.component.spec.ts
index 99586ee5f0..239939e70d 100644
--- a/src/app/access-control/group-registry/groups-registry.component.spec.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.spec.ts
@@ -69,7 +69,7 @@ describe('GroupRegistryComponent', () => {
     mockGroups = [GroupMock, GroupMock2];
     mockEPeople = [EPersonMock, EPersonMock2];
     ePersonDataServiceStub = {
-      findAllByHref(href: string): Observable<RemoteData<PaginatedList<EPerson>>> {
+      findListByHref(href: string): Observable<RemoteData<PaginatedList<EPerson>>> {
         switch (href) {
           case 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid2/epersons':
             return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({
@@ -97,7 +97,7 @@ describe('GroupRegistryComponent', () => {
     };
     groupsDataServiceStub = {
       allGroups: mockGroups,
-      findAllByHref(href: string): Observable<RemoteData<PaginatedList<Group>>> {
+      findListByHref(href: string): Observable<RemoteData<PaginatedList<Group>>> {
         switch (href) {
           case 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid2/groups':
             return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({
diff --git a/src/app/access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts
index 1770762a34..6ba501fcc4 100644
--- a/src/app/access-control/group-registry/groups-registry.component.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.ts
@@ -213,7 +213,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
    * @param group
    */
   getMembers(group: Group): Observable<RemoteData<PaginatedList<EPerson>>> {
-    return this.ePersonDataService.findAllByHref(group._links.epersons.href).pipe(getFirstSucceededRemoteData());
+    return this.ePersonDataService.findListByHref(group._links.epersons.href).pipe(getFirstSucceededRemoteData());
   }
 
   /**
@@ -221,7 +221,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
    * @param group
    */
   getSubgroups(group: Group): Observable<RemoteData<PaginatedList<Group>>> {
-    return this.groupService.findAllByHref(group._links.subgroups.href).pipe(getFirstSucceededRemoteData());
+    return this.groupService.findListByHref(group._links.subgroups.href).pipe(getFirstSucceededRemoteData());
   }
 
   /**
diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
index 142604c9b2..8304b01daa 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
@@ -94,7 +94,7 @@ describe('CollectionItemMapperComponent', () => {
   const emptyList = createSuccessfulRemoteDataObject(createPaginatedList([]));
   const itemDataServiceStub = {
     mapToCollection: () => createSuccessfulRemoteDataObject$({}),
-    findAllByHref: () => observableOf(emptyList)
+    findListByHref: () => observableOf(emptyList),
   };
   const activatedRouteStub = {
     parent: {
@@ -152,7 +152,7 @@ describe('CollectionItemMapperComponent', () => {
   });
 
   const groupDataService = jasmine.createSpyObj('groupsDataService', {
-    findAllByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     getGroupRegistryRouterLink: '',
     getUUIDFromString: '',
   });
diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
index 3172616efc..7911be8e64 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -143,7 +143,7 @@ export class CollectionItemMapperComponent implements OnInit {
         if (shouldUpdate === true) {
           this.shouldUpdate$.next(false);
         }
-        return this.itemDataService.findAllByHref(collectionRD.payload._links.mappedItems.href, Object.assign(options, {
+        return this.itemDataService.findListByHref(collectionRD.payload._links.mappedItems.href, Object.assign(options, {
           sort: this.defaultSortOptions
         }),!shouldUpdate, false, followLink('owningCollection')).pipe(
           getAllSucceededRemoteData()
diff --git a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts
index c0ce5369ff..60b1c78f8c 100644
--- a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts
+++ b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts
@@ -135,7 +135,7 @@ describe('CommunityPageSubCollectionList Component', () => {
   });
 
   const groupDataService = jasmine.createSpyObj('groupsDataService', {
-    findAllByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     getGroupRegistryRouterLink: '',
     getUUIDFromString: '',
   });
diff --git a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.spec.ts b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.spec.ts
index 3392ada994..c3db1bd17d 100644
--- a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.spec.ts
+++ b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.spec.ts
@@ -131,7 +131,7 @@ describe('CommunityPageSubCommunityListComponent Component', () => {
   });
 
   const groupDataService = jasmine.createSpyObj('groupsDataService', {
-    findAllByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     getGroupRegistryRouterLink: '',
     getUUIDFromString: '',
   });
diff --git a/src/app/core/browse/browse.service.spec.ts b/src/app/core/browse/browse.service.spec.ts
index db802dcbdd..46ac8c44f4 100644
--- a/src/app/core/browse/browse.service.spec.ts
+++ b/src/app/core/browse/browse.service.spec.ts
@@ -139,13 +139,13 @@ describe('BrowseService', () => {
     });
 
     describe('when getBrowseEntriesFor is called with a valid browse definition id', () => {
-      it('should call hrefOnlyDataService.findAllByHref with the expected href', () => {
+      it('should call hrefOnlyDataService.findListByHref with the expected href', () => {
         const expected = browseDefinitions[1]._links.entries.href;
 
         scheduler.schedule(() => service.getBrowseEntriesFor(new BrowseEntrySearchOptions(browseDefinitions[1].id)).subscribe());
         scheduler.flush();
 
-        expect(getFirstUsedArgumentOfSpyMethod(hrefOnlyDataService.findAllByHref)).toBeObservable(cold('(a|)', {
+        expect(getFirstUsedArgumentOfSpyMethod(hrefOnlyDataService.findListByHref)).toBeObservable(cold('(a|)', {
           a: expected
         }));
       });
@@ -153,20 +153,20 @@ describe('BrowseService', () => {
     });
 
     describe('when findList is called with a valid browse definition id', () => {
-      it('should call hrefOnlyDataService.findAllByHref with the expected href', () => {
+      it('should call hrefOnlyDataService.findListByHref with the expected href', () => {
         const expected = browseDefinitions[1]._links.items.href + '?filterValue=' + encodeURIComponent(mockAuthorName);
 
         scheduler.schedule(() => service.getBrowseItemsFor(mockAuthorName, undefined, new BrowseEntrySearchOptions(browseDefinitions[1].id)).subscribe());
         scheduler.flush();
 
-        expect(getFirstUsedArgumentOfSpyMethod(hrefOnlyDataService.findAllByHref)).toBeObservable(cold('(a|)', {
+        expect(getFirstUsedArgumentOfSpyMethod(hrefOnlyDataService.findListByHref)).toBeObservable(cold('(a|)', {
           a: expected
         }));
       });
 
     });
     describe('when getBrowseItemsFor is called with a valid filter value and authority key', () => {
-      it('should call hrefOnlyDataService.findAllByHref with the expected href', () => {
+      it('should call hrefOnlyDataService.findListByHref with the expected href', () => {
         const expected = browseDefinitions[1]._links.items.href +
           '?filterValue=' + encodeURIComponent(mockAuthorName) +
           '&filterAuthority=' + encodeURIComponent(mockAuthorityKey);
@@ -174,7 +174,7 @@ describe('BrowseService', () => {
         scheduler.schedule(() => service.getBrowseItemsFor(mockAuthorName, mockAuthorityKey, new BrowseEntrySearchOptions(browseDefinitions[1].id)).subscribe());
         scheduler.flush();
 
-        expect(getFirstUsedArgumentOfSpyMethod(hrefOnlyDataService.findAllByHref)).toBeObservable(cold('(a|)', {
+        expect(getFirstUsedArgumentOfSpyMethod(hrefOnlyDataService.findListByHref)).toBeObservable(cold('(a|)', {
           a: expected
         }));
       });
@@ -267,11 +267,11 @@ describe('BrowseService', () => {
     describe('when getFirstItemFor is called with a valid browse definition id', () => {
       const expectedURL = browseDefinitions[1]._links.items.href + '?page=0&size=1';
 
-      it('should call hrefOnlyDataService.findAllByHref with the expected href', () => {
+      it('should call hrefOnlyDataService.findListByHref with the expected href', () => {
         scheduler.schedule(() => service.getFirstItemFor(browseDefinitions[1].id).subscribe());
         scheduler.flush();
 
-        expect(getFirstUsedArgumentOfSpyMethod(hrefOnlyDataService.findAllByHref)).toBeObservable(cold('(a|)', {
+        expect(getFirstUsedArgumentOfSpyMethod(hrefOnlyDataService.findListByHref)).toBeObservable(cold('(a|)', {
           a: expectedURL
         }));
       });
diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
index 05e625d6c1..8fd11ad048 100644
--- a/src/app/core/browse/browse.service.ts
+++ b/src/app/core/browse/browse.service.ts
@@ -96,7 +96,7 @@ export class BrowseService {
         return href;
       })
     );
-    return this.hrefOnlyDataService.findAllByHref<BrowseEntry>(href$);
+    return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$);
   }
 
   /**
@@ -141,7 +141,7 @@ export class BrowseService {
         return href;
       }),
     );
-    return this.hrefOnlyDataService.findAllByHref<Item>(href$);
+    return this.hrefOnlyDataService.findListByHref<Item>(href$);
   }
 
   /**
@@ -172,7 +172,7 @@ export class BrowseService {
       })
     );
 
-    return this.hrefOnlyDataService.findAllByHref<Item>(href$).pipe(
+    return this.hrefOnlyDataService.findListByHref<Item>(href$).pipe(
       getFirstSucceededRemoteData(),
       getFirstOccurrence()
     );
@@ -184,7 +184,7 @@ export class BrowseService {
    * @param items
    */
   getPrevBrowseItems(items: RemoteData<PaginatedList<Item>>): Observable<RemoteData<PaginatedList<Item>>> {
-    return this.hrefOnlyDataService.findAllByHref<Item>(items.payload.prev);
+    return this.hrefOnlyDataService.findListByHref<Item>(items.payload.prev);
   }
 
   /**
@@ -192,7 +192,7 @@ export class BrowseService {
    * @param items
    */
   getNextBrowseItems(items: RemoteData<PaginatedList<Item>>): Observable<RemoteData<PaginatedList<Item>>> {
-    return this.hrefOnlyDataService.findAllByHref<Item>(items.payload.next);
+    return this.hrefOnlyDataService.findListByHref<Item>(items.payload.next);
   }
 
   /**
@@ -200,7 +200,7 @@ export class BrowseService {
    * @param entries
    */
   getPrevBrowseEntries(entries: RemoteData<PaginatedList<BrowseEntry>>): Observable<RemoteData<PaginatedList<BrowseEntry>>> {
-    return this.hrefOnlyDataService.findAllByHref<BrowseEntry>(entries.payload.prev);
+    return this.hrefOnlyDataService.findListByHref<BrowseEntry>(entries.payload.prev);
   }
 
   /**
@@ -208,7 +208,7 @@ export class BrowseService {
    * @param entries
    */
   getNextBrowseEntries(entries: RemoteData<PaginatedList<BrowseEntry>>): Observable<RemoteData<PaginatedList<BrowseEntry>>> {
-    return this.hrefOnlyDataService.findAllByHref<BrowseEntry>(entries.payload.next);
+    return this.hrefOnlyDataService.findListByHref<BrowseEntry>(entries.payload.next);
   }
 
   /**
diff --git a/src/app/core/cache/builders/link.service.spec.ts b/src/app/core/cache/builders/link.service.spec.ts
index ee44cfccb4..0ddfe05870 100644
--- a/src/app/core/cache/builders/link.service.spec.ts
+++ b/src/app/core/cache/builders/link.service.spec.ts
@@ -33,8 +33,8 @@ class TestModel implements HALResource {
 
 @Injectable()
 class TestDataService {
-  findAllByHref(href: string, findListOptions: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<any>[]) {
-    return 'findAllByHref';
+  findListByHref(href: string, findListOptions: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<any>[]) {
+    return 'findListByHref';
   }
 
   findByHref(href: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<any>[]) {
@@ -65,7 +65,7 @@ describe('LinkService', () => {
       }
     });
     testDataService = new TestDataService();
-    spyOn(testDataService, 'findAllByHref').and.callThrough();
+    spyOn(testDataService, 'findListByHref').and.callThrough();
     spyOn(testDataService, 'findByHref').and.callThrough();
     TestBed.configureTestingModule({
       providers: [LinkService, {
@@ -119,8 +119,8 @@ describe('LinkService', () => {
         });
         service.resolveLink(testModel, followLink('predecessor', { findListOptions: { some: 'options ' } as any }, followLink('successor')));
       });
-      it('should call dataservice.findAllByHref with the correct href, findListOptions,  and nested links', () => {
-        expect(testDataService.findAllByHref).toHaveBeenCalledWith(testModel._links.predecessor.href, { some: 'options ' } as any, true, true, followLink('successor'));
+      it('should call dataservice.findListByHref with the correct href, findListOptions,  and nested links', () => {
+        expect(testDataService.findListByHref).toHaveBeenCalledWith(testModel._links.predecessor.href, { some: 'options ' } as any, true, true, followLink('successor'));
       });
     });
     describe('either way', () => {
diff --git a/src/app/core/cache/builders/link.service.ts b/src/app/core/cache/builders/link.service.ts
index a02f9841ad..b7af54abf7 100644
--- a/src/app/core/cache/builders/link.service.ts
+++ b/src/app/core/cache/builders/link.service.ts
@@ -74,7 +74,7 @@ export class LinkService {
 
         try {
           if (matchingLinkDef.isList) {
-            return service.findAllByHref(href, linkToFollow.findListOptions, linkToFollow.useCachedVersionIfAvailable, linkToFollow.reRequestOnStale, ...linkToFollow.linksToFollow);
+            return service.findListByHref(href, linkToFollow.findListOptions, linkToFollow.useCachedVersionIfAvailable, linkToFollow.reRequestOnStale, ...linkToFollow.linksToFollow);
           } else {
             return service.findByHref(href, linkToFollow.useCachedVersionIfAvailable, linkToFollow.reRequestOnStale, ...linkToFollow.linksToFollow);
           }
diff --git a/src/app/core/data/base/base-data.service.spec.ts b/src/app/core/data/base/base-data.service.spec.ts
index 973b9d5095..cd8b8c3e32 100644
--- a/src/app/core/data/base/base-data.service.spec.ts
+++ b/src/app/core/data/base/base-data.service.spec.ts
@@ -370,7 +370,7 @@ describe('BaseDataService', () => {
 
   });
 
-  describe(`findAllByHref`, () => {
+  describe(`findListByHref`, () => {
     let findListOptions;
     beforeEach(() => {
       findListOptions = { currentPage: 5 };
@@ -383,7 +383,7 @@ describe('BaseDataService', () => {
         spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
         spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
 
-        service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow);
+        service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow);
         expect(service.buildHrefFromFindOptions).toHaveBeenCalledWith(selfLink, findListOptions, [], ...linksToFollow);
       });
     });
@@ -394,11 +394,11 @@ describe('BaseDataService', () => {
         spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
         spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
 
-        service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow);
+        service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow);
         expect((service as any).createAndSendGetRequest).toHaveBeenCalledWith(jasmine.anything(), true);
         expectObservable(rdbService.buildList.calls.argsFor(0)[0]).toBe('(a|)', { a: 'bingo!' });
 
-        service.findAllByHref(selfLink, findListOptions, false, true, ...linksToFollow);
+        service.findListByHref(selfLink, findListOptions, false, true, ...linksToFollow);
         expect((service as any).createAndSendGetRequest).toHaveBeenCalledWith(jasmine.anything(), false);
         expectObservable(rdbService.buildList.calls.argsFor(1)[0]).toBe('(a|)', { a: 'bingo!' });
       });
@@ -410,29 +410,29 @@ describe('BaseDataService', () => {
         spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
         spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
 
-        service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow);
+        service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow);
         expect(rdbService.buildList).toHaveBeenCalledWith(jasmine.anything() as any, ...linksToFollow);
         expectObservable(rdbService.buildList.calls.argsFor(0)[0]).toBe('(a|)', { a: 'bingo!' });
       });
     });
 
-    it(`should call reRequestStaleRemoteData with reRequestOnStale and the exact same findAllByHref call as a callback`, () => {
+    it(`should call reRequestStaleRemoteData with reRequestOnStale and the exact same findListByHref call as a callback`, () => {
       testScheduler.run(({ cold, expectObservable }) => {
         spyOn(service, 'buildHrefFromFindOptions').and.returnValue('bingo!');
         spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.SuccessStale }));
         spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.SuccessStale }));
 
-        service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow);
+        service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow);
         expect((service as any).reRequestStaleRemoteData.calls.argsFor(0)[0]).toBeTrue();
-        spyOn(service, 'findAllByHref').and.returnValue(cold('a', { a: remoteDataMocks.SuccessStale }));
+        spyOn(service, 'findListByHref').and.returnValue(cold('a', { a: remoteDataMocks.SuccessStale }));
         // prove that the spy we just added hasn't been called yet
-        expect(service.findAllByHref).not.toHaveBeenCalled();
+        expect(service.findListByHref).not.toHaveBeenCalled();
         // call the callback passed to reRequestStaleRemoteData
         (service as any).reRequestStaleRemoteData.calls.argsFor(0)[1]();
-        // verify that findAllByHref _has_ been called now, with the same params as the original call
-        expect(service.findAllByHref).toHaveBeenCalledWith(jasmine.anything(), findListOptions, true, true, ...linksToFollow);
+        // verify that findListByHref _has_ been called now, with the same params as the original call
+        expect(service.findListByHref).toHaveBeenCalledWith(jasmine.anything(), findListOptions, true, true, ...linksToFollow);
         // ... except for selflink, which will have been turned in to an observable.
-        expectObservable((service.findAllByHref as jasmine.Spy).calls.argsFor(0)[0]).toBe('(a|)', { a: selfLink });
+        expectObservable((service.findListByHref as jasmine.Spy).calls.argsFor(0)[0]).toBe('(a|)', { a: selfLink });
       });
     });
 
@@ -446,7 +446,7 @@ describe('BaseDataService', () => {
           a: 'bingo!',
         };
 
-        expectObservable(service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow)).toBe(expected, values);
+        expectObservable(service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow)).toBe(expected, values);
       });
     });
 
@@ -474,7 +474,7 @@ describe('BaseDataService', () => {
             e: remoteDataMocks.SuccessStale,
           };
 
-          expectObservable(service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow)).toBe(expected, values);
+          expectObservable(service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow)).toBe(expected, values);
         });
       });
 
@@ -495,7 +495,7 @@ describe('BaseDataService', () => {
             e: remoteDataMocks.SuccessStale,
           };
 
-          expectObservable(service.findAllByHref(selfLink, findListOptions, true, true, ...linksToFollow)).toBe(expected, values);
+          expectObservable(service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow)).toBe(expected, values);
         });
       });
 
@@ -525,7 +525,7 @@ describe('BaseDataService', () => {
             e: remoteDataMocks.SuccessStale,
           };
 
-          expectObservable(service.findAllByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
+          expectObservable(service.findListByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
         });
       });
 
@@ -546,7 +546,7 @@ describe('BaseDataService', () => {
             e: remoteDataMocks.SuccessStale,
           };
 
-          expectObservable(service.findAllByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
+          expectObservable(service.findListByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
         });
       });
 
diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index faf8a4bead..d8caa6c1c8 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -287,7 +287,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
    * @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>, options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>> {
+  findListByHref(href$: string | Observable<string>, options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>> {
     if (typeof href$ === 'string') {
       href$ = observableOf(href$);
     }
@@ -307,7 +307,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       // cached completed object
       skipWhile((rd: RemoteData<PaginatedList<T>>) => useCachedVersionIfAvailable ? rd.isStale : rd.hasCompleted),
       this.reRequestStaleRemoteData(reRequestOnStale, () =>
-        this.findAllByHref(href$, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
+        this.findListByHref(href$, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
   }
 
diff --git a/src/app/core/data/base/find-all-data.ts b/src/app/core/data/base/find-all-data.ts
index f3666b75ee..c2330af243 100644
--- a/src/app/core/data/base/find-all-data.ts
+++ b/src/app/core/data/base/find-all-data.ts
@@ -85,7 +85,7 @@ export class FindAllDataImpl<T extends CacheableObject> extends BaseDataService<
    *    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);
+    return this.findListByHref(this.getFindAllHref(options), options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
   /**
diff --git a/src/app/core/data/base/hal-data-service.interface.ts b/src/app/core/data/base/hal-data-service.interface.ts
index af39edd7cf..6959399760 100644
--- a/src/app/core/data/base/hal-data-service.interface.ts
+++ b/src/app/core/data/base/hal-data-service.interface.ts
@@ -37,5 +37,5 @@ export interface HALDataService<T extends HALResource> {
    * @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?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>>;
+  findListByHref(href$: string | Observable<string>, findListOptions?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>>;
 }
diff --git a/src/app/core/data/base/search-data.ts b/src/app/core/data/base/search-data.ts
index 226db8fe0d..12cae77c3a 100644
--- a/src/app/core/data/base/search-data.ts
+++ b/src/app/core/data/base/search-data.ts
@@ -110,7 +110,7 @@ export class SearchDataImpl<T extends CacheableObject> extends BaseDataService<T
   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);
+    return this.findListByHref(hrefObs, undefined, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
   /**
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index 6952f50214..0e0c939d9e 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -76,7 +76,7 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
    *                                    {@link HALLink}s should be automatically resolved
    */
   findAllByBundle(bundle: Bundle, options?: FindListOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Bitstream>[]): Observable<RemoteData<PaginatedList<Bitstream>>> {
-    return this.findAllByHref(bundle._links.bitstreams.href, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+    return this.findListByHref(bundle._links.bitstreams.href, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
   /**
diff --git a/src/app/core/data/bundle-data.service.spec.ts b/src/app/core/data/bundle-data.service.spec.ts
index 80bf7c281c..2f047a1054 100644
--- a/src/app/core/data/bundle-data.service.spec.ts
+++ b/src/app/core/data/bundle-data.service.spec.ts
@@ -73,12 +73,12 @@ describe('BundleDataService', () => {
 
   describe('findAllByItem', () => {
     beforeEach(() => {
-      spyOn(service, 'findAllByHref');
+      spyOn(service, 'findListByHref');
       service.findAllByItem(item);
     });
 
-    it('should call findAllByHref with the item\'s bundles link', () => {
-      expect(service.findAllByHref).toHaveBeenCalledWith(bundleLink, undefined, true, true);
+    it('should call findListByHref with the item\'s bundles link', () => {
+      expect(service.findListByHref).toHaveBeenCalledWith(bundleLink, undefined, true, true);
     });
   });
 
diff --git a/src/app/core/data/bundle-data.service.ts b/src/app/core/data/bundle-data.service.ts
index 77df37c510..e85c0c2bee 100644
--- a/src/app/core/data/bundle-data.service.ts
+++ b/src/app/core/data/bundle-data.service.ts
@@ -61,7 +61,7 @@ export class BundleDataService extends IdentifiableDataService<Bundle> implement
    *                                    {@link HALLink}s should be automatically resolved
    */
   findAllByItem(item: Item, options?: FindListOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Bundle>[]): Observable<RemoteData<PaginatedList<Bundle>>> {
-    return this.findAllByHref(item._links.bundles.href, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+    return this.findListByHref(item._links.bundles.href, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
   /**
diff --git a/src/app/core/data/collection-data.service.ts b/src/app/core/data/collection-data.service.ts
index 36791520a9..405b35c1f9 100644
--- a/src/app/core/data/collection-data.service.ts
+++ b/src/app/core/data/collection-data.service.ts
@@ -280,7 +280,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
    * @param findListOptions Pagination and search options.
    */
   findMappedCollectionsFor(item: Item, findListOptions?: FindListOptions): Observable<RemoteData<PaginatedList<Collection>>> {
-    return this.findAllByHref(item._links.mappedCollections.href, findListOptions);
+    return this.findListByHref(item._links.mappedCollections.href, findListOptions);
   }
 
 
diff --git a/src/app/core/data/comcol-data.service.ts b/src/app/core/data/comcol-data.service.ts
index 1b1ac3b27b..6392f389b6 100644
--- a/src/app/core/data/comcol-data.service.ts
+++ b/src/app/core/data/comcol-data.service.ts
@@ -98,7 +98,7 @@ export abstract class ComColDataService<T extends Community | Collection> extend
     const href$ = this.getFindByParentHref(parentUUID).pipe(
       map((href: string) => this.buildHrefFromFindOptions(href, options))
     );
-    return this.findAllByHref(href$, options, true, true, ...linksToFollow);
+    return this.findListByHref(href$, options, true, true, ...linksToFollow);
   }
 
   /**
diff --git a/src/app/core/data/community-data.service.ts b/src/app/core/data/community-data.service.ts
index e40ad06ddb..8623d414b2 100644
--- a/src/app/core/data/community-data.service.ts
+++ b/src/app/core/data/community-data.service.ts
@@ -42,7 +42,7 @@ export class CommunityDataService extends ComColDataService<Community> {
 
   findTop(options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<Community>[]): Observable<RemoteData<PaginatedList<Community>>> {
     const hrefObs = this.getFindAllHref(options, this.topLinkPath);
-    return this.findAllByHref(hrefObs, undefined, true, true, ...linksToFollow);
+    return this.findListByHref(hrefObs, undefined, true, true, ...linksToFollow);
   }
 
   protected getFindByParentHref(parentUUID: string): Observable<string> {
diff --git a/src/app/core/data/entity-type.service.ts b/src/app/core/data/entity-type.service.ts
index 0acb4adb03..393c0414d5 100644
--- a/src/app/core/data/entity-type.service.ts
+++ b/src/app/core/data/entity-type.service.ts
@@ -145,7 +145,7 @@ export class EntityTypeService extends BaseDataService<ItemType> implements Find
    */
   getEntityTypeRelationships(entityTypeId: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<RelationshipType>[]): Observable<RemoteData<PaginatedList<RelationshipType>>> {
     const href$ = this.getRelationshipTypesEndpoint(entityTypeId);
-    return this.relationshipTypeService.findAllByHref(href$, undefined, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+    return this.relationshipTypeService.findListByHref(href$, undefined, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
   /**
diff --git a/src/app/core/data/external-source.service.ts b/src/app/core/data/external-source.service.ts
index 434b563191..e273bedb00 100644
--- a/src/app/core/data/external-source.service.ts
+++ b/src/app/core/data/external-source.service.ts
@@ -74,7 +74,7 @@ export class ExternalSourceService extends IdentifiableDataService<ExternalSourc
     );
 
     // TODO create a dedicated ExternalSourceEntryDataService and move this entire method to it. Then the "as any"s won't be necessary
-    return this.findAllByHref(href$, undefined, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow as any) as any;
+    return this.findListByHref(href$, undefined, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow as any) as any;
   }
 
   /**
diff --git a/src/app/core/data/href-only-data.service.spec.ts b/src/app/core/data/href-only-data.service.spec.ts
index ed8c91399d..bf7d2890ea 100644
--- a/src/app/core/data/href-only-data.service.spec.ts
+++ b/src/app/core/data/href-only-data.service.spec.ts
@@ -48,33 +48,33 @@ describe(`HrefOnlyDataService`, () => {
       });
     });
 
-    describe(`findAllByHref`, () => {
+    describe(`findListByHref`, () => {
       beforeEach(() => {
-        spy = spyOn((service as any).dataService, 'findAllByHref').and.returnValue(createSuccessfulRemoteDataObject$(null));
+        spy = spyOn((service as any).dataService, 'findListByHref').and.returnValue(createSuccessfulRemoteDataObject$(null));
       });
 
-      it(`should delegate to findAllByHref on the internal DataService`, () => {
-        service.findAllByHref(href, findListOptions, false, false, ...followLinks);
+      it(`should delegate to findListByHref on the internal DataService`, () => {
+        service.findListByHref(href, findListOptions, false, false, ...followLinks);
         expect(spy).toHaveBeenCalledWith(href, findListOptions, false, false, ...followLinks);
       });
 
       describe(`when findListOptions is omitted`, () => {
-        it(`should call findAllByHref on the internal DataService with findListOptions = {}`, () => {
-            service.findAllByHref(href);
+        it(`should call findListByHref on the internal DataService with findListOptions = {}`, () => {
+            service.findListByHref(href);
             expect(spy).toHaveBeenCalledWith(jasmine.anything(), {}, jasmine.anything(), jasmine.anything());
         });
       });
 
       describe(`when useCachedVersionIfAvailable is omitted`, () => {
-        it(`should call findAllByHref on the internal DataService with useCachedVersionIfAvailable = true`, () => {
-            service.findAllByHref(href);
+        it(`should call findListByHref on the internal DataService with useCachedVersionIfAvailable = true`, () => {
+            service.findListByHref(href);
             expect(spy).toHaveBeenCalledWith(jasmine.anything(), jasmine.anything(), true, jasmine.anything());
         });
       });
 
       describe(`when reRequestOnStale is omitted`, () => {
-        it(`should call findAllByHref on the internal DataService with reRequestOnStale = true`, () => {
-            service.findAllByHref(href);
+        it(`should call findListByHref on the internal DataService with reRequestOnStale = true`, () => {
+            service.findListByHref(href);
             expect(spy).toHaveBeenCalledWith(jasmine.anything(), jasmine.anything(), jasmine.anything(), true);
         });
       });
diff --git a/src/app/core/data/href-only-data.service.ts b/src/app/core/data/href-only-data.service.ts
index b234d5d85a..0a765de101 100644
--- a/src/app/core/data/href-only-data.service.ts
+++ b/src/app/core/data/href-only-data.service.ts
@@ -27,8 +27,8 @@ import { dataService } from './base/data-service.decorator';
  * Additionally, this service may be used to retrieve objects by `href` regardless of their type
  * For example
  * ```
- * const items$: Observable<RemoteData<PaginatedList<Item>>> = hrefOnlyDataService.findAllByHref<Item>(href);
- * const sites$: Observable<RemoteData<PaginatedList<Site>>> = hrefOnlyDataService.findAllByHref<Site>(href);
+ * const items$: Observable<RemoteData<PaginatedList<Item>>> = hrefOnlyDataService.findListByHref<Item>(href);
+ * const sites$: Observable<RemoteData<PaginatedList<Site>>> = hrefOnlyDataService.findListByHref<Site>(href);
  * ```
  * This means we cannot extend from {@link BaseDataService} directly because the method signatures would not match.
  */
@@ -82,7 +82,7 @@ export class HrefOnlyDataService implements HALDataService<any> {
    * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
    *                                    {@link HALLink}s should be automatically resolved
    */
-  findAllByHref<T extends CacheableObject>(href: string | Observable<string>, findListOptions: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>> {
-    return this.dataService.findAllByHref(href, findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  findListByHref<T extends CacheableObject>(href: string | Observable<string>, findListOptions: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>> {
+    return this.dataService.findListByHref(href, findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 }
diff --git a/src/app/core/data/processes/process-data.service.ts b/src/app/core/data/processes/process-data.service.ts
index 0a276cd7f2..9c484fed2d 100644
--- a/src/app/core/data/processes/process-data.service.ts
+++ b/src/app/core/data/processes/process-data.service.ts
@@ -50,7 +50,7 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
    */
   getFiles(processId: string): Observable<RemoteData<PaginatedList<Bitstream>>> {
     const href$ = this.getFilesEndpoint(processId);
-    return this.bitstreamDataService.findAllByHref(href$);
+    return this.bitstreamDataService.findListByHref(href$);
   }
 
   /**
diff --git a/src/app/core/data/relationship.service.ts b/src/app/core/data/relationship.service.ts
index 50c84912f6..fe64a95e8a 100644
--- a/src/app/core/data/relationship.service.ts
+++ b/src/app/core/data/relationship.service.ts
@@ -196,7 +196,7 @@ export class RelationshipService extends IdentifiableDataService<Relationship> i
    *                        should be automatically resolved
    */
   getItemRelationshipsArray(item: Item, ...linksToFollow: FollowLinkConfig<Relationship>[]): Observable<Relationship[]> {
-    return this.findAllByHref(item._links.relationships.href, undefined, true, false, ...linksToFollow).pipe(
+    return this.findListByHref(item._links.relationships.href, undefined, true, false, ...linksToFollow).pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
       map((rels: PaginatedList<Relationship>) => rels.page),
diff --git a/src/app/core/data/version-history-data.service.spec.ts b/src/app/core/data/version-history-data.service.spec.ts
index 1991c5c193..03bf6c8bcb 100644
--- a/src/app/core/data/version-history-data.service.spec.ts
+++ b/src/app/core/data/version-history-data.service.spec.ts
@@ -106,7 +106,7 @@ describe('VersionHistoryDataService', () => {
     });
     versionService = jasmine.createSpyObj('objectCache', {
       findByHref: jasmine.createSpy('findByHref'),
-      findAllByHref: jasmine.createSpy('findAllByHref'),
+      findListByHref: jasmine.createSpy('findListByHref'),
       getHistoryFromVersion: jasmine.createSpy('getHistoryFromVersion'),
     });
     halService = new HALEndpointServiceStub(url);
@@ -132,8 +132,8 @@ describe('VersionHistoryDataService', () => {
       result = service.getVersions('1');
     });
 
-    it('should call versionService.findAllByHref', () => {
-      expect(versionService.findAllByHref).toHaveBeenCalled();
+    it('should call versionService.findListByHref', () => {
+      expect(versionService.findListByHref).toHaveBeenCalled();
     });
   });
 
@@ -141,8 +141,8 @@ describe('VersionHistoryDataService', () => {
     beforeEach(waitForAsync(() => {
       service.getVersions(versionHistoryId);
     }));
-    it('findAllByHref should have been called', () => {
-      expect(versionService.findAllByHref).toHaveBeenCalled();
+    it('findListByHref should have been called', () => {
+      expect(versionService.findListByHref).toHaveBeenCalled();
     });
   });
 
diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts
index 75bc1a4b14..b331c4f2e4 100644
--- a/src/app/core/data/version-history-data.service.ts
+++ b/src/app/core/data/version-history-data.service.ts
@@ -77,7 +77,7 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
       map((href) => searchOptions ? searchOptions.toRestUrl(href) : href)
     );
 
-    return this.versionDataService.findAllByHref(hrefObs, undefined, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+    return this.versionDataService.findListByHref(hrefObs, undefined, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
   /**
diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index 632816d90b..66d9b9921c 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -52,7 +52,7 @@ describe('MetadataService', () => {
       findRoot: createSuccessfulRemoteDataObject$({ dspaceVersion: 'mock-dspace-version' })
     });
     bitstreamDataService = jasmine.createSpyObj({
-      findAllByHref: createSuccessfulRemoteDataObject$(createPaginatedList([MockBitstream3]))
+      findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([MockBitstream3])),
     });
     bundleDataService = jasmine.createSpyObj({
       findByItemAndName: mockBundleRD$([MockBitstream3])
@@ -361,7 +361,7 @@ describe('MetadataService', () => {
       it('should link to first Bitstream with allowed format', fakeAsync(() => {
         const bitstreams = [MockBitstream3, MockBitstream3, MockBitstream1];
         (bundleDataService.findByItemAndName as jasmine.Spy).and.returnValue(mockBundleRD$(bitstreams));
-        (bitstreamDataService.findAllByHref as jasmine.Spy).and.returnValues(
+        (bitstreamDataService.findListByHref as jasmine.Spy).and.returnValues(
           ...mockBitstreamPages$(bitstreams).map(bp => createSuccessfulRemoteDataObject$(bp)),
         );
 
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 3a438edab0..9d5ee80bba 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -379,7 +379,7 @@ export class MetadataService {
           return EMPTY;
         } else {
           // Otherwise retrieve the next page
-          return this.bitstreamDataService.findAllByHref(
+          return this.bitstreamDataService.findListByHref(
             paginatedList.next,
             undefined,
             true,
diff --git a/src/app/core/resource-policy/resource-policy.service.ts b/src/app/core/resource-policy/resource-policy.service.ts
index ac5236dd4e..f432a3b24e 100644
--- a/src/app/core/resource-policy/resource-policy.service.ts
+++ b/src/app/core/resource-policy/resource-policy.service.ts
@@ -121,7 +121,7 @@ export class ResourcePolicyService extends IdentifiableDataService<ResourcePolic
    * @param findListOptions the {@link FindListOptions} for the request
    */
   getDefaultAccessConditionsFor(collection: Collection, findListOptions?: FindListOptions): Observable<RemoteData<PaginatedList<ResourcePolicy>>> {
-    return this.findAllByHref(collection._links.defaultAccessConditions.href, findListOptions);
+    return this.findListByHref(collection._links.defaultAccessConditions.href, findListOptions);
   }
 
   /**
diff --git a/src/app/core/submission/vocabularies/vocabulary.service.spec.ts b/src/app/core/submission/vocabularies/vocabulary.service.spec.ts
index 7255f029ec..ed379c812a 100644
--- a/src/app/core/submission/vocabularies/vocabulary.service.spec.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.service.spec.ts
@@ -419,7 +419,7 @@ describe('VocabularyService', () => {
       spyOn((service as any).vocabularyEntryDetailDataService, 'findById').and.callThrough();
       spyOn((service as any).vocabularyEntryDetailDataService, 'findAll').and.callThrough();
       spyOn((service as any).vocabularyEntryDetailDataService, 'findByHref').and.callThrough();
-      spyOn((service as any).vocabularyEntryDetailDataService, 'findAllByHref').and.callThrough();
+      spyOn((service as any).vocabularyEntryDetailDataService, 'findListByHref').and.callThrough();
       spyOn((service as any).vocabularyEntryDetailDataService, 'searchBy').and.callThrough();
       spyOn((service as any).vocabularyEntryDetailDataService, 'getSearchByHref').and.returnValue(observableOf(searchRequestURL));
       spyOn((service as any).vocabularyEntryDetailDataService, 'getFindAllHref').and.returnValue(observableOf(entryDetailChildrenRequestURL));
@@ -494,7 +494,7 @@ describe('VocabularyService', () => {
         scheduler.schedule(() => service.getEntryDetailChildren('testValue', hierarchicalVocabulary.id, pageInfo).subscribe());
         scheduler.flush();
 
-        expect((service as any).vocabularyEntryDetailDataService.findAllByHref).toHaveBeenCalledWith(entryDetailChildrenRequestURL, options, true, true);
+        expect((service as any).vocabularyEntryDetailDataService.findListByHref).toHaveBeenCalledWith(entryDetailChildrenRequestURL, options, true, true);
       });
 
       it('should return a RemoteData<PaginatedList<ResourcePolicy>> for the object with the given URL', () => {
diff --git a/src/app/core/submission/vocabularies/vocabulary.service.ts b/src/app/core/submission/vocabularies/vocabulary.service.ts
index deb26c5a2d..d29b19d97b 100644
--- a/src/app/core/submission/vocabularies/vocabulary.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.service.ts
@@ -282,7 +282,7 @@ export class VocabularyService {
       pageInfo.currentPage
     );
     return this.vocabularyEntryDetailDataService.getFindAllHref(options, linkPath).pipe(
-      mergeMap((href) => this.vocabularyEntryDetailDataService.findAllByHref(href, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow))
+      mergeMap((href) => this.vocabularyEntryDetailDataService.findListByHref(href, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
   }
 
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 2561770942..17feaa9bbf 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
@@ -126,7 +126,7 @@ describe('TopLevelCommunityList Component', () => {
   });
 
   const groupDataService = jasmine.createSpyObj('groupsDataService', {
-    findAllByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     getGroupRegistryRouterLink: '',
     getUUIDFromString: '',
   });
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts
index 56fe29d576..f9962643f8 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts
@@ -89,7 +89,7 @@ describe('ItemCollectionMapperComponent', () => {
     /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
   };
   const collectionDataServiceStub = {
-    findAllByHref: () => observableOf(mockCollectionsRD)
+    findListByHref: () => observableOf(mockCollectionsRD),
   };
   const searchServiceStub = Object.assign(new SearchServiceStub(), {
     search: () => observableOf(mockCollectionsRD),
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
index f179ebc325..d94abfaa9f 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
@@ -123,7 +123,7 @@ export class ItemCollectionMapperComponent implements OnInit {
         if (shouldUpdate === true) {
           this.shouldUpdate$.next(false);
         }
-        return this.collectionDataService.findAllByHref(
+        return this.collectionDataService.findListByHref(
           this.itemDataService.getMappedCollectionsEndpoint(item.id),
           undefined,
           !shouldUpdate,
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 2403d8f443..de22b9eab0 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
@@ -187,7 +187,7 @@ describe('EditRelationshipListComponent', () => {
     });
 
     const groupDataService = jasmine.createSpyObj('groupsDataService', {
-      findAllByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+      findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
       getGroupRegistryRouterLink: '',
       getUUIDFromString: '',
     });
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 840c2bad1f..a102c7ae53 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -80,7 +80,7 @@ describe('BrowseByComponent', () => {
   const mockItemsRD$ = createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockItems));
 
   const groupDataService = jasmine.createSpyObj('groupsDataService', {
-    findAllByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     getGroupRegistryRouterLink: '',
     getUUIDFromString: '',
   });
diff --git a/src/app/shared/mocks/href-only-data.service.mock.ts b/src/app/shared/mocks/href-only-data.service.mock.ts
index 6b668c8187..ba7d02ec25 100644
--- a/src/app/shared/mocks/href-only-data.service.mock.ts
+++ b/src/app/shared/mocks/href-only-data.service.mock.ts
@@ -6,10 +6,10 @@ import { createPaginatedList } from '../testing/utils.test';
 
 export function getMockHrefOnlyDataService(
   findByHref$: Observable<RemoteData<any>> = createNoContentRemoteDataObject$(),
-  findAllByHref$: Observable<RemoteData<PaginatedList<any>>> = createSuccessfulRemoteDataObject$(createPaginatedList([]))
+  findListByHref$: Observable<RemoteData<PaginatedList<any>>> = createSuccessfulRemoteDataObject$(createPaginatedList([])),
 ) {
   return jasmine.createSpyObj('hrefOnlyDataService', {
     findByHref: findByHref$,
-    findAllByHref: findAllByHref$,
+    findListByHref: findListByHref$,
   });
 }
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.spec.ts b/src/app/shared/object-select/collection-select/collection-select.component.spec.ts
index 1b89fd32c1..0b1ae83ca7 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.spec.ts
+++ b/src/app/shared/object-select/collection-select/collection-select.component.spec.ts
@@ -55,7 +55,7 @@ describe('CollectionSelectComponent', () => {
   });
 
   const groupDataService = jasmine.createSpyObj('groupsDataService', {
-    findAllByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     getGroupRegistryRouterLink: '',
     getUUIDFromString: '',
   });
diff --git a/src/app/shared/object-select/item-select/item-select.component.spec.ts b/src/app/shared/object-select/item-select/item-select.component.spec.ts
index 49754c40dd..5131060cb2 100644
--- a/src/app/shared/object-select/item-select/item-select.component.spec.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.spec.ts
@@ -81,7 +81,7 @@ describe('ItemSelectComponent', () => {
   });
 
   const groupDataService = jasmine.createSpyObj('groupsDataService', {
-    findAllByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     getGroupRegistryRouterLink: '',
     getUUIDFromString: '',
   });
diff --git a/src/app/shared/rss-feed/rss.component.spec.ts b/src/app/shared/rss-feed/rss.component.spec.ts
index fc19c65e60..fd7f2c5321 100644
--- a/src/app/shared/rss-feed/rss.component.spec.ts
+++ b/src/app/shared/rss-feed/rss.component.spec.ts
@@ -66,7 +66,7 @@ describe('RssComponent', () => {
             sort: new SortOptions('dc.title', SortDirection.ASC),
           }));
         groupDataService = jasmine.createSpyObj('groupsDataService', {
-            findAllByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+            findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
             getGroupRegistryRouterLink: '',
             getUUIDFromString: '',
           });

From fbaab6912162e789adcf363d9fa7f2996cdb2aec Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Wed, 24 Aug 2022 18:56:08 +0200
Subject: [PATCH 14/48] 93803: Ensure data services are called *DataService

---
 .../collection-form.component.ts              |  4 +--
 ...ce.spec.ts => config-data.service.spec.ts} |  6 ++--
 ...nfig.service.ts => config-data.service.ts} |  2 +-
 ...ubmission-accesses-config-data.service.ts} |  9 ++----
 ...> submission-forms-config-data.service.ts} |  5 ++-
 ...submission-uploads-config-data.service.ts} |  4 +--
 src/app/core/core.module.ts                   | 32 +++++++++----------
 ...e.spec.ts => dso-redirect.service.spec.ts} |  0
 src/app/core/data/dso-redirect.service.ts     |  6 ++--
 ...service.ts => entity-type-data.service.ts} |  6 ++--
 ...s => external-source-data.service.spec.ts} |  6 ++--
 ...ice.ts => external-source-data.service.ts} |  2 +-
 .../core/data/lookup-relation.service.spec.ts |  4 +--
 src/app/core/data/lookup-relation.service.ts  |  4 +--
 ...c.ts => relationship-data.service.spec.ts} |  8 ++---
 ...ervice.ts => relationship-data.service.ts} | 11 ++++++-
 ...=> relationship-type-data.service.spec.ts} |  8 ++---
 ...e.ts => relationship-type-data.service.ts} |  2 +-
 src/app/core/orcid/orcid-auth.service.spec.ts |  4 +--
 src/app/core/orcid/orcid-auth.service.ts      |  4 +--
 ...service.ts => orcid-queue-data.service.ts} |  2 +-
 ...> researcher-profile-data.service.spec.ts} |  6 ++--
 ....ts => researcher-profile-data.service.ts} |  2 +-
 ...s => resource-policy-data.service.spec.ts} |  8 ++---
 ...ice.ts => resource-policy-data.service.ts} |  2 +-
 .../statistics/usage-report-data.service.ts   |  2 +-
 .../journal/journal.component.spec.ts         |  4 +--
 ...-list-submission-element.component.spec.ts |  4 +--
 ...esult-list-submission-element.component.ts |  4 +--
 ...-list-submission-element.component.spec.ts |  4 +--
 ...esult-list-submission-element.component.ts |  4 +--
 .../item-delete/item-delete.component.spec.ts | 12 +++----
 .../item-delete/item-delete.component.ts      |  8 ++---
 .../edit-relationship-list.component.spec.ts  |  8 ++---
 .../edit-relationship-list.component.ts       |  8 ++---
 .../item-relationships.component.spec.ts      | 12 +++----
 .../item-relationships.component.ts           | 12 +++----
 .../orcid-queue/orcid-queue.component.spec.ts |  8 ++---
 .../orcid-queue/orcid-queue.component.ts      |  4 +--
 .../orcid-sync-settings.component.spec.ts     |  6 ++--
 .../orcid-sync-settings.component.ts          |  4 +--
 .../publication/publication.component.spec.ts |  4 +--
 .../item-types/shared/item.component.spec.ts  |  8 ++---
 .../untyped-item.component.spec.ts            |  4 +--
 ...data-representation-list.component.spec.ts |  4 +--
 .../metadata-representation-list.component.ts |  4 +--
 .../related-items/related-items-component.ts  |  4 +--
 .../related-items.component.spec.ts           |  6 ++--
 ...ce-new-external-dropdown.component.spec.ts | 10 +++---
 ...-dspace-new-external-dropdown.component.ts |  6 ++--
 ...-new-submission-dropdown.component.spec.ts | 10 +++---
 ...space-new-submission-dropdown.component.ts |  6 ++--
 ...my-dspace-new-submission.component.spec.ts |  4 +--
 ...ile-page-researcher-form.component.spec.ts |  6 ++--
 .../profile-page-researcher-form.component.ts |  4 +--
 ...person-page-claim-button.component.spec.ts |  4 +--
 .../person-page-claim-button.component.ts     |  4 +--
 .../entity-dropdown.component.spec.ts         |  4 +--
 .../entity-dropdown.component.ts              |  6 ++--
 ...c-form-control-container.component.spec.ts |  6 ++--
 ...ynamic-form-control-container.component.ts |  4 +--
 ...ic-lookup-relation-modal.component.spec.ts | 12 +++----
 ...dynamic-lookup-relation-modal.component.ts | 12 +++----
 ...tion-external-source-tab.component.spec.ts |  4 +--
 ...-relation-external-source-tab.component.ts |  4 +--
 .../relationship.effects.spec.ts              |  8 ++---
 .../relationship.effects.ts                   |  8 ++---
 ...okup-relation-search-tab.component.spec.ts |  4 +--
 ...ic-lookup-relation-search-tab.component.ts |  4 +--
 .../mocks/external-source.service.mock.ts     |  4 +--
 .../mocks/mock-resource-policy-service.ts     |  4 +--
 .../section-accesses-config.service.mock.ts   |  6 ++--
 .../mocks/section-upload.service.mock.ts      |  4 +--
 .../resource-policy-create.component.spec.ts  |  4 +--
 .../resource-policy-create.component.ts       |  6 ++--
 .../resource-policy-edit.component.spec.ts    |  4 +--
 .../edit/resource-policy-edit.component.ts    |  6 ++--
 .../resolvers/resource-policy.resolver.ts     |  4 +--
 .../resource-policies.component.spec.ts       |  4 +--
 .../resource-policies.component.ts            |  6 ++--
 ...llection-statistics-page.component.spec.ts |  4 +--
 .../collection-statistics-page.component.ts   |  4 +--
 ...ommunity-statistics-page.component.spec.ts |  4 +--
 .../community-statistics-page.component.ts    |  4 +--
 .../item-statistics-page.component.spec.ts    |  4 +--
 .../item-statistics-page.component.ts         |  4 +--
 .../site-statistics-page.component.spec.ts    |  4 +--
 .../site-statistics-page.component.ts         |  4 +--
 .../statistics-page/statistics-page.module.ts |  4 +--
 .../statistics-page.component.ts              |  4 +--
 ...mport-external-searchbar.component.spec.ts |  4 +--
 ...ion-import-external-searchbar.component.ts |  6 ++--
 ...bmission-import-external.component.spec.ts |  4 +--
 .../submission-import-external.component.ts   |  6 ++--
 .../section-accesses.component.spec.ts        |  6 ++--
 .../accesses/section-accesses.component.ts    |  6 ++--
 .../form/section-form.component.spec.ts       |  6 ++--
 .../sections/form/section-form.component.ts   |  6 ++--
 .../license/section-license.component.spec.ts |  6 ++--
 .../upload/section-upload.component.spec.ts   | 14 ++++----
 .../upload/section-upload.component.ts        | 12 +++----
 src/app/submission/submission.module.ts       |  8 ++---
 102 files changed, 296 insertions(+), 295 deletions(-)
 rename src/app/core/config/{config.service.spec.ts => config-data.service.spec.ts} (94%)
 rename src/app/core/config/{config.service.ts => config-data.service.ts} (92%)
 rename src/app/core/config/{submission-accesses-config.service.ts => submission-accesses-config-data.service.ts} (79%)
 rename src/app/core/config/{submission-forms-config.service.ts => submission-forms-config-data.service.ts} (91%)
 rename src/app/core/config/{submission-uploads-config.service.ts => submission-uploads-config-data.service.ts} (92%)
 rename src/app/core/data/{dso-redirect-data.service.spec.ts => dso-redirect.service.spec.ts} (100%)
 rename src/app/core/data/{entity-type.service.ts => entity-type-data.service.ts} (97%)
 rename src/app/core/data/{external-source.service.spec.ts => external-source-data.service.spec.ts} (90%)
 rename src/app/core/data/{external-source.service.ts => external-source-data.service.ts} (97%)
 rename src/app/core/data/{relationship.service.spec.ts => relationship-data.service.spec.ts} (97%)
 rename src/app/core/data/{relationship.service.ts => relationship-data.service.ts} (97%)
 rename src/app/core/data/{relationship-type.service.spec.ts => relationship-type-data.service.spec.ts} (94%)
 rename src/app/core/data/{relationship-type.service.ts => relationship-type-data.service.ts} (98%)
 rename src/app/core/orcid/{orcid-queue.service.ts => orcid-queue-data.service.ts} (97%)
 rename src/app/core/profile/{researcher-profile.service.spec.ts => researcher-profile-data.service.spec.ts} (98%)
 rename src/app/core/profile/{researcher-profile.service.ts => researcher-profile-data.service.ts} (97%)
 rename src/app/core/resource-policy/{resource-policy.service.spec.ts => resource-policy-data.service.spec.ts} (98%)
 rename src/app/core/resource-policy/{resource-policy.service.ts => resource-policy-data.service.ts} (99%)

diff --git a/src/app/collection-page/collection-form/collection-form.component.ts b/src/app/collection-page/collection-form/collection-form.component.ts
index bb84153835..23698de84e 100644
--- a/src/app/collection-page/collection-form/collection-form.component.ts
+++ b/src/app/collection-page/collection-form/collection-form.component.ts
@@ -16,7 +16,7 @@ import { CommunityDataService } from '../../core/data/community-data.service';
 import { AuthService } from '../../core/auth/auth.service';
 import { RequestService } from '../../core/data/request.service';
 import { ObjectCacheService } from '../../core/cache/object-cache.service';
-import { EntityTypeService } from '../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
 import { ItemType } from '../../core/shared/item-relationships/item-type.model';
 import { MetadataValue } from '../../core/shared/metadata.models';
 import { getFirstSucceededRemoteListPayload } from '../../core/shared/operators';
@@ -61,7 +61,7 @@ export class CollectionFormComponent extends ComColFormComponent<Collection> imp
                      protected dsoService: CommunityDataService,
                      protected requestService: RequestService,
                      protected objectCache: ObjectCacheService,
-                     protected entityTypeService: EntityTypeService) {
+                     protected entityTypeService: EntityTypeDataService) {
     super(formService, translate, notificationsService, authService, requestService, objectCache);
   }
 
diff --git a/src/app/core/config/config.service.spec.ts b/src/app/core/config/config-data.service.spec.ts
similarity index 94%
rename from src/app/core/config/config.service.spec.ts
rename to src/app/core/config/config-data.service.spec.ts
index ead7c7e005..38340d1ad5 100644
--- a/src/app/core/config/config.service.spec.ts
+++ b/src/app/core/config/config-data.service.spec.ts
@@ -1,7 +1,7 @@
 import { getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { ConfigService } from './config.service';
+import { ConfigDataService } from './config-data.service';
 import { RequestService } from '../data/request.service';
 import { GetRequest } from '../data/request.models';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -14,7 +14,7 @@ import { ObjectCacheService } from '../cache/object-cache.service';
 const LINK_NAME = 'test';
 const BROWSE = 'search/findByCollection';
 
-class TestService extends ConfigService {
+class TestService extends ConfigDataService {
   protected linkPath = LINK_NAME;
   protected browseEndpoint = BROWSE;
 
@@ -28,7 +28,7 @@ class TestService extends ConfigService {
   }
 }
 
-describe('ConfigService', () => {
+describe('ConfigDataService', () => {
   let scheduler: TestScheduler;
   let service: TestService;
   let requestService: RequestService;
diff --git a/src/app/core/config/config.service.ts b/src/app/core/config/config-data.service.ts
similarity index 92%
rename from src/app/core/config/config.service.ts
rename to src/app/core/config/config-data.service.ts
index f0b55f5351..8c903a8ba6 100644
--- a/src/app/core/config/config.service.ts
+++ b/src/app/core/config/config-data.service.ts
@@ -6,7 +6,7 @@ import { getFirstCompletedRemoteData } from '../shared/operators';
 import { map } from 'rxjs/operators';
 import { BaseDataService } from '../data/base/base-data.service';
 
-export abstract class ConfigService extends BaseDataService<ConfigObject> {
+export abstract class ConfigDataService extends BaseDataService<ConfigObject> {
   public findByHref(href: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<ConfigObject>[]): Observable<RemoteData<ConfigObject>> {
     return super.findByHref(href, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
       getFirstCompletedRemoteData(),
diff --git a/src/app/core/config/submission-accesses-config.service.ts b/src/app/core/config/submission-accesses-config-data.service.ts
similarity index 79%
rename from src/app/core/config/submission-accesses-config.service.ts
rename to src/app/core/config/submission-accesses-config-data.service.ts
index 3632bd0ead..9cfdfaec96 100644
--- a/src/app/core/config/submission-accesses-config.service.ts
+++ b/src/app/core/config/submission-accesses-config-data.service.ts
@@ -1,20 +1,15 @@
 import { Injectable } from '@angular/core';
-import { ConfigService } from './config.service';
+import { ConfigDataService } from './config-data.service';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { SUBMISSION_ACCESSES_TYPE } from './models/config-type';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
-import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { ConfigObject } from './models/config.model';
 import { SubmissionAccessesModel } from './models/config-submission-accesses.model';
 import { RemoteData } from '../data/remote-data';
 import { Observable } from 'rxjs';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { CoreState } from '../core-state.model';
 import { dataService } from '../data/base/data-service.decorator';
 
 /**
@@ -22,7 +17,7 @@ import { dataService } from '../data/base/data-service.decorator';
  */
 @Injectable()
 @dataService(SUBMISSION_ACCESSES_TYPE)
-export class SubmissionAccessesConfigService extends ConfigService {
+export class SubmissionAccessesConfigDataService extends ConfigDataService {
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
diff --git a/src/app/core/config/submission-forms-config.service.ts b/src/app/core/config/submission-forms-config-data.service.ts
similarity index 91%
rename from src/app/core/config/submission-forms-config.service.ts
rename to src/app/core/config/submission-forms-config-data.service.ts
index 652f333247..3cb82b262a 100644
--- a/src/app/core/config/submission-forms-config.service.ts
+++ b/src/app/core/config/submission-forms-config-data.service.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
-
-import { ConfigService } from './config.service';
+import { ConfigDataService } from './config-data.service';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
@@ -15,7 +14,7 @@ import { dataService } from '../data/base/data-service.decorator';
 
 @Injectable()
 @dataService(SUBMISSION_FORMS_TYPE)
-export class SubmissionFormsConfigService extends ConfigService {
+export class SubmissionFormsConfigDataService extends ConfigDataService {
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
diff --git a/src/app/core/config/submission-uploads-config.service.ts b/src/app/core/config/submission-uploads-config-data.service.ts
similarity index 92%
rename from src/app/core/config/submission-uploads-config.service.ts
rename to src/app/core/config/submission-uploads-config-data.service.ts
index bcb564d690..8f838352a9 100644
--- a/src/app/core/config/submission-uploads-config.service.ts
+++ b/src/app/core/config/submission-uploads-config-data.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { ConfigService } from './config.service';
+import { ConfigDataService } from './config-data.service';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
@@ -17,7 +17,7 @@ import { dataService } from '../data/base/data-service.decorator';
  */
 @Injectable()
 @dataService(SUBMISSION_UPLOADS_TYPE)
-export class SubmissionUploadsConfigService extends ConfigService {
+export class SubmissionUploadsConfigDataService extends ConfigDataService {
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 80576c03b7..3ba0b39a0e 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -36,7 +36,7 @@ import { SubmissionDefinitionsModel } from './config/models/config-submission-de
 import { SubmissionFormsModel } from './config/models/config-submission-forms.model';
 import { SubmissionSectionModel } from './config/models/config-submission-section.model';
 import { SubmissionUploadsModel } from './config/models/config-submission-uploads.model';
-import { SubmissionFormsConfigService } from './config/submission-forms-config.service';
+import { SubmissionFormsConfigDataService } from './config/submission-forms-config-data.service';
 import { coreEffects } from './core.effects';
 import { coreReducers } from './core.reducers';
 import { BitstreamFormatDataService } from './data/bitstream-format-data.service';
@@ -49,8 +49,8 @@ import { DSOChangeAnalyzer } from './data/dso-change-analyzer.service';
 import { DSOResponseParsingService } from './data/dso-response-parsing.service';
 import { DSpaceObjectDataService } from './data/dspace-object-data.service';
 import { EndpointMapResponseParsingService } from './data/endpoint-map-response-parsing.service';
-import { EntityTypeService } from './data/entity-type.service';
-import { ExternalSourceService } from './data/external-source.service';
+import { EntityTypeDataService } from './data/entity-type-data.service';
+import { ExternalSourceDataService } from './data/external-source-data.service';
 import { FacetConfigResponseParsingService } from './data/facet-config-response-parsing.service';
 import { FacetValueResponseParsingService } from './data/facet-value-response-parsing.service';
 import { FilteredDiscoveryPageResponseParsingService } from './data/filtered-discovery-page-response-parsing.service';
@@ -58,9 +58,9 @@ import { ItemDataService } from './data/item-data.service';
 import { LookupRelationService } from './data/lookup-relation.service';
 import { MyDSpaceResponseParsingService } from './data/mydspace-response-parsing.service';
 import { ObjectUpdatesService } from './data/object-updates/object-updates.service';
-import { RelationshipTypeService } from './data/relationship-type.service';
-import { RelationshipService } from './data/relationship.service';
-import { ResourcePolicyService } from './resource-policy/resource-policy.service';
+import { RelationshipTypeDataService } from './data/relationship-type-data.service';
+import { RelationshipDataService } from './data/relationship-data.service';
+import { ResourcePolicyDataService } from './resource-policy/resource-policy-data.service';
 import { SearchResponseParsingService } from './data/search-response-parsing.service';
 import { SiteDataService } from './data/site-data.service';
 import { DspaceRestService } from './dspace-rest/dspace-rest.service';
@@ -170,10 +170,10 @@ import { SubmissionAccessesModel } from './config/models/config-submission-acces
 import { AccessStatusObject } from '../shared/object-list/access-status-badge/access-status.model';
 import { AccessStatusDataService } from './data/access-status-data.service';
 import { LinkHeadService } from './services/link-head.service';
-import { ResearcherProfileService } from './profile/researcher-profile.service';
+import { ResearcherProfileDataService } from './profile/researcher-profile-data.service';
 import { ProfileClaimService } from '../profile-page/profile-claim/profile-claim.service';
 import { ResearcherProfile } from './profile/model/researcher-profile.model';
-import { OrcidQueueService } from './orcid/orcid-queue.service';
+import { OrcidQueueDataService } from './orcid/orcid-queue-data.service';
 import { OrcidHistoryDataService } from './orcid/orcid-history-data.service';
 import { OrcidQueue } from './orcid/model/orcid-queue.model';
 import { OrcidHistory } from './orcid/model/orcid-history.model';
@@ -225,7 +225,7 @@ const PROVIDERS = [
   MetadataService,
   ObjectCacheService,
   PaginationComponentOptions,
-  ResourcePolicyService,
+  ResourcePolicyDataService,
   RegistryService,
   BitstreamFormatDataService,
   RemoteDataBuildService,
@@ -240,7 +240,7 @@ const PROVIDERS = [
   AccessStatusDataService,
   SubmissionCcLicenseDataService,
   SubmissionCcLicenseUrlDataService,
-  SubmissionFormsConfigService,
+  SubmissionFormsConfigDataService,
   SubmissionRestService,
   SubmissionResponseParsingService,
   SubmissionJsonPatchOperationsService,
@@ -261,7 +261,7 @@ const PROVIDERS = [
   MenuService,
   ObjectUpdatesService,
   SearchService,
-  RelationshipService,
+  RelationshipDataService,
   MyDSpaceGuard,
   RoleService,
   TaskResponseParsingService,
@@ -269,7 +269,7 @@ const PROVIDERS = [
   PoolTaskDataService,
   BitstreamDataService,
   DsDynamicTypeBindRelationService,
-  EntityTypeService,
+  EntityTypeDataService,
   ContentSourceResponseParsingService,
   ItemTemplateDataService,
   SearchService,
@@ -278,8 +278,8 @@ const PROVIDERS = [
   SearchFilterService,
   SearchConfigurationService,
   SelectableListService,
-  RelationshipTypeService,
-  ExternalSourceService,
+  RelationshipTypeDataService,
+  ExternalSourceDataService,
   LookupRelationService,
   VersionDataService,
   VersionHistoryDataService,
@@ -308,10 +308,10 @@ const PROVIDERS = [
   SequenceService,
   GroupDataService,
   FeedbackDataService,
-  ResearcherProfileService,
+  ResearcherProfileDataService,
   ProfileClaimService,
   OrcidAuthService,
-  OrcidQueueService,
+  OrcidQueueDataService,
   OrcidHistoryDataService,
 ];
 
diff --git a/src/app/core/data/dso-redirect-data.service.spec.ts b/src/app/core/data/dso-redirect.service.spec.ts
similarity index 100%
rename from src/app/core/data/dso-redirect-data.service.spec.ts
rename to src/app/core/data/dso-redirect.service.spec.ts
diff --git a/src/app/core/data/dso-redirect.service.ts b/src/app/core/data/dso-redirect.service.ts
index 9e7277f2b1..6c57dbb594 100644
--- a/src/app/core/data/dso-redirect.service.ts
+++ b/src/app/core/data/dso-redirect.service.ts
@@ -25,7 +25,7 @@ import { getDSORoute } from '../../app-routing-paths';
 const ID_ENDPOINT = 'pid';
 const UUID_ENDPOINT = 'dso';
 
-class DsoByIdOrUUIDService extends IdentifiableDataService<DSpaceObject> {
+class DsoByIdOrUUIDDataService extends IdentifiableDataService<DSpaceObject> {
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
@@ -58,7 +58,7 @@ class DsoByIdOrUUIDService extends IdentifiableDataService<DSpaceObject> {
 
 @Injectable()
 export class DsoRedirectService {
-  private dataService: DsoByIdOrUUIDService;
+  private dataService: DsoByIdOrUUIDDataService;
 
   constructor(
     protected requestService: RequestService,
@@ -67,7 +67,7 @@ export class DsoRedirectService {
     protected halService: HALEndpointService,
     private router: Router,
   ) {
-    this.dataService = new DsoByIdOrUUIDService(requestService, rdbService, objectCache, halService);
+    this.dataService = new DsoByIdOrUUIDDataService(requestService, rdbService, objectCache, halService);
   }
 
   findByIdAndIDType(id: string, identifierType = IdentifierType.UUID): Observable<RemoteData<DSpaceObject>> {
diff --git a/src/app/core/data/entity-type.service.ts b/src/app/core/data/entity-type-data.service.ts
similarity index 97%
rename from src/app/core/data/entity-type.service.ts
rename to src/app/core/data/entity-type-data.service.ts
index 393c0414d5..4020ff638d 100644
--- a/src/app/core/data/entity-type.service.ts
+++ b/src/app/core/data/entity-type-data.service.ts
@@ -11,7 +11,7 @@ import { RelationshipType } from '../shared/item-relationships/relationship-type
 import { PaginatedList } from './paginated-list.model';
 import { ItemType } from '../shared/item-relationships/item-type.model';
 import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
-import { RelationshipTypeService } from './relationship-type.service';
+import { RelationshipTypeDataService } from './relationship-type-data.service';
 import { FindListOptions } from './find-list-options.model';
 import { BaseDataService } from './base/base-data.service';
 import { SearchData, SearchDataImpl } from './base/search-data';
@@ -21,7 +21,7 @@ import { FindAllData, FindAllDataImpl } from './base/find-all-data';
  * Service handling all ItemType requests
  */
 @Injectable()
-export class EntityTypeService extends BaseDataService<ItemType> implements FindAllData<ItemType>, SearchData<ItemType> {
+export class EntityTypeDataService extends BaseDataService<ItemType> implements FindAllData<ItemType>, SearchData<ItemType> {
   private findAllData: FindAllData<ItemType>;
   private searchData: SearchDataImpl<ItemType>;
 
@@ -30,7 +30,7 @@ export class EntityTypeService extends BaseDataService<ItemType> implements Find
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected relationshipTypeService: RelationshipTypeService,
+    protected relationshipTypeService: RelationshipTypeDataService,
   ) {
     super('entitytypes', requestService, rdbService, objectCache, halService);
 
diff --git a/src/app/core/data/external-source.service.spec.ts b/src/app/core/data/external-source-data.service.spec.ts
similarity index 90%
rename from src/app/core/data/external-source.service.spec.ts
rename to src/app/core/data/external-source-data.service.spec.ts
index 8a547b69f9..86bbca59c9 100644
--- a/src/app/core/data/external-source.service.spec.ts
+++ b/src/app/core/data/external-source-data.service.spec.ts
@@ -1,4 +1,4 @@
-import { ExternalSourceService } from './external-source.service';
+import { ExternalSourceDataService } from './external-source-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { ExternalSourceEntry } from '../shared/external-source-entry.model';
@@ -6,7 +6,7 @@ import { of as observableOf } from 'rxjs';
 import { GetRequest } from './request.models';
 
 describe('ExternalSourceService', () => {
-  let service: ExternalSourceService;
+  let service: ExternalSourceDataService;
 
   let requestService;
   let rdbService;
@@ -50,7 +50,7 @@ describe('ExternalSourceService', () => {
     halService = jasmine.createSpyObj('halService', {
       getEndpoint: observableOf('external-sources-REST-endpoint'),
     });
-    service = new ExternalSourceService(requestService, rdbService, undefined, halService);
+    service = new ExternalSourceDataService(requestService, rdbService, undefined, halService);
   }
 
   beforeEach(() => {
diff --git a/src/app/core/data/external-source.service.ts b/src/app/core/data/external-source-data.service.ts
similarity index 97%
rename from src/app/core/data/external-source.service.ts
rename to src/app/core/data/external-source-data.service.ts
index e273bedb00..c7b71790a3 100644
--- a/src/app/core/data/external-source.service.ts
+++ b/src/app/core/data/external-source-data.service.ts
@@ -20,7 +20,7 @@ import { SearchData, SearchDataImpl } from './base/search-data';
  * A service handling all external source requests
  */
 @Injectable()
-export class ExternalSourceService extends IdentifiableDataService<ExternalSource> implements SearchData<ExternalSource> {
+export class ExternalSourceDataService extends IdentifiableDataService<ExternalSource> implements SearchData<ExternalSource> {
   private searchData: SearchData<ExternalSource>;
 
   constructor(
diff --git a/src/app/core/data/lookup-relation.service.spec.ts b/src/app/core/data/lookup-relation.service.spec.ts
index c9e523f796..58598b9870 100644
--- a/src/app/core/data/lookup-relation.service.spec.ts
+++ b/src/app/core/data/lookup-relation.service.spec.ts
@@ -1,5 +1,5 @@
 import { LookupRelationService } from './lookup-relation.service';
-import { ExternalSourceService } from './external-source.service';
+import { ExternalSourceDataService } from './external-source-data.service';
 import { SearchService } from '../shared/search/search.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
@@ -16,7 +16,7 @@ import { of as observableOf } from 'rxjs';
 
 describe('LookupRelationService', () => {
   let service: LookupRelationService;
-  let externalSourceService: ExternalSourceService;
+  let externalSourceService: ExternalSourceDataService;
   let searchService: SearchService;
   let requestService: RequestService;
 
diff --git a/src/app/core/data/lookup-relation.service.ts b/src/app/core/data/lookup-relation.service.ts
index 7808a24e92..7a6bc2358b 100644
--- a/src/app/core/data/lookup-relation.service.ts
+++ b/src/app/core/data/lookup-relation.service.ts
@@ -1,4 +1,4 @@
-import { ExternalSourceService } from './external-source.service';
+import { ExternalSourceDataService } from './external-source-data.service';
 import { SearchService } from '../shared/search/search.service';
 import { concat, distinctUntilChanged, map, multicast, startWith, take, takeWhile } from 'rxjs/operators';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
@@ -34,7 +34,7 @@ export class LookupRelationService {
     pageSize: 1
   });
 
-  constructor(protected externalSourceService: ExternalSourceService,
+  constructor(protected externalSourceService: ExternalSourceDataService,
               protected searchService: SearchService,
               protected requestService: RequestService) {
   }
diff --git a/src/app/core/data/relationship.service.spec.ts b/src/app/core/data/relationship-data.service.spec.ts
similarity index 97%
rename from src/app/core/data/relationship.service.spec.ts
rename to src/app/core/data/relationship-data.service.spec.ts
index 8a860693a9..d65df832a8 100644
--- a/src/app/core/data/relationship.service.spec.ts
+++ b/src/app/core/data/relationship-data.service.spec.ts
@@ -7,7 +7,7 @@ import { Item } from '../shared/item.model';
 import { PageInfo } from '../shared/page-info.model';
 import { buildPaginatedList } from './paginated-list.model';
 import { DeleteRequest } from './request.models';
-import { RelationshipService } from './relationship.service';
+import { RelationshipDataService } from './relationship-data.service';
 import { RequestService } from './request.service';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
@@ -17,8 +17,8 @@ import { createPaginatedList } from '../../shared/testing/utils.test';
 import { RequestEntry } from './request-entry.model';
 import { FindListOptions } from './find-list-options.model';
 
-describe('RelationshipService', () => {
-  let service: RelationshipService;
+describe('RelationshipDataService', () => {
+  let service: RelationshipDataService;
   let requestService: RequestService;
 
   const restEndpointURL = 'https://rest.api/core';
@@ -122,7 +122,7 @@ describe('RelationshipService', () => {
   });
 
   function initTestService() {
-    return new RelationshipService(
+    return new RelationshipDataService(
       requestService,
       rdbService,
       halService,
diff --git a/src/app/core/data/relationship.service.ts b/src/app/core/data/relationship-data.service.ts
similarity index 97%
rename from src/app/core/data/relationship.service.ts
rename to src/app/core/data/relationship-data.service.ts
index fe64a95e8a..cab6a1ae13 100644
--- a/src/app/core/data/relationship.service.ts
+++ b/src/app/core/data/relationship-data.service.ts
@@ -74,7 +74,7 @@ const compareItemsByUUID = (itemCheck: Item) =>
  */
 @Injectable()
 @dataService(RELATIONSHIP)
-export class RelationshipService extends IdentifiableDataService<Relationship> implements SearchData<Relationship> {
+export class RelationshipDataService extends IdentifiableDataService<Relationship> implements SearchData<Relationship> {
   private searchData: SearchData<Relationship>;
   private putData: PutData<Relationship>;
 
@@ -547,6 +547,15 @@ export class RelationshipService extends IdentifiableDataService<Relationship> i
     return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...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
+   */
   getSearchByHref(searchMethod: string, options: FindListOptions, ...linksToFollow: FollowLinkConfig<Relationship>[]): Observable<string> {
     return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
   }
diff --git a/src/app/core/data/relationship-type.service.spec.ts b/src/app/core/data/relationship-type-data.service.spec.ts
similarity index 94%
rename from src/app/core/data/relationship-type.service.spec.ts
rename to src/app/core/data/relationship-type-data.service.spec.ts
index ebda23d7a4..6a788446d8 100644
--- a/src/app/core/data/relationship-type.service.spec.ts
+++ b/src/app/core/data/relationship-type-data.service.spec.ts
@@ -5,14 +5,14 @@ import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-servic
 import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { ItemType } from '../shared/item-relationships/item-type.model';
 import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
-import { RelationshipTypeService } from './relationship-type.service';
+import { RelationshipTypeDataService } from './relationship-type-data.service';
 import { RequestService } from './request.service';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { hasValueOperator } from '../../shared/empty.util';
 import { ObjectCacheService } from '../cache/object-cache.service';
 
-describe('RelationshipTypeService', () => {
-  let service: RelationshipTypeService;
+describe('RelationshipTypeDataService', () => {
+  let service: RelationshipTypeDataService;
   let requestService: RequestService;
   let restEndpointURL;
   let halService: any;
@@ -71,7 +71,7 @@ describe('RelationshipTypeService', () => {
   }
 
   function initTestService() {
-    return new RelationshipTypeService(
+    return new RelationshipTypeDataService(
       requestService,
       rdbService,
       objectCache,
diff --git a/src/app/core/data/relationship-type.service.ts b/src/app/core/data/relationship-type-data.service.ts
similarity index 98%
rename from src/app/core/data/relationship-type.service.ts
rename to src/app/core/data/relationship-type-data.service.ts
index 20f1bca9bc..3020e52d47 100644
--- a/src/app/core/data/relationship-type.service.ts
+++ b/src/app/core/data/relationship-type-data.service.ts
@@ -32,7 +32,7 @@ const checkSide = (typeRd: RemoteData<ItemType>, label: string): boolean =>
  */
 @Injectable()
 @dataService(RELATIONSHIP_TYPE)
-export class RelationshipTypeService extends BaseDataService<RelationshipType> {
+export class RelationshipTypeDataService extends BaseDataService<RelationshipType> {
   private searchData: SearchDataImpl<RelationshipType>;
   private findAllData: FindAllDataImpl<RelationshipType>;
 
diff --git a/src/app/core/orcid/orcid-auth.service.spec.ts b/src/app/core/orcid/orcid-auth.service.spec.ts
index 617ae78b24..ad703d135e 100644
--- a/src/app/core/orcid/orcid-auth.service.spec.ts
+++ b/src/app/core/orcid/orcid-auth.service.spec.ts
@@ -11,14 +11,14 @@ import { createPaginatedList } from '../../shared/testing/utils.test';
 import { NativeWindowRefMock } from '../../shared/mocks/mock-native-window-ref';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { OrcidAuthService } from './orcid-auth.service';
-import { ResearcherProfileService } from '../profile/researcher-profile.service';
+import { ResearcherProfileDataService } from '../profile/researcher-profile-data.service';
 
 describe('OrcidAuthService', () => {
   let scheduler: TestScheduler;
   let service: OrcidAuthService;
   let serviceAsAny: any;
 
-  let researcherProfileService: jasmine.SpyObj<ResearcherProfileService>;
+  let researcherProfileService: jasmine.SpyObj<ResearcherProfileDataService>;
   let configurationDataService: ConfigurationDataService;
   let nativeWindowService: NativeWindowRefMock;
   let routerStub: any;
diff --git a/src/app/core/orcid/orcid-auth.service.ts b/src/app/core/orcid/orcid-auth.service.ts
index 3024b7df94..572ab79b4a 100644
--- a/src/app/core/orcid/orcid-auth.service.ts
+++ b/src/app/core/orcid/orcid-auth.service.ts
@@ -5,7 +5,7 @@ import { combineLatest, Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { AddOperation, RemoveOperation } from 'fast-json-patch';
 
-import { ResearcherProfileService } from '../profile/researcher-profile.service';
+import { ResearcherProfileDataService } from '../profile/researcher-profile-data.service';
 import { Item } from '../shared/item.model';
 import { isNotEmpty } from '../../shared/empty.util';
 import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../shared/operators';
@@ -22,7 +22,7 @@ export class OrcidAuthService {
   constructor(
     @Inject(NativeWindowService) protected _window: NativeWindowRef,
     private configurationService: ConfigurationDataService,
-    private researcherProfileService: ResearcherProfileService,
+    private researcherProfileService: ResearcherProfileDataService,
     private router: Router) {
   }
 
diff --git a/src/app/core/orcid/orcid-queue.service.ts b/src/app/core/orcid/orcid-queue-data.service.ts
similarity index 97%
rename from src/app/core/orcid/orcid-queue.service.ts
rename to src/app/core/orcid/orcid-queue-data.service.ts
index db61514b82..77149c4bf8 100644
--- a/src/app/core/orcid/orcid-queue.service.ts
+++ b/src/app/core/orcid/orcid-queue-data.service.ts
@@ -22,7 +22,7 @@ import { dataService } from '../data/base/data-service.decorator';
  */
 @Injectable()
 @dataService(ORCID_QUEUE)
-export class OrcidQueueService extends IdentifiableDataService<OrcidQueue> {
+export class OrcidQueueDataService extends IdentifiableDataService<OrcidQueue> {
   private searchData: SearchData<OrcidQueue>;
   private deleteData: DeleteData<OrcidQueue>;
 
diff --git a/src/app/core/profile/researcher-profile.service.spec.ts b/src/app/core/profile/researcher-profile-data.service.spec.ts
similarity index 98%
rename from src/app/core/profile/researcher-profile.service.spec.ts
rename to src/app/core/profile/researcher-profile-data.service.spec.ts
index aac1c670c1..1e2f453d2c 100644
--- a/src/app/core/profile/researcher-profile.service.spec.ts
+++ b/src/app/core/profile/researcher-profile-data.service.spec.ts
@@ -18,7 +18,7 @@ import {
 } from '../../shared/remote-data.utils';
 import { RestResponse } from '../cache/response.models';
 import { RequestEntry } from '../data/request-entry.model';
-import { ResearcherProfileService } from './researcher-profile.service';
+import { ResearcherProfileDataService } from './researcher-profile-data.service';
 import { RouterMock } from '../../shared/mocks/router.mock';
 import { ResearcherProfile } from './model/researcher-profile.model';
 import { Item } from '../shared/item.model';
@@ -31,7 +31,7 @@ import { createPaginatedList } from '../../shared/testing/utils.test';
 
 describe('ResearcherProfileService', () => {
   let scheduler: TestScheduler;
-  let service: ResearcherProfileService;
+  let service: ResearcherProfileDataService;
   let serviceAsAny: any;
   let requestService: RequestService;
   let rdbService: RemoteDataBuildService;
@@ -247,7 +247,7 @@ describe('ResearcherProfileService', () => {
       findByHref: jasmine.createSpy('findByHref')
     });
 
-    service = new ResearcherProfileService(
+    service = new ResearcherProfileDataService(
       requestService,
       rdbService,
       objectCache,
diff --git a/src/app/core/profile/researcher-profile.service.ts b/src/app/core/profile/researcher-profile-data.service.ts
similarity index 97%
rename from src/app/core/profile/researcher-profile.service.ts
rename to src/app/core/profile/researcher-profile-data.service.ts
index 1331a88bed..8c62879c37 100644
--- a/src/app/core/profile/researcher-profile.service.ts
+++ b/src/app/core/profile/researcher-profile-data.service.ts
@@ -39,7 +39,7 @@ import { dataService } from '../data/base/data-service.decorator';
  */
 @Injectable()
 @dataService(RESEARCHER_PROFILE)
-export class ResearcherProfileService extends IdentifiableDataService<ResearcherProfile> implements CreateData<ResearcherProfile>, SearchData<ResearcherProfile>, PatchData<ResearcherProfile>, DeleteData<ResearcherProfile> {
+export class ResearcherProfileDataService extends IdentifiableDataService<ResearcherProfile> implements CreateData<ResearcherProfile>, SearchData<ResearcherProfile>, PatchData<ResearcherProfile>, DeleteData<ResearcherProfile> {
   private createData: CreateDataImpl<ResearcherProfile>;
   private searchData: SearchDataImpl<ResearcherProfile>;
   private patchData: PatchDataImpl<ResearcherProfile>;
diff --git a/src/app/core/resource-policy/resource-policy.service.spec.ts b/src/app/core/resource-policy/resource-policy-data.service.spec.ts
similarity index 98%
rename from src/app/core/resource-policy/resource-policy.service.spec.ts
rename to src/app/core/resource-policy/resource-policy-data.service.spec.ts
index 62c07ad862..acdefcbf75 100644
--- a/src/app/core/resource-policy/resource-policy.service.spec.ts
+++ b/src/app/core/resource-policy/resource-policy-data.service.spec.ts
@@ -1,5 +1,3 @@
-import { HttpClient } from '@angular/common/http';
-
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
@@ -9,7 +7,7 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RequestService } from '../data/request.service';
-import { ResourcePolicyService } from './resource-policy.service';
+import { ResourcePolicyDataService } from './resource-policy-data.service';
 import { PolicyType } from './models/policy-type.model';
 import { ActionType } from './models/action-type.model';
 import { RequestParam } from '../cache/models/request-param.model';
@@ -24,7 +22,7 @@ import { GroupDataService } from '../eperson/group-data.service';
 
 describe('ResourcePolicyService', () => {
   let scheduler: TestScheduler;
-  let service: ResourcePolicyService;
+  let service: ResourcePolicyDataService;
   let requestService: RequestService;
   let rdbService: RemoteDataBuildService;
   let objectCache: ObjectCacheService;
@@ -133,7 +131,7 @@ describe('ResourcePolicyService', () => {
     const notificationsService = {} as NotificationsService;
     const comparator = {} as any;
 
-    service = new ResourcePolicyService(
+    service = new ResourcePolicyDataService(
       requestService,
       rdbService,
       objectCache,
diff --git a/src/app/core/resource-policy/resource-policy.service.ts b/src/app/core/resource-policy/resource-policy-data.service.ts
similarity index 99%
rename from src/app/core/resource-policy/resource-policy.service.ts
rename to src/app/core/resource-policy/resource-policy-data.service.ts
index f432a3b24e..097e4fc447 100644
--- a/src/app/core/resource-policy/resource-policy.service.ts
+++ b/src/app/core/resource-policy/resource-policy-data.service.ts
@@ -40,7 +40,7 @@ import { dataService } from '../data/base/data-service.decorator';
  */
 @Injectable()
 @dataService(RESOURCE_POLICY)
-export class ResourcePolicyService extends IdentifiableDataService<ResourcePolicy> {
+export class ResourcePolicyDataService extends IdentifiableDataService<ResourcePolicy> {
   protected searchByEPersonMethod = 'eperson';
   protected searchByGroupMethod = 'group';
   protected searchByResourceMethod = 'resource';
diff --git a/src/app/core/statistics/usage-report-data.service.ts b/src/app/core/statistics/usage-report-data.service.ts
index d2f3bef2fc..fde8298488 100644
--- a/src/app/core/statistics/usage-report-data.service.ts
+++ b/src/app/core/statistics/usage-report-data.service.ts
@@ -21,7 +21,7 @@ import { dataService } from '../data/base/data-service.decorator';
  */
 @Injectable()
 @dataService(USAGE_REPORT)
-export class UsageReportService extends IdentifiableDataService<UsageReport> implements SearchData<UsageReport> {
+export class UsageReportDataService extends IdentifiableDataService<UsageReport> implements SearchData<UsageReport> {
   private searchData: SearchDataImpl<UsageReport>;
 
   constructor(
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
index 3ed73e7891..4469a2ac29 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
@@ -14,7 +14,7 @@ import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-anal
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { RelationshipService } from '../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
@@ -83,7 +83,7 @@ describe('JournalComponent', () => {
       providers: [
         { provide: ItemDataService, useValue: {} },
         { provide: TruncatableService, useValue: {} },
-        { provide: RelationshipService, useValue: {} },
+        { provide: RelationshipDataService, useValue: {} },
         { provide: ObjectCacheService, useValue: {} },
         { provide: UUIDService, useValue: {} },
         { provide: Store, useValue: {} },
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..86ed9f176c 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
@@ -14,7 +14,7 @@ import { DefaultChangeAnalyzer } from '../../../../../core/data/default-change-a
 import { DSOChangeAnalyzer } from '../../../../../core/data/dso-change-analyzer.service';
 import { ItemDataService } from '../../../../../core/data/item-data.service';
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
-import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { Bitstream } from '../../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../../core/shared/hal-endpoint.service';
@@ -101,7 +101,7 @@ describe('OrgUnitSearchResultListSubmissionElementComponent', () => {
       declarations: [OrgUnitSearchResultListSubmissionElementComponent, TruncatePipe],
       providers: [
         { provide: TruncatableService, useValue: {} },
-        { provide: RelationshipService, useValue: mockRelationshipService },
+        { provide: RelationshipDataService, useValue: mockRelationshipService },
         { provide: NotificationsService, useValue: {} },
         { provide: TranslateService, useValue: {} },
         { provide: NgbModal, useValue: {} },
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..42a9dc9141 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
@@ -6,7 +6,7 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { Context } from '../../../../../core/shared/context.model';
-import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { take } from 'rxjs/operators';
 import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
@@ -36,7 +36,7 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
   useNameVariants = false;
 
   constructor(protected truncatableService: TruncatableService,
-              private relationshipService: RelationshipService,
+              private relationshipService: RelationshipDataService,
               private notificationsService: NotificationsService,
               private translateService: TranslateService,
               private modalService: NgbModal,
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..c0fad3ed3f 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
@@ -14,7 +14,7 @@ import { DefaultChangeAnalyzer } from '../../../../../core/data/default-change-a
 import { DSOChangeAnalyzer } from '../../../../../core/data/dso-change-analyzer.service';
 import { ItemDataService } from '../../../../../core/data/item-data.service';
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
-import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { Bitstream } from '../../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../../core/shared/hal-endpoint.service';
@@ -93,7 +93,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: {} },
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..395b275f69 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
@@ -6,7 +6,7 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { Context } from '../../../../../core/shared/context.model';
-import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { take } from 'rxjs/operators';
 import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
@@ -34,7 +34,7 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu
   alternativeField = 'dc.title.alternative';
 
   constructor(protected truncatableService: TruncatableService,
-              private relationshipService: RelationshipService,
+              private relationshipService: RelationshipDataService,
               private notificationsService: NotificationsService,
               private translateService: TranslateService,
               private modalService: NgbModal,
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts
index 2533de32b2..2a9f7fae52 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts
@@ -19,12 +19,12 @@ import { ItemDeleteComponent } from './item-delete.component';
 import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { RelationshipService } from '../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
-import { EntityTypeService } from '../../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { getItemEditRoute } from '../../item-page-routing-paths';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { RelationshipTypeService } from '../../../core/data/relationship-type.service';
+import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
 import { LinkService } from '../../../core/cache/builders/link.service';
 
 let comp: ItemDeleteComponent;
@@ -154,9 +154,9 @@ describe('ItemDeleteComponent', () => {
         { provide: ItemDataService, useValue: mockItemDataService },
         { provide: NotificationsService, useValue: notificationsServiceStub },
         { provide: ObjectUpdatesService, useValue: objectUpdatesServiceStub },
-        { provide: RelationshipService, useValue: relationshipService },
-        { provide: EntityTypeService, useValue: entityTypeService },
-        { provide: RelationshipTypeService, useValue: {} },
+        { provide: RelationshipDataService, useValue: relationshipService },
+        { provide: EntityTypeDataService, useValue: entityTypeService },
+        { provide: RelationshipTypeDataService, useValue: {} },
         { provide: LinkService, useValue: linkService },
       ], schemas: [
         CUSTOM_ELEMENTS_SCHEMA
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
index 4ea2622962..9012ebe7d7 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
@@ -29,8 +29,8 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { TranslateService } from '@ngx-translate/core';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { RelationshipService } from '../../../core/data/relationship.service';
-import { EntityTypeService } from '../../../core/data/entity-type.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { LinkService } from '../../../core/cache/builders/link.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { getItemEditRoute } from '../../item-page-routing-paths';
@@ -100,8 +100,8 @@ export class ItemDeleteComponent
               protected translateService: TranslateService,
               protected modalService: NgbModal,
               protected objectUpdatesService: ObjectUpdatesService,
-              protected relationshipService: RelationshipService,
-              protected entityTypeService: EntityTypeService,
+              protected relationshipService: RelationshipDataService,
+              protected entityTypeService: EntityTypeDataService,
               protected linkService: LinkService,
   ) {
     super(
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 de22b9eab0..76c5717bb8 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
@@ -5,7 +5,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 import { LinkService } from '../../../../core/cache/builders/link.service';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { RelationshipService } from '../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
 import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
 import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
@@ -21,7 +21,7 @@ import { HostWindowService } from '../../../../shared/host-window.service';
 import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
-import { RelationshipTypeService } from '../../../../core/data/relationship-type.service';
+import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service';
 import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
 import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
@@ -206,12 +206,12 @@ describe('EditRelationshipListComponent', () => {
       declarations: [EditRelationshipListComponent],
       providers: [
         { provide: ObjectUpdatesService, useValue: objectUpdatesService },
-        { provide: RelationshipService, useValue: relationshipService },
+        { provide: RelationshipDataService, useValue: relationshipService },
         { provide: SelectableListService, useValue: selectableListService },
         { provide: LinkService, useValue: linkService },
         { provide: PaginationService, useValue: paginationService },
         { provide: HostWindowService, useValue: hostWindowService },
-        { provide: RelationshipTypeService, useValue: relationshipTypeService },
+        { provide: RelationshipTypeDataService, useValue: relationshipTypeService },
         { provide: GroupDataService, useValue: groupDataService },
         { provide: Router, useValue: new RouterMock() },
         { provide: LinkHeadService, useValue: linkHeadService },
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 fcb84be2dd..f5a5a583d7 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
@@ -12,7 +12,7 @@ import {
 import {
   RelationshipIdentifiable
 } from '../../../../core/data/object-updates/object-updates.reducer';
-import { RelationshipService } from '../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { Item } from '../../../../core/shared/item.model';
 import { defaultIfEmpty, map, mergeMap, startWith, switchMap, take, tap, toArray } from 'rxjs/operators';
 import { hasNoValue, hasValue, hasValueOperator } from '../../../../shared/empty.util';
@@ -35,7 +35,7 @@ import { RemoteData } from '../../../../core/data/remote-data';
 import { Collection } from '../../../../core/shared/collection.model';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { RelationshipTypeService } from '../../../../core/data/relationship-type.service';
+import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service';
 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';
@@ -142,8 +142,8 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
   constructor(
     protected objectUpdatesService: ObjectUpdatesService,
     protected linkService: LinkService,
-    protected relationshipService: RelationshipService,
-    protected relationshipTypeService: RelationshipTypeService,
+    protected relationshipService: RelationshipDataService,
+    protected relationshipTypeService: RelationshipTypeDataService,
     protected modalService: NgbModal,
     protected paginationService: PaginationService,
     protected selectableListService: SelectableListService,
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
index e32f03988e..aa711c8ea3 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
@@ -7,10 +7,10 @@ import { combineLatest as observableCombineLatest, of as observableOf } from 'rx
 import { TestScheduler } from 'rxjs/testing';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { RestResponse } from '../../../core/cache/response.models';
-import { EntityTypeService } from '../../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { RelationshipService } from '../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { RequestService } from '../../../core/data/request.service';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
 import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
@@ -25,7 +25,7 @@ import { ItemRelationshipsComponent } from './item-relationships.component';
 import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
-import { RelationshipTypeService } from '../../../core/data/relationship-type.service';
+import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
 import { relationshipTypes } from '../../../shared/testing/relationship-types.mock';
 import { ThemeService } from '../../../shared/theme-support/theme.service';
 import { getMockThemeService } from '../../../shared/mocks/theme-service.mock';
@@ -219,11 +219,11 @@ describe('ItemRelationshipsComponent', () => {
         { provide: Router, useValue: router },
         { provide: ActivatedRoute, useValue: routeStub },
         { provide: NotificationsService, useValue: notificationsService },
-        { provide: RelationshipService, useValue: relationshipService },
-        { provide: EntityTypeService, useValue: entityTypeService },
+        { provide: RelationshipDataService, useValue: relationshipService },
+        { provide: EntityTypeDataService, useValue: entityTypeService },
         { provide: ObjectCacheService, useValue: objectCache },
         { provide: RequestService, useValue: requestService },
-        { provide: RelationshipTypeService, useValue: relationshipTypeService },
+        { provide: RelationshipTypeDataService, useValue: relationshipTypeService },
         ChangeDetectorRef
       ], schemas: [
         NO_ERRORS_SCHEMA
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 1f582bd0e5..8f7c43e79f 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -13,21 +13,21 @@ import { ObjectUpdatesService } from '../../../core/data/object-updates/object-u
 import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { RelationshipService } from '../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
 import { RequestService } from '../../../core/data/request.service';
 import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
-import { EntityTypeService } from '../../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { hasValue } from '../../../shared/empty.util';
 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 { RelationshipTypeService } from '../../../core/data/relationship-type.service';
+import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
@@ -59,11 +59,11 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
     public notificationsService: NotificationsService,
     public translateService: TranslateService,
     public route: ActivatedRoute,
-    public relationshipService: RelationshipService,
+    public relationshipService: RelationshipDataService,
     public objectCache: ObjectCacheService,
     public requestService: RequestService,
-    public entityTypeService: EntityTypeService,
-    protected relationshipTypeService: RelationshipTypeService,
+    public entityTypeService: EntityTypeDataService,
+    protected relationshipTypeService: RelationshipTypeDataService,
     public cdr: ChangeDetectorRef,
     protected modalService: NgbModal,
   ) {
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
index 9107ac34ff..d0f52531d4 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
@@ -4,7 +4,7 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
 import { RouterTestingModule } from '@angular/router/testing';
 import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { OrcidQueueService } from '../../../core/orcid/orcid-queue.service';
+import { OrcidQueueDataService } from '../../../core/orcid/orcid-queue-data.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -22,7 +22,7 @@ describe('OrcidQueueComponent test suite', () => {
   let component: OrcidQueueComponent;
   let fixture: ComponentFixture<OrcidQueueComponent>;
   let debugElement: DebugElement;
-  let orcidQueueService: OrcidQueueService;
+  let orcidQueueService: OrcidQueueDataService;
   let orcidAuthService: jasmine.SpyObj<OrcidAuthService>;
 
   const testProfileItemId = 'test-owner-id';
@@ -120,7 +120,7 @@ describe('OrcidQueueComponent test suite', () => {
       declarations: [OrcidQueueComponent],
       providers: [
         { provide: OrcidAuthService, useValue: orcidAuthService },
-        { provide: OrcidQueueService, useValue: orcidQueueServiceSpy },
+        { provide: OrcidQueueDataService, useValue: orcidQueueServiceSpy },
         { provide: OrcidHistoryDataService, useValue: {} },
         { provide: PaginationService, useValue: new PaginationServiceStub() },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
@@ -128,7 +128,7 @@ describe('OrcidQueueComponent test suite', () => {
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
 
-    orcidQueueService = TestBed.inject(OrcidQueueService);
+    orcidQueueService = TestBed.inject(OrcidQueueDataService);
   }));
 
   beforeEach(() => {
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
index 99ba33ee82..6079287f71 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
@@ -9,7 +9,7 @@ import { RemoteData } from '../../../core/data/remote-data';
 import { OrcidHistory } from '../../../core/orcid/model/orcid-history.model';
 import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model';
 import { OrcidHistoryDataService } from '../../../core/orcid/orcid-history-data.service';
-import { OrcidQueueService } from '../../../core/orcid/orcid-queue.service';
+import { OrcidQueueDataService } from '../../../core/orcid/orcid-queue-data.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { hasValue } from '../../../shared/empty.util';
@@ -62,7 +62,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
   private subs: Subscription[] = [];
 
   constructor(private orcidAuthService: OrcidAuthService,
-              private orcidQueueService: OrcidQueueService,
+              private orcidQueueService: OrcidQueueDataService,
               protected translateService: TranslateService,
               private paginationService: PaginationService,
               private notificationsService: NotificationsService,
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
index ac87d0c2cc..cd466ae4a4 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
@@ -10,7 +10,7 @@ import { TestScheduler } from 'rxjs/testing';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { Operation } from 'fast-json-patch';
 
-import { ResearcherProfileService } from '../../../core/profile/researcher-profile.service';
+import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
 import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { Item } from '../../../core/shared/item.model';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
@@ -24,7 +24,7 @@ describe('OrcidSyncSettingsComponent test suite', () => {
   let comp: OrcidSyncSettingsComponent;
   let fixture: ComponentFixture<OrcidSyncSettingsComponent>;
   let scheduler: TestScheduler;
-  let researcherProfileService: jasmine.SpyObj<ResearcherProfileService>;
+  let researcherProfileService: jasmine.SpyObj<ResearcherProfileDataService>;
   let notificationsService;
   let formGroup: FormGroup;
 
@@ -149,7 +149,7 @@ describe('OrcidSyncSettingsComponent test suite', () => {
       declarations: [OrcidSyncSettingsComponent],
       providers: [
         { provide: NotificationsService, useClass: NotificationsServiceStub },
-        { provide: ResearcherProfileService, useValue: researcherProfileService }
+        { provide: ResearcherProfileDataService, useValue: researcherProfileService }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(OrcidSyncSettingsComponent, {
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
index 05b8ea4b5f..494075c0f0 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
@@ -7,7 +7,7 @@ import { of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 
 import { RemoteData } from '../../../core/data/remote-data';
-import { ResearcherProfileService } from '../../../core/profile/researcher-profile.service';
+import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
 import { Item } from '../../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -70,7 +70,7 @@ export class OrcidSyncSettingsComponent implements OnInit {
    */
   @Output() settingsUpdated: EventEmitter<void> = new EventEmitter<void>();
 
-  constructor(private researcherProfileService: ResearcherProfileService,
+  constructor(private researcherProfileService: ResearcherProfileDataService,
               private notificationsService: NotificationsService,
               private translateService: TranslateService) {
   }
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.spec.ts b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts
index a623a34b15..1ccb33eb32 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.spec.ts
+++ b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts
@@ -12,7 +12,7 @@ import { CommunityDataService } from '../../../../core/data/community-data.servi
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
-import { RelationshipService } from '../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
@@ -71,7 +71,7 @@ describe('PublicationComponent', () => {
       providers: [
         { provide: ItemDataService, useValue: {} },
         { provide: TruncatableService, useValue: {} },
-        { provide: RelationshipService, useValue: {} },
+        { provide: RelationshipDataService, useValue: {} },
         { provide: ObjectCacheService, useValue: {} },
         { provide: UUIDService, useValue: {} },
         { provide: Store, useValue: {} },
diff --git a/src/app/item-page/simple/item-types/shared/item.component.spec.ts b/src/app/item-page/simple/item-types/shared/item.component.spec.ts
index 29c3b79719..b14e56a58e 100644
--- a/src/app/item-page/simple/item-types/shared/item.component.spec.ts
+++ b/src/app/item-page/simple/item-types/shared/item.component.spec.ts
@@ -12,7 +12,7 @@ import { CommunityDataService } from '../../../../core/data/community-data.servi
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
-import { RelationshipService } from '../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
@@ -38,7 +38,7 @@ import { VersionDataService } from '../../../../core/data/version-data.service';
 import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
 import { RouterTestingModule } from '@angular/router/testing';
 import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
-import { ResearcherProfileService } from '../../../../core/profile/researcher-profile.service';
+import { ResearcherProfileDataService } from '../../../../core/profile/researcher-profile-data.service';
 
 export function getIIIFSearchEnabled(enabled: boolean): MetadataValue {
   return Object.assign(new MetadataValue(), {
@@ -99,7 +99,7 @@ export function getItemPageFieldsTest(mockItem: Item, component) {
         providers: [
           { provide: ItemDataService, useValue: {} },
           { provide: TruncatableService, useValue: {} },
-          { provide: RelationshipService, useValue: {} },
+          { provide: RelationshipDataService, useValue: {} },
           { provide: ObjectCacheService, useValue: {} },
           { provide: UUIDService, useValue: {} },
           { provide: Store, useValue: {} },
@@ -117,7 +117,7 @@ export function getItemPageFieldsTest(mockItem: Item, component) {
           { provide: SearchService, useValue: {} },
           { provide: RouteService, useValue: {} },
           { provide: AuthorizationDataService, useValue: authorizationService },
-          { provide: ResearcherProfileService, useValue: {} }
+          { provide: ResearcherProfileDataService, useValue: {} }
         ],
 
         schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
index 736916c940..57f546fbec 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
@@ -12,7 +12,7 @@ import { CommunityDataService } from '../../../../core/data/community-data.servi
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
-import { RelationshipService } from '../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
@@ -72,7 +72,7 @@ describe('UntypedItemComponent', () => {
       providers: [
         { provide: ItemDataService, useValue: {} },
         { provide: TruncatableService, useValue: {} },
-        { provide: RelationshipService, useValue: {} },
+        { provide: RelationshipDataService, useValue: {} },
         { provide: ObjectCacheService, useValue: {} },
         { provide: UUIDService, useValue: {} },
         { provide: Store, useValue: {} },
diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
index 6023aa7b6d..fafb5314b3 100644
--- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
+++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { MetadataRepresentationListComponent } from './metadata-representation-list.component';
-import { RelationshipService } from '../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { Item } from '../../../core/shared/item.model';
 import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
 import { createSuccessfulRemoteDataObject$, createFailedRemoteDataObject$ } from '../../../shared/remote-data.utils';
@@ -110,7 +110,7 @@ describe('MetadataRepresentationListComponent', () => {
       imports: [TranslateModule.forRoot()],
       declarations: [MetadataRepresentationListComponent, VarDirective],
       providers: [
-        { provide: RelationshipService, useValue: relationshipService }
+        { provide: RelationshipDataService, useValue: relationshipService }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(MetadataRepresentationListComponent, {
diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
index 620c63ed62..5d2d0d0208 100644
--- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
+++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
@@ -6,7 +6,7 @@ import {
   of as observableOf,
   zip as observableZip
 } from 'rxjs';
-import { RelationshipService } from '../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { MetadataValue } from '../../../core/shared/metadata.models';
 import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
 import { filter, map, switchMap } from 'rxjs/operators';
@@ -61,7 +61,7 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList
    */
   total: number;
 
-  constructor(public relationshipService: RelationshipService) {
+  constructor(public relationshipService: RelationshipDataService) {
     super();
   }
 
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..9750697947 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
@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
-import { RelationshipService } from '../../../core/data/relationship.service';
+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';
 
@@ -53,7 +53,7 @@ export class RelatedItemsComponent extends AbstractIncrementalListComponent<Obse
    */
   viewMode = ViewMode.ListElement;
 
-  constructor(public relationshipService: RelationshipService) {
+  constructor(public relationshipService: RelationshipDataService) {
     super();
   }
 
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 751acb316a..75453b5b14 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
@@ -5,7 +5,7 @@ import { Item } from '../../../core/shared/item.model';
 import { By } from '@angular/platform-browser';
 import { createRelationshipsObservable } from '../item-types/shared/item.component.spec';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { RelationshipService } from '../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { TranslateModule } from '@ngx-translate/core';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { of as observableOf } from 'rxjs';
@@ -28,7 +28,7 @@ const mockItem2: Item = Object.assign(new Item(), {
 });
 const mockItems = [mockItem1, mockItem2];
 const relationType = 'isItemOfItem';
-let relationshipService: RelationshipService;
+let relationshipService: RelationshipDataService;
 
 describe('RelatedItemsComponent', () => {
   let comp: RelatedItemsComponent;
@@ -45,7 +45,7 @@ describe('RelatedItemsComponent', () => {
       imports: [TranslateModule.forRoot()],
       declarations: [RelatedItemsComponent, VarDirective],
       providers: [
-        { provide: RelationshipService, useValue: relationshipService }
+        { provide: RelationshipDataService, useValue: relationshipService }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(RelatedItemsComponent, {
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts
index e80b75d649..86d99fb841 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts
@@ -7,7 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 import { createPaginatedList, createTestComponent } from '../../../shared/testing/utils.test';
 import { MyDSpaceNewExternalDropdownComponent } from './my-dspace-new-external-dropdown.component';
-import { EntityTypeService } from '../../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
 import { ResourceType } from '../../../core/shared/resource-type';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
@@ -15,7 +15,7 @@ import { PageInfo } from '../../../core/shared/page-info.model';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { BrowserOnlyMockPipe } from '../../../shared/testing/browser-only-mock.pipe';
 
-export function getMockEntityTypeService(): EntityTypeService {
+export function getMockEntityTypeService(): EntityTypeDataService {
   const pageInfo = { elementsPerPage: 20, totalElements: 4, totalPages: 1, currentPage: 0 } as PageInfo;
   const type1: ItemType = {
     id: '1',
@@ -45,7 +45,7 @@ export function getMockEntityTypeService(): EntityTypeService {
   });
 }
 
-export function getMockEmptyEntityTypeService(): EntityTypeService {
+export function getMockEmptyEntityTypeService(): EntityTypeDataService {
   const pageInfo = { elementsPerPage: 20, totalElements: 1, totalPages: 1, currentPage: 0 } as PageInfo;
   const type1: ItemType = {
     id: '1',
@@ -88,7 +88,7 @@ describe('MyDSpaceNewExternalDropdownComponent test', () => {
           BrowserOnlyMockPipe
         ],
         providers: [
-          { provide: EntityTypeService, useValue: getMockEmptyEntityTypeService() },
+          { provide: EntityTypeDataService, useValue: getMockEmptyEntityTypeService() },
           { provide: Router, useValue: new RouterStub() },
           MyDSpaceNewExternalDropdownComponent
         ],
@@ -140,7 +140,7 @@ describe('MyDSpaceNewExternalDropdownComponent test', () => {
           BrowserOnlyMockPipe,
         ],
         providers: [
-          { provide: EntityTypeService, useValue: getMockEntityTypeService() },
+          { provide: EntityTypeDataService, useValue: getMockEntityTypeService() },
           { provide: Router, useValue: new RouterStub() },
           MyDSpaceNewExternalDropdownComponent
         ],
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
index 012ed22970..53beb746a1 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
@@ -4,7 +4,7 @@ import { Router } from '@angular/router';
 import { Observable, of as observableOf, Subscription } from 'rxjs';
 import { map, mergeMap, take } from 'rxjs/operators';
 
-import { EntityTypeService } from '../../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
 import { hasValue } from '../../../shared/empty.util';
 import { RemoteData } from '../../../core/data/remote-data';
@@ -50,10 +50,10 @@ export class MyDSpaceNewExternalDropdownComponent implements OnInit, OnDestroy {
   /**
    * Initialize instance variables
    *
-   * @param {EntityTypeService} entityTypeService
+   * @param {EntityTypeDataService} entityTypeService
    * @param {Router} router
    */
-  constructor(private entityTypeService: EntityTypeService,
+  constructor(private entityTypeService: EntityTypeDataService,
               private router: Router) { }
 
   /**
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts
index 4d5e3afc30..1ad8e6c0c3 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts
@@ -7,14 +7,14 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { of as observableOf } from 'rxjs';
 import { createPaginatedList, createTestComponent } from '../../../shared/testing/utils.test';
 import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submission-dropdown.component';
-import { EntityTypeService } from '../../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
 import { ResourceType } from '../../../core/shared/resource-type';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { BrowserOnlyMockPipe } from '../../../shared/testing/browser-only-mock.pipe';
 
-export function getMockEntityTypeService(): EntityTypeService {
+export function getMockEntityTypeService(): EntityTypeDataService {
   const type1: ItemType = {
     id: '1',
     label: 'Publication',
@@ -43,7 +43,7 @@ export function getMockEntityTypeService(): EntityTypeService {
   });
 }
 
-export function getMockEmptyEntityTypeService(): EntityTypeService {
+export function getMockEmptyEntityTypeService(): EntityTypeDataService {
   const pageInfo = { elementsPerPage: 20, totalElements: 1, totalPages: 1, currentPage: 0 } as PageInfo;
   const type1: ItemType = {
     id: '1',
@@ -92,7 +92,7 @@ describe('MyDSpaceNewSubmissionDropdownComponent test', () => {
           BrowserOnlyMockPipe,
         ],
         providers: [
-          { provide: EntityTypeService, useValue: getMockEmptyEntityTypeService() },
+          { provide: EntityTypeDataService, useValue: getMockEmptyEntityTypeService() },
           { provide: NgbModal, useValue: modalStub },
           MyDSpaceNewSubmissionDropdownComponent
         ],
@@ -144,7 +144,7 @@ describe('MyDSpaceNewSubmissionDropdownComponent test', () => {
           BrowserOnlyMockPipe,
         ],
         providers: [
-          { provide: EntityTypeService, useValue: getMockEntityTypeService() },
+          { provide: EntityTypeDataService, useValue: getMockEntityTypeService() },
           { provide: NgbModal, useValue: modalStub },
           MyDSpaceNewSubmissionDropdownComponent
         ],
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
index 884970bdf3..133086c08b 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
@@ -4,7 +4,7 @@ import { Observable, of as observableOf, Subscription } from 'rxjs';
 import { map, mergeMap, take } from 'rxjs/operators';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
-import { EntityTypeService } from '../../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
 import { hasValue } from '../../../shared/empty.util';
 import { CreateItemParentSelectorComponent } from '../../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
@@ -51,10 +51,10 @@ export class MyDSpaceNewSubmissionDropdownComponent implements OnInit, OnDestroy
   /**
    * Initialize instance variables
    *
-   * @param {EntityTypeService} entityTypeService
+   * @param {EntityTypeDataService} entityTypeService
    * @param {NgbModal} modalService
    */
-  constructor(private entityTypeService: EntityTypeService,
+  constructor(private entityTypeService: EntityTypeDataService,
               private modalService: NgbModal) { }
 
   /**
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts
index 4ce6d7c81b..fb43c253eb 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts
@@ -25,7 +25,7 @@ import { CookieService } from '../../core/services/cookie.service';
 import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
 import { HttpXsrfTokenExtractorMock } from '../../shared/mocks/http-xsrf-token-extractor.mock';
 import { getMockEntityTypeService } from './my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec';
-import { EntityTypeService } from '../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
 
 describe('MyDSpaceNewSubmissionComponent test', () => {
 
@@ -63,7 +63,7 @@ describe('MyDSpaceNewSubmissionComponent test', () => {
         { provide: HttpXsrfTokenExtractor, useValue: new HttpXsrfTokenExtractorMock('mock-token') },
         { provide: CookieService, useValue: new CookieServiceMock() },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
-        { provide: EntityTypeService, useValue: getMockEntityTypeService() },
+        { provide: EntityTypeDataService, useValue: getMockEntityTypeService() },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts
index c05a55d4ed..9bb0d0a6e2 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts
@@ -11,7 +11,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
-import { ResearcherProfileService } from '../../core/profile/researcher-profile.service';
+import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
 import { VarDirective } from '../../shared/utils/var.directive';
 import { ProfilePageResearcherFormComponent } from './profile-page-researcher-form.component';
 import { ProfileClaimService } from '../profile-claim/profile-claim.service';
@@ -28,7 +28,7 @@ describe('ProfilePageResearcherFormComponent', () => {
   let user: EPerson;
   let profile: ResearcherProfile;
 
-  let researcherProfileService: jasmine.SpyObj<ResearcherProfileService>;
+  let researcherProfileService: jasmine.SpyObj<ResearcherProfileDataService>;
 
   let notificationsServiceStub: NotificationsServiceStub;
 
@@ -75,7 +75,7 @@ describe('ProfilePageResearcherFormComponent', () => {
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
         NgbModal,
-        { provide: ResearcherProfileService, useValue: researcherProfileService },
+        { provide: ResearcherProfileDataService, useValue: researcherProfileService },
         { provide: NotificationsService, useValue: notificationsServiceStub },
         { provide: ProfileClaimService, useValue: profileClaimService },
         { provide: AuthService, useValue: authService }
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
index 8b90b0376f..3f73ebf338 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
@@ -12,7 +12,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { AuthService } from '../../core/auth/auth.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
-import { ResearcherProfileService } from '../../core/profile/researcher-profile.service';
+import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
 import { ProfileClaimService } from '../profile-claim/profile-claim.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { isNotEmpty } from '../../shared/empty.util';
@@ -56,7 +56,7 @@ export class ProfilePageResearcherFormComponent implements OnInit {
    */
   researcherProfileItemId: string;
 
-  constructor(protected researcherProfileService: ResearcherProfileService,
+  constructor(protected researcherProfileService: ResearcherProfileDataService,
               protected profileClaimService: ProfileClaimService,
               protected translationService: TranslateService,
               protected notificationService: NotificationsService,
diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.spec.ts b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.spec.ts
index 168517b47a..5d589187b9 100644
--- a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.spec.ts
+++ b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.spec.ts
@@ -9,7 +9,7 @@ import { AuthorizationDataService } from '../../../core/data/feature-authorizati
 import { NotificationsService } from '../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
-import { ResearcherProfileService } from '../../../core/profile/researcher-profile.service';
+import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
 import { RouteService } from '../../../core/services/route.service';
 import { routeServiceStub } from '../../testing/route-service.stub';
 import { Item } from '../../../core/shared/item.model';
@@ -102,7 +102,7 @@ describe('PersonPageClaimButtonComponent', () => {
       providers: [
         { provide: AuthorizationDataService, useValue: authorizationDataService },
         { provide: NotificationsService, useValue: notificationsService },
-        { provide: ResearcherProfileService, useValue: researcherProfileService },
+        { provide: ResearcherProfileDataService, useValue: researcherProfileService },
         { provide: RouteService, useValue: routeServiceStub },
       ]
     })
diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.ts b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.ts
index 903b9d3679..f0071d0a41 100644
--- a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.ts
+++ b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.ts
@@ -7,7 +7,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { RouteService } from '../../../core/services/route.service';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { NotificationsService } from '../../notifications/notifications.service';
-import { ResearcherProfileService } from '../../../core/profile/researcher-profile.service';
+import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { RemoteData } from '../../../core/data/remote-data';
@@ -36,7 +36,7 @@ export class PersonPageClaimButtonComponent implements OnInit {
               protected authorizationService: AuthorizationDataService,
               protected notificationsService: NotificationsService,
               protected translate: TranslateService,
-              protected researcherProfileService: ResearcherProfileService) {
+              protected researcherProfileService: ResearcherProfileDataService) {
   }
 
   ngOnInit(): void {
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts b/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts
index 6f469f0229..13e6dbc9c5 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts
@@ -4,7 +4,7 @@ import { getTestScheduler } from 'jasmine-marbles';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { ItemType } from '../../core/shared/item-relationships/item-type.model';
 import { ChangeDetectorRef, NO_ERRORS_SCHEMA, Pipe, PipeTransform } from '@angular/core';
-import { EntityTypeService } from '../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
 import { TestScheduler } from 'rxjs/testing';
 import { By } from '@angular/platform-browser';
 import { createPaginatedList } from '../testing/utils.test';
@@ -75,7 +75,7 @@ describe('EntityDropdownComponent', () => {
       imports: [],
       declarations: [EntityDropdownComponent, MockTranslatePipe],
       providers: [
-        { provide: EntityTypeService, useValue: entityTypeServiceMock },
+        { provide: EntityTypeDataService, useValue: entityTypeServiceMock },
         ChangeDetectorRef
       ],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.ts b/src/app/shared/entity-dropdown/entity-dropdown.component.ts
index f4068b1abc..e009463dcd 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.ts
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.ts
@@ -14,7 +14,7 @@ import { hasValue } from '../empty.util';
 import { reduce, startWith, switchMap } from 'rxjs/operators';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
-import { EntityTypeService } from '../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
 import { ItemType } from '../../core/shared/item-relationships/item-type.model';
 import { getFirstSucceededRemoteWithNotEmptyData } from '../../core/shared/operators';
 import { FindListOptions } from '../../core/data/find-list-options.model';
@@ -83,12 +83,12 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
    * Initialize instance variables
    *
    * @param {ChangeDetectorRef} changeDetectorRef
-   * @param {EntityTypeService} entityTypeService
+   * @param {EntityTypeDataService} entityTypeService
    * @param {ElementRef} el
    */
   constructor(
     private changeDetectorRef: ChangeDetectorRef,
-    private entityTypeService: EntityTypeService,
+    private entityTypeService: EntityTypeDataService,
     private el: ElementRef
   ) { }
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
index ffc4df244e..e0e519aaa9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
@@ -66,7 +66,7 @@ import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-gr
 import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components';
 import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component';
 import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
-import { RelationshipService } from '../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
 import { Store } from '@ngrx/store';
@@ -215,11 +215,11 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
         DsDynamicFormControlContainerComponent,
         DynamicFormService,
         { provide: DsDynamicTypeBindRelationService, useValue: getMockDsDynamicTypeBindRelationService() },
-        { provide: RelationshipService, useValue: {} },
+        { provide: RelationshipDataService, useValue: {} },
         { provide: SelectableListService, useValue: {} },
         { provide: ItemDataService, useValue: {} },
         { provide: Store, useValue: {} },
-        { provide: RelationshipService, useValue: {} },
+        { provide: RelationshipDataService, useValue: {} },
         { provide: SelectableListService, useValue: {} },
         { provide: FormService, useValue: {} },
         { provide: FormBuilderService, useValue: {} },
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index 25f650ea7e..812735e69c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -85,7 +85,7 @@ import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relatio
 import { SearchResult } from '../../../search/models/search-result.model';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { RelationshipService } from '../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
 import { DsDynamicDisabledComponent } from './models/disabled/dynamic-disabled.component';
 import { DYNAMIC_FORM_CONTROL_TYPE_DISABLED } from './models/disabled/dynamic-disabled.model';
@@ -244,7 +244,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
     protected translateService: TranslateService,
     protected relationService: DynamicFormRelationService,
     private modalService: NgbModal,
-    private relationshipService: RelationshipService,
+    private relationshipService: RelationshipDataService,
     private selectableListService: SelectableListService,
     private itemService: ItemDataService,
     private zone: NgZone,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
index 9ba204df78..9d57296f82 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
@@ -6,8 +6,8 @@ import { of as observableOf, Subscription } from 'rxjs';
 import { DsDynamicLookupRelationModalComponent } from './dynamic-lookup-relation-modal.component';
 import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
-import { RelationshipService } from '../../../../../core/data/relationship.service';
-import { RelationshipTypeService } from '../../../../../core/data/relationship-type.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
+import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
 import { Store } from '@ngrx/store';
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
@@ -18,7 +18,7 @@ import { PaginatedSearchOptions } from '../../../../search/models/paginated-sear
 import { ExternalSource } from '../../../../../core/shared/external-source.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { createPaginatedList } from '../../../../testing/utils.test';
-import { ExternalSourceService } from '../../../../../core/data/external-source.service';
+import { ExternalSourceDataService } from '../../../../../core/data/external-source-data.service';
 import { LookupRelationService } from '../../../../../core/data/lookup-relation.service';
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
@@ -111,15 +111,15 @@ describe('DsDynamicLookupRelationModalComponent', () => {
             paginatedSearchOptions: observableOf(pSearchOptions)
           }
         },
-        { provide: ExternalSourceService, useValue: externalSourceService },
+        { provide: ExternalSourceDataService, useValue: externalSourceService },
         { provide: LookupRelationService, useValue: lookupRelationService },
         {
           provide: SelectableListService, useValue: selectableListService
         },
         {
-          provide: RelationshipService, useValue: { getNameVariant: () => observableOf(nameVariant) }
+          provide: RelationshipDataService, useValue: { getNameVariant: () => observableOf(nameVariant) }
         },
-        { provide: RelationshipTypeService, useValue: {} },
+        { provide: RelationshipTypeDataService, useValue: {} },
         { provide: RemoteDataBuildService, useValue: rdbService },
         {
           provide: Store, useValue: {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index f871861551..446497a74f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -16,14 +16,14 @@ import {
   RemoveRelationshipAction,
   UpdateRelationshipNameVariantAction,
 } from './relationship.actions';
-import { RelationshipService } from '../../../../../core/data/relationship.service';
-import { RelationshipTypeService } from '../../../../../core/data/relationship-type.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
+import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
 import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../app.reducer';
 import { Context } from '../../../../../core/shared/context.model';
 import { LookupRelationService } from '../../../../../core/data/lookup-relation.service';
 import { ExternalSource } from '../../../../../core/shared/external-source.model';
-import { ExternalSourceService } from '../../../../../core/data/external-source.service';
+import { ExternalSourceDataService } from '../../../../../core/data/external-source-data.service';
 import { Router } from '@angular/router';
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { getAllSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
@@ -156,9 +156,9 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
   constructor(
     public modal: NgbActiveModal,
     private selectableListService: SelectableListService,
-    private relationshipService: RelationshipService,
-    private relationshipTypeService: RelationshipTypeService,
-    private externalSourceService: ExternalSourceService,
+    private relationshipService: RelationshipDataService,
+    private relationshipTypeService: RelationshipTypeDataService,
+    private externalSourceService: ExternalSourceDataService,
     private lookupRelationService: LookupRelationService,
     private searchConfigService: SearchConfigurationService,
     private rdbService: RemoteDataBuildService,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts
index 705e679dfd..3c9b575027 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts
@@ -12,7 +12,7 @@ import {
   createPendingRemoteDataObject$,
   createSuccessfulRemoteDataObject$
 } from '../../../../../remote-data.utils';
-import { ExternalSourceService } from '../../../../../../core/data/external-source.service';
+import { ExternalSourceDataService } from '../../../../../../core/data/external-source-data.service';
 import { ExternalSource } from '../../../../../../core/shared/external-source.model';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { By } from '@angular/platform-browser';
@@ -107,7 +107,7 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
             paginatedSearchOptions: observableOf(pSearchOptions)
           }
         },
-        { provide: ExternalSourceService, useValue: externalSourceService },
+        { provide: ExternalSourceDataService, useValue: externalSourceService },
         { provide: SelectableListService, useValue: selectableListService },
         { provide: PaginationService, useValue: new PaginationServiceStub() }
       ],
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
index ca2535cb91..e5ea98e537 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angu
 import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { Router } from '@angular/router';
-import { ExternalSourceService } from '../../../../../../core/data/external-source.service';
+import { ExternalSourceDataService } from '../../../../../../core/data/external-source-data.service';
 import { RemoteData } from '../../../../../../core/data/remote-data';
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
 import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model';
@@ -125,7 +125,7 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
 
   constructor(private router: Router,
               public searchConfigService: SearchConfigurationService,
-              private externalSourceService: ExternalSourceService,
+              private externalSourceService: ExternalSourceDataService,
               private modalService: NgbModal,
               private selectableListService: SelectableListService,
               private paginationService: PaginationService
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts
index e988eba9eb..a5b1b00d75 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts
@@ -6,8 +6,8 @@ import { RelationshipEffects } from './relationship.effects';
 import { AddRelationshipAction, RelationshipActionTypes, RemoveRelationshipAction } from './relationship.actions';
 import { Item } from '../../../../../core/shared/item.model';
 import { MetadataValue } from '../../../../../core/shared/metadata.models';
-import { RelationshipTypeService } from '../../../../../core/data/relationship-type.service';
-import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
 import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
@@ -116,8 +116,8 @@ describe('RelationshipEffects', () => {
       providers: [
         RelationshipEffects,
         provideMockActions(() => actions),
-        { provide: RelationshipTypeService, useValue: mockRelationshipTypeService },
-        { provide: RelationshipService, useValue: mockRelationshipService },
+        { provide: RelationshipTypeDataService, useValue: mockRelationshipTypeService },
+        { provide: RelationshipDataService, useValue: mockRelationshipService },
         {
           provide: SubmissionObjectDataService, useValue: {
             findById: () => createSuccessfulRemoteDataObject$(new WorkspaceItem())
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts
index 16a51d9991..2b9c1c2973 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts
@@ -2,7 +2,7 @@ import { Inject, Injectable } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { filter, map, mergeMap, switchMap, take } from 'rxjs/operators';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
 import {
   getRemoteDataPayload,
   getFirstSucceededRemoteData, DEBOUNCE_TIME_OPERATOR
@@ -18,7 +18,7 @@ import { Item } from '../../../../../core/shared/item.model';
 import { hasNoValue, hasValue, hasValueOperator } from '../../../../empty.util';
 import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
 import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
-import { RelationshipTypeService } from '../../../../../core/data/relationship-type.service';
+import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
 import { SubmissionObjectDataService } from '../../../../../core/submission/submission-object-data.service';
 import { SaveSubmissionSectionFormSuccessAction } from '../../../../../submission/objects/submission-objects.actions';
 import { SubmissionObject } from '../../../../../core/submission/models/submission-object.model';
@@ -150,8 +150,8 @@ export class RelationshipEffects {
     ));
 
   constructor(private actions$: Actions,
-              private relationshipService: RelationshipService,
-              private relationshipTypeService: RelationshipTypeService,
+              private relationshipService: RelationshipDataService,
+              private relationshipTypeService: RelationshipTypeDataService,
               private submissionObjectService: SubmissionObjectDataService,
               private store: Store<SubmissionState>,
               private objectCache: ObjectCacheService,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
index 72c026e42e..f689743156 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
@@ -17,7 +17,7 @@ import { Item } from '../../../../../../core/shared/item.model';
 import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
-import { RelationshipService } from '../../../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../../../core/data/relationship-data.service';
 import { relatedRelationships } from '../../../../../testing/related-relationships.mock';
 import { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model';
 import { SearchObjects } from '../../../../../search/models/search-objects.model';
@@ -106,7 +106,7 @@ describe('DsDynamicLookupRelationSearchTabComponent', () => {
         },
         { provide: LookupRelationService, useValue: lookupRelationService },
         { provide: PaginationService, useValue: new PaginationServiceStub() },
-        { provide: RelationshipService, useValue: relationshipService }
+        { provide: RelationshipDataService, useValue: relationshipService }
 
       ],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
index fd1092d748..cd4a8f7690 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -17,7 +17,7 @@ import { CollectionElementLinkType } from '../../../../../object-collection/coll
 import { Context } from '../../../../../../core/shared/context.model';
 import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { RelationshipService } from '../../../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../../../core/data/relationship-data.service';
 import { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model';
 
 import { Relationship } from '../../../../../../core/shared/item-relationships/relationship.model';
@@ -151,7 +151,7 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
     private selectableListService: SelectableListService,
     public searchConfigService: SearchConfigurationService,
     public lookupRelationService: LookupRelationService,
-    private relationshipService: RelationshipService,
+    private relationshipService: RelationshipDataService,
     private paginationService: PaginationService
   ) {
   }
diff --git a/src/app/shared/mocks/external-source.service.mock.ts b/src/app/shared/mocks/external-source.service.mock.ts
index f1afed19af..018f57d5f3 100644
--- a/src/app/shared/mocks/external-source.service.mock.ts
+++ b/src/app/shared/mocks/external-source.service.mock.ts
@@ -1,4 +1,4 @@
-import { ExternalSourceService } from '../../core/data/external-source.service';
+import { ExternalSourceDataService } from '../../core/data/external-source-data.service';
 import { ExternalSource } from '../../core/shared/external-source.model';
 import { ResourceType } from '../../core/shared/resource-type';
 
@@ -59,7 +59,7 @@ export const externalSourceMyStaffDb: ExternalSource = {
 /**
  * Mock for [[ExternalSourceService]]
  */
-export function getMockExternalSourceService(): ExternalSourceService {
+export function getMockExternalSourceService(): ExternalSourceDataService {
   return jasmine.createSpyObj('ExternalSourceService', {
     findAll: jasmine.createSpy('findAll'),
     searchBy: jasmine.createSpy('searchBy'),
diff --git a/src/app/shared/mocks/mock-resource-policy-service.ts b/src/app/shared/mocks/mock-resource-policy-service.ts
index 864cf20730..2cf73561e5 100644
--- a/src/app/shared/mocks/mock-resource-policy-service.ts
+++ b/src/app/shared/mocks/mock-resource-policy-service.ts
@@ -1,6 +1,6 @@
-import { ResourcePolicyService } from '../../core/resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
 
-export function getMockResourcePolicyService(): ResourcePolicyService {
+export function getMockResourcePolicyService(): ResourcePolicyDataService {
   return jasmine.createSpyObj('resourcePolicyService', {
     searchByResource: jasmine.createSpy('searchByResource'),
     create: jasmine.createSpy('create'),
diff --git a/src/app/shared/mocks/section-accesses-config.service.mock.ts b/src/app/shared/mocks/section-accesses-config.service.mock.ts
index 1ab9565acc..cc852b86a5 100644
--- a/src/app/shared/mocks/section-accesses-config.service.mock.ts
+++ b/src/app/shared/mocks/section-accesses-config.service.mock.ts
@@ -1,4 +1,4 @@
-import { SubmissionFormsConfigService } from '../../core/config/submission-forms-config.service';
+import { SubmissionFormsConfigDataService } from '../../core/config/submission-forms-config-data.service';
 import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 
@@ -73,14 +73,14 @@ const configResNotChangeDiscoverable = Object.assign(new SubmissionFormsModel(),
   }
 });
 
-export function getSubmissionAccessesConfigService(): SubmissionFormsConfigService {
+export function getSubmissionAccessesConfigService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('SubmissionAccessesConfigService', {
     findByHref: createSuccessfulRemoteDataObject$(configRes),
   });
 }
 
 
-export function getSubmissionAccessesConfigNotChangeDiscoverableService(): SubmissionFormsConfigService {
+export function getSubmissionAccessesConfigNotChangeDiscoverableService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('SubmissionAccessesConfigService', {
     findByHref: createSuccessfulRemoteDataObject$(configResNotChangeDiscoverable),
   });
diff --git a/src/app/shared/mocks/section-upload.service.mock.ts b/src/app/shared/mocks/section-upload.service.mock.ts
index 9098fa64c0..ae3515105d 100644
--- a/src/app/shared/mocks/section-upload.service.mock.ts
+++ b/src/app/shared/mocks/section-upload.service.mock.ts
@@ -1,9 +1,9 @@
-import { SubmissionFormsConfigService } from '../../core/config/submission-forms-config.service';
+import { SubmissionFormsConfigDataService } from '../../core/config/submission-forms-config-data.service';
 
 /**
  * Mock for [[SubmissionFormsConfigService]]
  */
-export function getMockSectionUploadService(): SubmissionFormsConfigService {
+export function getMockSectionUploadService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('SectionUploadService', {
     getUploadedFileList: jasmine.createSpy('getUploadedFileList'),
     getFileData: jasmine.createSpy('getFileData'),
diff --git a/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts b/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts
index e1ffb00de0..b60e7f64c0 100644
--- a/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts
+++ b/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts
@@ -17,7 +17,7 @@ import { ResourcePolicyCreateComponent } from './resource-policy-create.componen
 import { LinkService } from '../../../core/cache/builders/link.service';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
 import { getMockResourcePolicyService } from '../../mocks/mock-resource-policy-service';
 import { getMockLinkService } from '../../mocks/link-service.mock';
 import { RouterStub } from '../../testing/router.stub';
@@ -100,7 +100,7 @@ describe('ResourcePolicyCreateComponent test suite', () => {
         { provide: LinkService, useValue: linkService },
         { provide: ActivatedRoute, useValue: routeStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
-        { provide: ResourcePolicyService, useValue: resourcePolicyService },
+        { provide: ResourcePolicyDataService, useValue: resourcePolicyService },
         { provide: Router, useValue: routerStub },
         ResourcePolicyCreateComponent,
         ChangeDetectorRef,
diff --git a/src/app/shared/resource-policies/create/resource-policy-create.component.ts b/src/app/shared/resource-policies/create/resource-policy-create.component.ts
index 24abd05a86..236351571f 100644
--- a/src/app/shared/resource-policies/create/resource-policy-create.component.ts
+++ b/src/app/shared/resource-policies/create/resource-policy-create.component.ts
@@ -6,7 +6,7 @@ import { map, take } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
@@ -42,7 +42,7 @@ export class ResourcePolicyCreateComponent implements OnInit {
    *
    * @param {DSONameService} dsoNameService
    * @param {NotificationsService} notificationsService
-   * @param {ResourcePolicyService} resourcePolicyService
+   * @param {ResourcePolicyDataService} resourcePolicyService
    * @param {ActivatedRoute} route
    * @param {Router} router
    * @param {TranslateService} translate
@@ -50,7 +50,7 @@ export class ResourcePolicyCreateComponent implements OnInit {
   constructor(
     private dsoNameService: DSONameService,
     private notificationsService: NotificationsService,
-    private resourcePolicyService: ResourcePolicyService,
+    private resourcePolicyService: ResourcePolicyDataService,
     private route: ActivatedRoute,
     private router: Router,
     private translate: TranslateService) {
diff --git a/src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts b/src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts
index e9d1edbdc5..ff473d5c49 100644
--- a/src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts
+++ b/src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts
@@ -12,7 +12,7 @@ import { createTestComponent } from '../../testing/utils.test';
 import { LinkService } from '../../../core/cache/builders/link.service';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
 import { getMockResourcePolicyService } from '../../mocks/mock-resource-policy-service';
 import { getMockLinkService } from '../../mocks/link-service.mock';
 import { RouterStub } from '../../testing/router.stub';
@@ -82,7 +82,7 @@ describe('ResourcePolicyEditComponent test suite', () => {
         { provide: LinkService, useValue: linkService },
         { provide: ActivatedRoute, useValue: routeStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
-        { provide: ResourcePolicyService, useValue: resourcePolicyService },
+        { provide: ResourcePolicyDataService, useValue: resourcePolicyService },
         { provide: Router, useValue: routerStub },
         ResourcePolicyEditComponent,
         ChangeDetectorRef,
diff --git a/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts b/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts
index 1c5a0c4a5f..a16f409bcb 100644
--- a/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts
+++ b/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts
@@ -5,7 +5,7 @@ import { BehaviorSubject, Observable, of, combineLatest as observableCombineLate
 import { map, take } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 
-import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
@@ -35,14 +35,14 @@ export class ResourcePolicyEditComponent implements OnInit {
    * Initialize instance variables
    *
    * @param {NotificationsService} notificationsService
-   * @param {ResourcePolicyService} resourcePolicyService
+   * @param {ResourcePolicyDataService} resourcePolicyService
    * @param {ActivatedRoute} route
    * @param {Router} router
    * @param {TranslateService} translate
    */
   constructor(
     private notificationsService: NotificationsService,
-    private resourcePolicyService: ResourcePolicyService,
+    private resourcePolicyService: ResourcePolicyDataService,
     private route: ActivatedRoute,
     private router: Router,
     private translate: TranslateService) {
diff --git a/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts b/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts
index ad49f83639..3b7ac692fb 100644
--- a/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts
+++ b/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts
@@ -6,7 +6,7 @@ import { Observable } from 'rxjs';
 import { isEmpty } from '../../empty.util';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
-import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
 import { followLink } from '../../utils/follow-link-config.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
@@ -16,7 +16,7 @@ import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 @Injectable()
 export class ResourcePolicyResolver implements Resolve<RemoteData<ResourcePolicy>> {
 
-  constructor(private resourcePolicyService: ResourcePolicyService, private router: Router) {
+  constructor(private resourcePolicyService: ResourcePolicyDataService, private router: Router) {
   }
 
   /**
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..e9b875fb2b 100644
--- a/src/app/shared/resource-policies/resource-policies.component.spec.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.spec.ts
@@ -20,7 +20,7 @@ import { createPaginatedList, createTestComponent } from '../testing/utils.test'
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { NotificationsService } from '../notifications/notifications.service';
 import { NotificationsServiceStub } from '../testing/notifications-service.stub';
-import { ResourcePolicyService } from '../../core/resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
 import { getMockResourcePolicyService } from '../mocks/mock-resource-policy-service';
 import { GroupDataService } from '../../core/eperson/group-data.service';
 import { RequestService } from '../../core/data/request.service';
@@ -206,7 +206,7 @@ describe('ResourcePoliciesComponent test suite', () => {
         { provide: EPersonDataService, useValue: epersonService },
         { provide: GroupDataService, useValue: groupService },
         { provide: NotificationsService, useValue: notificationsServiceStub },
-        { provide: ResourcePolicyService, useValue: resourcePolicyService },
+        { provide: ResourcePolicyDataService, useValue: resourcePolicyService },
         { provide: RequestService, useValue: getMockRequestService() },
         { provide: Router, useValue: routerStub },
         ChangeDetectorRef,
diff --git a/src/app/shared/resource-policies/resource-policies.component.ts b/src/app/shared/resource-policies/resource-policies.component.ts
index cf291977d6..ae7808fa2f 100644
--- a/src/app/shared/resource-policies/resource-policies.component.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.ts
@@ -14,7 +14,7 @@ import {
 } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 
-import { ResourcePolicyService } from '../../core/resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
 import {
   getFirstSucceededRemoteDataPayload,
   getFirstSucceededRemoteDataWithNotEmptyPayload,
@@ -102,7 +102,7 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
    * @param {GroupDataService} groupService
    * @param {NotificationsService} notificationsService
    * @param {RequestService} requestService
-   * @param {ResourcePolicyService} resourcePolicyService
+   * @param {ResourcePolicyDataService} resourcePolicyService
    * @param {ActivatedRoute} route
    * @param {Router} router
    * @param {TranslateService} translate
@@ -114,7 +114,7 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
     private groupService: GroupDataService,
     private notificationsService: NotificationsService,
     private requestService: RequestService,
-    private resourcePolicyService: ResourcePolicyService,
+    private resourcePolicyService: ResourcePolicyDataService,
     private route: ActivatedRoute,
     private router: Router,
     private translate: TranslateService
diff --git a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts
index ec91864e41..d5bb80dfde 100644
--- a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts
+++ b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts
@@ -3,7 +3,7 @@ import { CollectionStatisticsPageComponent } from './collection-statistics-page.
 import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { of as observableOf } from 'rxjs';
 import { Collection } from '../../core/shared/collection.model';
 import { DebugElement } from '@angular/core';
@@ -74,7 +74,7 @@ describe('CollectionStatisticsPageComponent', () => {
       providers: [
         { provide: ActivatedRoute, useValue: activatedRoute },
         { provide: Router, useValue: router },
-        { provide: UsageReportService, useValue: usageReportService },
+        { provide: UsageReportDataService, useValue: usageReportService },
         { provide: DSpaceObjectDataService, useValue: {} },
         { provide: DSONameService, useValue: nameService },
         { provide: AuthService, useValue: authService },
diff --git a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts
index 41ee47ff88..4875ce39cd 100644
--- a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts
+++ b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
-import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { ActivatedRoute , Router} from '@angular/router';
 import { Collection } from '../../core/shared/collection.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
@@ -29,7 +29,7 @@ export class CollectionStatisticsPageComponent extends StatisticsPageComponent<C
   constructor(
     protected route: ActivatedRoute,
     protected router: Router,
-    protected usageReportService: UsageReportService,
+    protected usageReportService: UsageReportDataService,
     protected nameService: DSONameService,
     protected authService: AuthService
   ) {
diff --git a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts
index 275c22f760..2e63f83b8f 100644
--- a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts
+++ b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts
@@ -3,7 +3,7 @@ import { CommunityStatisticsPageComponent } from './community-statistics-page.co
 import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { of as observableOf } from 'rxjs';
 import { Community } from '../../core/shared/community.model';
 import { DebugElement } from '@angular/core';
@@ -74,7 +74,7 @@ describe('CommunityStatisticsPageComponent', () => {
       providers: [
         { provide: ActivatedRoute, useValue: activatedRoute },
         { provide: Router, useValue: router },
-        { provide: UsageReportService, useValue: usageReportService },
+        { provide: UsageReportDataService, useValue: usageReportService },
         { provide: DSpaceObjectDataService, useValue: {} },
         { provide: DSONameService, useValue: nameService },
         { provide: AuthService, useValue: authService },
diff --git a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts
index 1a1c8fdf0e..de7a8bbf8c 100644
--- a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts
+++ b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
-import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Community } from '../../core/shared/community.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
@@ -29,7 +29,7 @@ export class CommunityStatisticsPageComponent extends StatisticsPageComponent<Co
   constructor(
     protected route: ActivatedRoute,
     protected router: Router,
-    protected usageReportService: UsageReportService,
+    protected usageReportService: UsageReportDataService,
     protected nameService: DSONameService,
     protected authService: AuthService,
   ) {
diff --git a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts
index 357f39ca96..88bbca3fba 100644
--- a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts
+++ b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts
@@ -3,7 +3,7 @@ import { ItemStatisticsPageComponent } from './item-statistics-page.component';
 import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { of as observableOf } from 'rxjs';
 import { Item } from '../../core/shared/item.model';
 import { DebugElement } from '@angular/core';
@@ -74,7 +74,7 @@ describe('ItemStatisticsPageComponent', () => {
       providers: [
         { provide: ActivatedRoute, useValue: activatedRoute },
         { provide: Router, useValue: router },
-        { provide: UsageReportService, useValue: usageReportService },
+        { provide: UsageReportDataService, useValue: usageReportService },
         { provide: DSpaceObjectDataService, useValue: {} },
         { provide: DSONameService, useValue: nameService },
         { provide: AuthService, useValue: authService },
diff --git a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts
index 69a8361a46..f5f107af74 100644
--- a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts
+++ b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
-import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Item } from '../../core/shared/item.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
@@ -30,7 +30,7 @@ export class ItemStatisticsPageComponent extends StatisticsPageComponent<Item> {
   constructor(
     protected route: ActivatedRoute,
     protected router: Router,
-    protected usageReportService: UsageReportService,
+    protected usageReportService: UsageReportDataService,
     protected nameService: DSONameService,
     protected authService: AuthService
   ) {
diff --git a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts
index dedc026df0..3c181c1816 100644
--- a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts
+++ b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts
@@ -3,7 +3,7 @@ import { SiteStatisticsPageComponent } from './site-statistics-page.component';
 import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { of as observableOf } from 'rxjs';
 import { Site } from '../../core/shared/site.model';
 import { DebugElement } from '@angular/core';
@@ -74,7 +74,7 @@ describe('SiteStatisticsPageComponent', () => {
       providers: [
         { provide: ActivatedRoute, useValue: activatedRoute },
         { provide: Router, useValue: router },
-        { provide: UsageReportService, useValue: usageReportService },
+        { provide: UsageReportDataService, useValue: usageReportService },
         { provide: DSpaceObjectDataService, useValue: {} },
         { provide: DSONameService, useValue: nameService },
         { provide: SiteDataService, useValue: siteService },
diff --git a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts
index 59f1be330c..5eb19bec56 100644
--- a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts
+++ b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
 import { SiteDataService } from '../../core/data/site-data.service';
-import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Site } from '../../core/shared/site.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
@@ -28,7 +28,7 @@ export class SiteStatisticsPageComponent extends StatisticsPageComponent<Site> {
   constructor(
     protected route: ActivatedRoute,
     protected router: Router,
-    protected usageReportService: UsageReportService,
+    protected usageReportService: UsageReportDataService,
     protected nameService: DSONameService,
     protected siteService: SiteDataService,
     protected authService: AuthService,
diff --git a/src/app/statistics-page/statistics-page.module.ts b/src/app/statistics-page/statistics-page.module.ts
index 863e17fcb5..75726de94c 100644
--- a/src/app/statistics-page/statistics-page.module.ts
+++ b/src/app/statistics-page/statistics-page.module.ts
@@ -4,7 +4,7 @@ import { CommonModule } from '@angular/common';
 import { CoreModule } from '../core/core.module';
 import { SharedModule } from '../shared/shared.module';
 import { StatisticsModule } from '../statistics/statistics.module';
-import { UsageReportService } from '../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../core/statistics/usage-report-data.service';
 import { SiteStatisticsPageComponent } from './site-statistics-page/site-statistics-page.component';
 import { StatisticsTableComponent } from './statistics-table/statistics-table.component';
 import { ItemStatisticsPageComponent } from './item-statistics-page/item-statistics-page.component';
@@ -36,7 +36,7 @@ const components = [
   ],
   declarations: components,
   providers: [
-    UsageReportService,
+    UsageReportDataService,
   ],
   exports: components
 })
diff --git a/src/app/statistics-page/statistics-page/statistics-page.component.ts b/src/app/statistics-page/statistics-page/statistics-page.component.ts
index 7aceb5c9b7..8b91d54ae8 100644
--- a/src/app/statistics-page/statistics-page/statistics-page.component.ts
+++ b/src/app/statistics-page/statistics-page/statistics-page.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { combineLatest, Observable } from 'rxjs';
-import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { map, switchMap } from 'rxjs/operators';
 import { UsageReport } from '../../core/statistics/models/usage-report.model';
 import { RemoteData } from '../../core/data/remote-data';
@@ -43,7 +43,7 @@ export abstract class StatisticsPageComponent<T extends DSpaceObject> implements
   constructor(
     protected route: ActivatedRoute,
     protected router: Router,
-    protected usageReportService: UsageReportService,
+    protected usageReportService: UsageReportDataService,
     protected nameService: DSONameService,
     protected authService: AuthService,
   ) {
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts
index 8f7a8f7ec5..e1f59c3a5e 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts
@@ -6,7 +6,7 @@ import {
   SourceElement,
   SubmissionImportExternalSearchbarComponent
 } from './submission-import-external-searchbar.component';
-import { ExternalSourceService } from '../../../core/data/external-source.service';
+import { ExternalSourceDataService } from '../../../core/data/external-source-data.service';
 import { createTestComponent } from '../../../shared/testing/utils.test';
 import {
   externalSourceCiencia,
@@ -48,7 +48,7 @@ describe('SubmissionImportExternalSearchbarComponent test suite', () => {
         TestComponent,
       ],
       providers: [
-        { provide: ExternalSourceService, useValue: mockExternalSourceService },
+        { provide: ExternalSourceDataService, useValue: mockExternalSourceService },
         ChangeDetectorRef,
         { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
         SubmissionImportExternalSearchbarComponent
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
index 1df6ae2a1a..522d71cc22 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
@@ -4,7 +4,7 @@ import { Observable, of as observableOf, Subscription } from 'rxjs';
 import { catchError, tap } from 'rxjs/operators';
 
 import { RequestParam } from '../../../core/cache/models/request-param.model';
-import { ExternalSourceService } from '../../../core/data/external-source.service';
+import { ExternalSourceDataService } from '../../../core/data/external-source-data.service';
 import { ExternalSource } from '../../../core/shared/external-source.model';
 import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
@@ -86,12 +86,12 @@ export class SubmissionImportExternalSearchbarComponent implements OnInit, OnDes
 
   /**
    * Initialize the component variables.
-   * @param {ExternalSourceService} externalService
+   * @param {ExternalSourceDataService} externalService
    * @param {ChangeDetectorRef} cdr
    * @param {HostWindowService} windowService
    */
   constructor(
-    private externalService: ExternalSourceService,
+    private externalService: ExternalSourceDataService,
     private cdr: ChangeDetectorRef,
     protected windowService: HostWindowService
   ) {
diff --git a/src/app/submission/import-external/submission-import-external.component.spec.ts b/src/app/submission/import-external/submission-import-external.component.spec.ts
index dc53b2e45f..3ee962932a 100644
--- a/src/app/submission/import-external/submission-import-external.component.spec.ts
+++ b/src/app/submission/import-external/submission-import-external.component.spec.ts
@@ -9,7 +9,7 @@ import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
 import { SubmissionImportExternalComponent } from './submission-import-external.component';
-import { ExternalSourceService } from '../../core/data/external-source.service';
+import { ExternalSourceDataService } from '../../core/data/external-source-data.service';
 import { getMockExternalSourceService } from '../../shared/mocks/external-source.service.mock';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 import { RouteService } from '../../core/services/route.service';
@@ -52,7 +52,7 @@ describe('SubmissionImportExternalComponent test suite', () => {
         VarDirective
       ],
       providers: [
-        { provide: ExternalSourceService, useValue: mockExternalSourceService },
+        { provide: ExternalSourceDataService, useValue: mockExternalSourceService },
         { provide: SearchConfigurationService, useValue: searchConfigServiceStub },
         { provide: RouteService, useValue: routeServiceStub },
         { provide: Router, useValue: new RouterStub() },
diff --git a/src/app/submission/import-external/submission-import-external.component.ts b/src/app/submission/import-external/submission-import-external.component.ts
index 9b89dc71cc..f0a9dca508 100644
--- a/src/app/submission/import-external/submission-import-external.component.ts
+++ b/src/app/submission/import-external/submission-import-external.component.ts
@@ -5,7 +5,7 @@ import { BehaviorSubject, combineLatest, Subscription } from 'rxjs';
 import { filter, mergeMap, switchMap, take, tap } from 'rxjs/operators';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 
-import { ExternalSourceService } from '../../core/data/external-source.service';
+import { ExternalSourceDataService } from '../../core/data/external-source-data.service';
 import { ExternalSourceData } from './import-external-searchbar/submission-import-external-searchbar.component';
 import { RemoteData } from '../../core/data/remote-data';
 import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
@@ -93,14 +93,14 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
   /**
    * Initialize the component variables.
    * @param {SearchConfigurationService} searchConfigService
-   * @param {ExternalSourceService} externalService
+   * @param {ExternalSourceDataService} externalService
    * @param {RouteService} routeService
    * @param {Router} router
    * @param {NgbModal} modalService
    */
   constructor(
     public searchConfigService: SearchConfigurationService,
-    private externalService: ExternalSourceService,
+    private externalService: ExternalSourceDataService,
     private routeService: RouteService,
     private router: Router,
     private modalService: NgbModal,
diff --git a/src/app/submission/sections/accesses/section-accesses.component.spec.ts b/src/app/submission/sections/accesses/section-accesses.component.spec.ts
index 65123db533..c70758a4df 100644
--- a/src/app/submission/sections/accesses/section-accesses.component.spec.ts
+++ b/src/app/submission/sections/accesses/section-accesses.component.spec.ts
@@ -7,7 +7,7 @@ import { SectionsServiceStub } from '../../../shared/testing/sections-service.st
 
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
-import { SubmissionAccessesConfigService } from '../../../core/config/submission-accesses-config.service';
+import { SubmissionAccessesConfigDataService } from '../../../core/config/submission-accesses-config-data.service';
 import {
   getSubmissionAccessesConfigNotChangeDiscoverableService,
   getSubmissionAccessesConfigService
@@ -89,7 +89,7 @@ describe('SubmissionSectionAccessesComponent', () => {
         declarations: [SubmissionSectionAccessesComponent, FormComponent],
         providers: [
           { provide: SectionsService, useValue: sectionsServiceStub },
-          { provide: SubmissionAccessesConfigService, useValue: submissionAccessesConfigService },
+          { provide: SubmissionAccessesConfigDataService, useValue: submissionAccessesConfigService },
           { provide: SectionAccessesService, useValue: sectionAccessesService },
           { provide: SectionFormOperationsService, useValue: sectionFormOperationsService },
           { provide: JsonPatchOperationsBuilder, useValue: operationsBuilder },
@@ -181,7 +181,7 @@ describe('SubmissionSectionAccessesComponent', () => {
         providers: [
           { provide: SectionsService, useValue: sectionsServiceStub },
           { provide: FormBuilderService, useValue: builderService },
-          { provide: SubmissionAccessesConfigService, useValue: getSubmissionAccessesConfigNotChangeDiscoverableService() },
+          { provide: SubmissionAccessesConfigDataService, useValue: getSubmissionAccessesConfigNotChangeDiscoverableService() },
           { provide: SectionAccessesService, useValue: sectionAccessesService },
           { provide: SectionFormOperationsService, useValue: sectionFormOperationsService },
           { provide: JsonPatchOperationsBuilder, useValue: operationsBuilder },
diff --git a/src/app/submission/sections/accesses/section-accesses.component.ts b/src/app/submission/sections/accesses/section-accesses.component.ts
index c59f9af2d0..25106f3ba8 100644
--- a/src/app/submission/sections/accesses/section-accesses.component.ts
+++ b/src/app/submission/sections/accesses/section-accesses.component.ts
@@ -44,7 +44,7 @@ import { hasValue, isNotEmpty, isNotNull } from '../../../shared/empty.util';
 import {
   WorkspaceitemSectionAccessesObject
 } from '../../../core/submission/models/workspaceitem-section-accesses.model';
-import { SubmissionAccessesConfigService } from '../../../core/config/submission-accesses-config.service';
+import { SubmissionAccessesConfigDataService } from '../../../core/config/submission-accesses-config-data.service';
 import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
 import { FormComponent } from '../../../shared/form/form.component';
 import { FormService } from '../../../shared/form/form.service';
@@ -125,7 +125,7 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
    * @param {SectionFormOperationsService} formOperationsService
    * @param {FormBuilderService} formBuilderService
    * @param {TranslateService} translate
-   * @param {SubmissionAccessesConfigService} accessesConfigService
+   * @param {SubmissionAccessesConfigDataService} accessesConfigService
    * @param {SectionAccessesService} accessesService
    * @param {SubmissionJsonPatchOperationsService} operationsService
    * @param {string} injectedSubmissionId
@@ -133,7 +133,7 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
   constructor(
     protected sectionService: SectionsService,
     private formBuilderService: FormBuilderService,
-    private accessesConfigService: SubmissionAccessesConfigService,
+    private accessesConfigService: SubmissionAccessesConfigDataService,
     private accessesService: SectionAccessesService,
     protected formOperationsService: SectionFormOperationsService,
     protected operationsBuilder: JsonPatchOperationsBuilder,
diff --git a/src/app/submission/sections/form/section-form.component.spec.ts b/src/app/submission/sections/form/section-form.component.spec.ts
index beea55968c..8fa821c1d7 100644
--- a/src/app/submission/sections/form/section-form.component.spec.ts
+++ b/src/app/submission/sections/form/section-form.component.spec.ts
@@ -19,7 +19,7 @@ import { getMockFormOperationsService } from '../../../shared/mocks/form-operati
 import { SectionFormOperationsService } from './section-form-operations.service';
 import { getMockFormService } from '../../../shared/mocks/form-service.mock';
 import { FormService } from '../../../shared/form/form.service';
-import { SubmissionFormsConfigService } from '../../../core/config/submission-forms-config.service';
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
 import { SectionDataObject } from '../models/section-data.model';
 import { SectionsType } from '../sections-type';
 import {
@@ -45,7 +45,7 @@ import { cold } from 'jasmine-marbles';
 import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
 import { SubmissionSectionError } from '../../objects/submission-section-error.model';
 
-function getMockSubmissionFormsConfigService(): SubmissionFormsConfigService {
+function getMockSubmissionFormsConfigService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('FormOperationsService', {
     getConfigAll: jasmine.createSpy('getConfigAll'),
     getConfigByHref: jasmine.createSpy('getConfigByHref'),
@@ -173,7 +173,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
         { provide: FormBuilderService, useValue: getMockFormBuilderService() },
         { provide: SectionFormOperationsService, useValue: getMockFormOperationsService() },
         { provide: FormService, useValue: formService },
-        { provide: SubmissionFormsConfigService, useValue: formConfigService },
+        { provide: SubmissionFormsConfigDataService, useValue: formConfigService },
         { provide: NotificationsService, useClass: NotificationsServiceStub },
         { provide: SectionsService, useValue: sectionsServiceStub },
         { provide: SubmissionService, useClass: SubmissionServiceStub },
diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts
index 3fdc3cf486..31c83a8749 100644
--- a/src/app/submission/sections/form/section-form.component.ts
+++ b/src/app/submission/sections/form/section-form.component.ts
@@ -10,7 +10,7 @@ import { FormBuilderService } from '../../../shared/form/builder/form-builder.se
 import { FormComponent } from '../../../shared/form/form.component';
 import { FormService } from '../../../shared/form/form.service';
 import { SectionModelComponent } from '../models/section.model';
-import { SubmissionFormsConfigService } from '../../../core/config/submission-forms-config.service';
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
 import { hasValue, isEmpty, isNotEmpty, isUndefined } from '../../../shared/empty.util';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
@@ -129,7 +129,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
    * @param {FormBuilderService} formBuilderService
    * @param {SectionFormOperationsService} formOperationsService
    * @param {FormService} formService
-   * @param {SubmissionFormsConfigService} formConfigService
+   * @param {SubmissionFormsConfigDataService} formConfigService
    * @param {NotificationsService} notificationsService
    * @param {SectionsService} sectionService
    * @param {SubmissionService} submissionService
@@ -145,7 +145,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
               protected formBuilderService: FormBuilderService,
               protected formOperationsService: SectionFormOperationsService,
               protected formService: FormService,
-              protected formConfigService: SubmissionFormsConfigService,
+              protected formConfigService: SubmissionFormsConfigDataService,
               protected notificationsService: NotificationsService,
               protected sectionService: SectionsService,
               protected submissionService: SubmissionService,
diff --git a/src/app/submission/sections/license/section-license.component.spec.ts b/src/app/submission/sections/license/section-license.component.spec.ts
index f7a3895052..35fea95b8d 100644
--- a/src/app/submission/sections/license/section-license.component.spec.ts
+++ b/src/app/submission/sections/license/section-license.component.spec.ts
@@ -20,7 +20,7 @@ import { FormBuilderService } from '../../../shared/form/builder/form-builder.se
 import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
 import { getMockFormService } from '../../../shared/mocks/form-service.mock';
 import { FormService } from '../../../shared/form/form.service';
-import { SubmissionFormsConfigService } from '../../../core/config/submission-forms-config.service';
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
 import { SectionDataObject } from '../models/section-data.model';
 import { SectionsType } from '../sections-type';
 import {
@@ -53,7 +53,7 @@ const mockCollection = Object.assign(new Collection(), {
   license: createSuccessfulRemoteDataObject$(Object.assign(new License(), { text: licenseText }))
 });
 
-function getMockSubmissionFormsConfigService(): SubmissionFormsConfigService {
+function getMockSubmissionFormsConfigService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('FormOperationsService', {
     getConfigAll: jasmine.createSpy('getConfigAll'),
     getConfigByHref: jasmine.createSpy('getConfigByHref'),
@@ -130,7 +130,7 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
         { provide: SectionFormOperationsService, useValue: getMockFormOperationsService() },
         { provide: FormService, useValue: getMockFormService() },
         { provide: JsonPatchOperationsBuilder, useValue: jsonPatchOpBuilder },
-        { provide: SubmissionFormsConfigService, useValue: getMockSubmissionFormsConfigService() },
+        { provide: SubmissionFormsConfigDataService, useValue: getMockSubmissionFormsConfigService() },
         { provide: NotificationsService, useClass: NotificationsServiceStub },
         { provide: SectionsService, useValue: sectionsServiceStub },
         { provide: SubmissionService, useClass: SubmissionServiceStub },
diff --git a/src/app/submission/sections/upload/section-upload.component.spec.ts b/src/app/submission/sections/upload/section-upload.component.spec.ts
index 214b1134d3..068fc5c766 100644
--- a/src/app/submission/sections/upload/section-upload.component.spec.ts
+++ b/src/app/submission/sections/upload/section-upload.component.spec.ts
@@ -14,7 +14,7 @@ import { SubmissionService } from '../../submission.service';
 import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
 import { SectionsService } from '../sections.service';
 import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
-import { SubmissionFormsConfigService } from '../../../core/config/submission-forms-config.service';
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
 import { SectionDataObject } from '../models/section-data.model';
 import { SectionsType } from '../sections-type';
 import {
@@ -26,21 +26,21 @@ import {
   mockUploadConfigResponseNotRequired,
   mockUploadFiles,
 } from '../../../shared/mocks/submission.mock';
-import { SubmissionUploadsConfigService } from '../../../core/config/submission-uploads-config.service';
+import { SubmissionUploadsConfigDataService } from '../../../core/config/submission-uploads-config-data.service';
 import { SectionUploadService } from './section-upload.service';
 import { SubmissionSectionUploadComponent } from './section-upload.component';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { Collection } from '../../../core/shared/collection.model';
 import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
-import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
 import { Group } from '../../../core/eperson/models/group.model';
 import { getMockSectionUploadService } from '../../../shared/mocks/section-upload.service.mock';
 import { SubmissionUploadsModel } from '../../../core/config/models/config-submission-uploads.model';
 import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../core/shared/page-info.model';
 
-function getMockSubmissionUploadsConfigService(): SubmissionFormsConfigService {
+function getMockSubmissionUploadsConfigService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('SubmissionUploadsConfigService', {
     getConfigAll: jasmine.createSpy('getConfigAll'),
     getConfigByHref: jasmine.createSpy('getConfigByHref'),
@@ -63,7 +63,7 @@ function getMockGroupEpersonService(): GroupDataService {
   });
 }
 
-function getMockResourcePolicyService(): ResourcePolicyService {
+function getMockResourcePolicyService(): ResourcePolicyDataService {
   return jasmine.createSpyObj('ResourcePolicyService', {
     findByHref: jasmine.createSpy('findByHref')
   });
@@ -175,8 +175,8 @@ describe('SubmissionSectionUploadComponent test suite', () => {
       providers: [
         { provide: CollectionDataService, useValue: collectionDataService },
         { provide: GroupDataService, useValue: groupService },
-        { provide: ResourcePolicyService, useValue: resourcePolicyService },
-        { provide: SubmissionUploadsConfigService, useValue: uploadsConfigService },
+        { provide: ResourcePolicyDataService, useValue: resourcePolicyService },
+        { provide: SubmissionUploadsConfigDataService, useValue: uploadsConfigService },
         { provide: SectionsService, useClass: SectionsServiceStub },
         { provide: SubmissionService, useValue: submissionServiceStub },
         { provide: SectionUploadService, useValue: bitstreamService },
diff --git a/src/app/submission/sections/upload/section-upload.component.ts b/src/app/submission/sections/upload/section-upload.component.ts
index 7b8d93ba65..5b89806134 100644
--- a/src/app/submission/sections/upload/section-upload.component.ts
+++ b/src/app/submission/sections/upload/section-upload.component.ts
@@ -13,8 +13,8 @@ import { hasValue, isNotEmpty, isNotUndefined, isUndefined } from '../../../shar
 import { SectionUploadService } from './section-upload.service';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
-import { SubmissionUploadsConfigService } from '../../../core/config/submission-uploads-config.service';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
+import { SubmissionUploadsConfigDataService } from '../../../core/config/submission-uploads-config-data.service';
 import { SubmissionUploadsModel } from '../../../core/config/models/config-submission-uploads.model';
 import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
 import { SectionsType } from '../sections-type';
@@ -123,10 +123,10 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
    * @param {ChangeDetectorRef} changeDetectorRef
    * @param {CollectionDataService} collectionDataService
    * @param {GroupDataService} groupService
-   * @param {ResourcePolicyService} resourcePolicyService
+   * @param {ResourcePolicyDataService} resourcePolicyService
    * @param {SectionsService} sectionService
    * @param {SubmissionService} submissionService
-   * @param {SubmissionUploadsConfigService} uploadsConfigService
+   * @param {SubmissionUploadsConfigDataService} uploadsConfigService
    * @param {SectionDataObject} injectedSectionData
    * @param {string} injectedSubmissionId
    */
@@ -134,10 +134,10 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
               private changeDetectorRef: ChangeDetectorRef,
               private collectionDataService: CollectionDataService,
               private groupService: GroupDataService,
-              private resourcePolicyService: ResourcePolicyService,
+              private resourcePolicyService: ResourcePolicyDataService,
               protected sectionService: SectionsService,
               private submissionService: SubmissionService,
-              private uploadsConfigService: SubmissionUploadsConfigService,
+              private uploadsConfigService: SubmissionUploadsConfigDataService,
               @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
               @Inject('submissionIdProvider') public injectedSubmissionId: string) {
     super(undefined, injectedSectionData, injectedSubmissionId);
diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
index 97ffb7ffcd..d1e8dfd44e 100644
--- a/src/app/submission/submission.module.ts
+++ b/src/app/submission/submission.module.ts
@@ -19,7 +19,7 @@ import { SubmissionSectionUploadComponent } from './sections/upload/section-uplo
 import { SectionUploadService } from './sections/upload/section-upload.service';
 import { SubmissionUploadFilesComponent } from './form/submission-upload-files/submission-upload-files.component';
 import { SubmissionSectionLicenseComponent } from './sections/license/section-license.component';
-import { SubmissionUploadsConfigService } from '../core/config/submission-uploads-config.service';
+import { SubmissionUploadsConfigDataService } from '../core/config/submission-uploads-config-data.service';
 import { SubmissionEditComponent } from './edit/submission-edit.component';
 import { SubmissionSectionUploadFileComponent } from './sections/upload/file/section-upload-file.component';
 import {
@@ -52,7 +52,7 @@ import { ThemedSubmissionImportExternalComponent } from './import-external/theme
 import { FormModule } from '../shared/form/form.module';
 import { NgbAccordionModule, NgbCollapseModule, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
 import { SubmissionSectionAccessesComponent } from './sections/accesses/section-accesses.component';
-import { SubmissionAccessesConfigService } from '../core/config/submission-accesses-config.service';
+import { SubmissionAccessesConfigDataService } from '../core/config/submission-accesses-config-data.service';
 import { SectionAccessesService } from './sections/accesses/section-accesses.service';
 import { SubmissionSectionSherpaPoliciesComponent } from './sections/sherpa-policies/section-sherpa-policies.component';
 import { ContentAccordionComponent } from './sections/sherpa-policies/content-accordion/content-accordion.component';
@@ -121,8 +121,8 @@ const DECLARATIONS = [
   providers: [
     SectionUploadService,
     SectionsService,
-    SubmissionUploadsConfigService,
-    SubmissionAccessesConfigService,
+    SubmissionUploadsConfigDataService,
+    SubmissionAccessesConfigDataService,
     SectionAccessesService,
   ]
 })

From 528c4c31ea3a5c495f9306340d256d73f5e8e3b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Fern=C3=A1ndez=20Celorio?= <sfernandez@arvo.es>
Date: Thu, 25 Aug 2022 11:41:24 +0000
Subject: [PATCH 15/48] Spanish translation updated

---
 src/assets/i18n/es.json5 | 8487 ++++++++++++++++++++++----------------
 1 file changed, 4950 insertions(+), 3537 deletions(-)

diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 5d40c501f1..b738578fc6 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -1,5318 +1,6265 @@
 {
 
-	// "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
-	"401.help": "No está autorizado a acceder a esta página. Puede utilizar el botón de abajo para volver a la página de inicio.",
+  // "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
+  "401.help": "No está autorizado a acceder a esta página. Puede utilizar el botón de abajo para volver a la página de inicio.",
 
-	// "401.link.home-page": "Take me to the home page",
-	"401.link.home-page": "Llévame a la página de inicio",
+  // "401.link.home-page": "Take me to the home page",
+  "401.link.home-page": "Llévame a la página de inicio",
 
-	// "401.unauthorized": "unauthorized",
-	"401.unauthorized": "no autorizado",
+  // "401.unauthorized": "unauthorized",
+  "401.unauthorized": "no autorizado",
 
 
+  // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
+  "403.help": "No tiene permisos para acceder a esta página. Puede utilizar el botón de abajo para volver a la página de inicio.",
 
-	// "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
-	"403.help": "No tiene permiso para acceder a esta página. Puede utilizar el botón de abajo para volver a la página de inicio.",
+  // "403.link.home-page": "Take me to the home page",
+  "403.link.home-page": "Llévame a la página de inicio",
 
-	// "403.link.home-page": "Take me to the home page",
-	"403.link.home-page": "Llévame a la página de inicio",
+  // "403.forbidden": "forbidden",
+  "403.forbidden": "prohibido",
 
-	// "403.forbidden": "forbidden",
-	"403.forbidden": "prohibido",
+  // "500.page-internal-server-error": "Service Unavailable",
+  "500.page-internal-server-error": "Servicio no disponible",
 
+  // "500.help": "The server is  temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
+  "500.help": "No se puede atender su petición debido a problemas de capacidad o mantenimeintos programados del servidor. Inténtelo mas adelante, por favor.",
 
+  // "500.link.home-page": "Take me to the home page",
+  "500.link.home-page": "Llévame a la página de inicio",
 
-	// "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
-	"404.help": "No podemos encontrar la página que buscas. La página puede haber sido movida o eliminada. Puedes utilizar el botón de abajo para volver a la página de inicio. ",
 
-	// "404.link.home-page": "Take me to the home page",
-	"404.link.home-page": "Llévame a la página de inicio",
+  // "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
+  "404.help": "No podemos encontrar la página que busca. La página puede haber sido movida o eliminada. Puede utilizar el botón de abajo para volver a la página de inicio. ",
 
-	// "404.page-not-found": "page not found",
-	"404.page-not-found": "página no encontrada",
+  // "404.link.home-page": "Take me to the home page",
+  "404.link.home-page": "Llévame a la página de inicio",
 
-	// "admin.curation-tasks.breadcrumbs": "System curation tasks",
-	"admin.curation-tasks.breadcrumbs": "Tareas de conservación del sistema",
+  // "404.page-not-found": "page not found",
+  "404.page-not-found": "página no encontrada",
 
-	// "admin.curation-tasks.title": "System curation tasks",
-	"admin.curation-tasks.title": "Tareas de conservación del sistema",
+  // "error-page.description.401": "unauthorized",
+  "error-page.description.401": "no autorizado",
 
-	// "admin.curation-tasks.header": "System curation tasks",
-	"admin.curation-tasks.header": "Tareas de conservación del sistema",
+  // "error-page.description.403": "forbidden",
+  "error-page.description.403": "prohibido",
 
-	// "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-	"admin.registries.bitstream-formats.breadcrumbs": "Registro de formato",
+  // "error-page.description.500": "Service Unavailable",
+  "error-page.description.500": "Servicio no disponible",
 
-	// "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
-	"admin.registries.bitstream-formats.create.breadcrumbs": "Formato de archivo",
+  // "error-page.description.404": "page not found",
+  "error-page.description.404": "página no encontrada",
 
-	// "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
-	"admin.registries.bitstream-formats.create.failure.content": "Se produjo un error al crear el nuevo formato de archivo.",
+  // "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists, contact the administrator",
+  "error-page.orcid.generic-error": "Hubo un error en el login via ORCID. Asegúrese que ha compartido el correo electrónico de su cuenta ORCID con Dspace. Si continuase el error, contacte con el administrador",
 
-	// "admin.registries.bitstream-formats.create.failure.head": "Failure",
-	"admin.registries.bitstream-formats.create.failure.head": "Falla",
+  // "access-status.embargo.listelement.badge": "Embargo",
+  "access-status.embargo.listelement.badge": "Embargo",
 
-	// "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
-	"admin.registries.bitstream-formats.create.head": "Crear formato Archivo",
+  // "access-status.metadata.only.listelement.badge": "Metadata only",
+  "access-status.metadata.only.listelement.badge": "Solo Metadatos",
 
-	// "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
-	"admin.registries.bitstream-formats.create.new": "Agregar un nuevo formato de archivo",
+  // "access-status.open.access.listelement.badge": "Open Access",
+  "access-status.open.access.listelement.badge": "Acceso Abierto",
 
-	// "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
-	"admin.registries.bitstream-formats.create.success.content": "El nuevo formato de archivo se creó correctamente.",
+  // "access-status.restricted.listelement.badge": "Restricted",
+  "access-status.restricted.listelement.badge": "Restringido",
 
-	// "admin.registries.bitstream-formats.create.success.head": "Success",
-	"admin.registries.bitstream-formats.create.success.head": "Éxito",
+  // "access-status.unknown.listelement.badge": "Unknown",
+  "access-status.unknown.listelement.badge": "Desconocido",
 
-	// "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
-	"admin.registries.bitstream-formats.delete.failure.amount": "Error al eliminar {{ amount }} formato(s)",
+  // "admin.curation-tasks.breadcrumbs": "System curation tasks",
+  "admin.curation-tasks.breadcrumbs": "Tareas de curación del sistema",
 
-	// "admin.registries.bitstream-formats.delete.failure.head": "Failure",
-	"admin.registries.bitstream-formats.delete.failure.head": "Falla",
+  // "admin.curation-tasks.title": "System curation tasks",
+  "admin.curation-tasks.title": "Tareas de conservación del sistema",
 
-	// "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
-	"admin.registries.bitstream-formats.delete.success.amount": "Se quitaron correctamente {{ amount }} formato(s)",
+  // "admin.curation-tasks.header": "System curation tasks",
+  "admin.curation-tasks.header": "Tareas de curación del sistema",
 
-	// "admin.registries.bitstream-formats.delete.success.head": "Success",
-	"admin.registries.bitstream-formats.delete.success.head": "Éxito",
+  // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
+  "admin.registries.bitstream-formats.breadcrumbs": "Registro de formatos",
 
-	// "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
-	"admin.registries.bitstream-formats.description": "Esta lista de formatos de archivo proporciona información sobre formatos conocidos y su nivel de soporte.",
+  // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.create.breadcrumbs": "Formato de archivo",
 
-	// "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
-	"admin.registries.bitstream-formats.edit.breadcrumbs": "Formato de archivo",
+  // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
+  "admin.registries.bitstream-formats.create.failure.content": "Se produjo un error al crear el nuevo formato de archivo.",
 
-	// "admin.registries.bitstream-formats.edit.description.hint": "",
-	"admin.registries.bitstream-formats.edit.description.hint": "",
+  // "admin.registries.bitstream-formats.create.failure.head": "Failure",
+  "admin.registries.bitstream-formats.create.failure.head": "Fallo",
 
-	// "admin.registries.bitstream-formats.edit.description.label": "Description",
-	"admin.registries.bitstream-formats.edit.description.label": "Descripción",
+  // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  "admin.registries.bitstream-formats.create.head": "Crear formato de archivo",
 
-	// "admin.registries.bitstream-formats.edit.extensions.hint": "Extensions are file extensions that are used to automatically identify the format of uploaded files. You can enter several extensions for each format.",
-	"admin.registries.bitstream-formats.edit.extensions.hint": "Las extensiones son extensiones de archivos que se utilizan para identificar automáticamente el formato de los archivos cargados. Puede introducir varias extensiones para cada formato.",
+  // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
+  "admin.registries.bitstream-formats.create.new": "Agregar un nuevo formato de archivo",
 
-	// "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
-	"admin.registries.bitstream-formats.edit.extensions.label": "Extensiones de archivo",
+  // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
+  "admin.registries.bitstream-formats.create.success.content": "El nuevo formato de archivo se creó correctamente.",
 
-	// "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
-	"admin.registries.bitstream-formats.edit.extensions.placeholder": "Ingrese una extensión de archivo sin el punto",
+  // "admin.registries.bitstream-formats.create.success.head": "Success",
+  "admin.registries.bitstream-formats.create.success.head": "Éxito",
 
-	// "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
-	"admin.registries.bitstream-formats.edit.failure.content": "Se produjo un error al editar el formato de archivo.",
+  // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.failure.amount": "Error al eliminar {{ amount }} formato(s)",
 
-	// "admin.registries.bitstream-formats.edit.failure.head": "Failure",
-	"admin.registries.bitstream-formats.edit.failure.head": "Falla",
+  // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
+  "admin.registries.bitstream-formats.delete.failure.head": "Fallo",
 
-	// "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
-	"admin.registries.bitstream-formats.edit.head": "Formato de archivo: {{ format }}",
+  // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.success.amount": "Se eliminaron correctamente {{ amount }} formato(s)",
 
-	// "admin.registries.bitstream-formats.edit.internal.hint": "Formats marked as internal are hidden from the user, and used for administrative purposes.",
-	"admin.registries.bitstream-formats.edit.internal.hint": "Los formatos marcados como internos están ocultos al usuario y se utilizan con fines administrativos.",
+  // "admin.registries.bitstream-formats.delete.success.head": "Success",
+  "admin.registries.bitstream-formats.delete.success.head": "Éxito",
 
-	// "admin.registries.bitstream-formats.edit.internal.label": "Internal",
-	"admin.registries.bitstream-formats.edit.internal.label": "Interno",
+  // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
+  "admin.registries.bitstream-formats.description": "Esta lista de formatos de archivo proporciona información sobre formatos conocidos y su nivel de soporte.",
 
-	// "admin.registries.bitstream-formats.edit.mimetype.hint": "The MIME type associated with this format, does not have to be unique.",
-	"admin.registries.bitstream-formats.edit.mimetype.hint": "El tipo MIME asociado con este formato no tiene por qué ser único.",
+  // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Formato de archivo",
 
-	// "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
-	"admin.registries.bitstream-formats.edit.mimetype.label": "Tipo MIME",
+  // "admin.registries.bitstream-formats.edit.description.hint": "",
+  "admin.registries.bitstream-formats.edit.description.hint": "",
 
-	// "admin.registries.bitstream-formats.edit.shortDescription.hint": "A unique name for this format, (e.g. Microsoft Word XP or Microsoft Word 2000)",
-	"admin.registries.bitstream-formats.edit.shortDescription.hint": "Un nombre único para este formato, (por ejemplo, Microsoft Word XP o Microsoft Word 2000)",
+  // "admin.registries.bitstream-formats.edit.description.label": "Description",
+  "admin.registries.bitstream-formats.edit.description.label": "Descripción",
 
-	// "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
-	"admin.registries.bitstream-formats.edit.shortDescription.label": "Nombre",
+  // "admin.registries.bitstream-formats.edit.extensions.hint": "Extensions are file extensions that are used to automatically identify the format of uploaded files. You can enter several extensions for each format.",
+  "admin.registries.bitstream-formats.edit.extensions.hint": "Las extensiones se refieren a las extensiones de archivos que se utilizan para identificar automáticamente el formato de los archivos cargados. Puede introducir varias extensiones para cada formato.",
 
-	// "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
-	"admin.registries.bitstream-formats.edit.success.content": "El formato de archivo se editó correctamente.",
+  // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
+  "admin.registries.bitstream-formats.edit.extensions.label": "Extensiones de archivo",
 
-	// "admin.registries.bitstream-formats.edit.success.head": "Success",
-	"admin.registries.bitstream-formats.edit.success.head": "Éxito",
+  // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Introduzca una extensión de archivo (sin el punto)",
 
-	// "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
-	"admin.registries.bitstream-formats.edit.supportLevel.hint": "El nivel de apoyo que su institución promete para este formato.",
+  // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
+  "admin.registries.bitstream-formats.edit.failure.content": "Se produjo un error al editar el formato de archivo.",
 
-	// "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
-	"admin.registries.bitstream-formats.edit.supportLevel.label": "Nivel de soporte",
+  // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
+  "admin.registries.bitstream-formats.edit.failure.head": "Fallo",
 
-	// "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
-	"admin.registries.bitstream-formats.head": "Registro de formato Archivo",
+  // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
+  "admin.registries.bitstream-formats.edit.head": "Formato de archivo: {{ format }}",
 
-	// "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
-	"admin.registries.bitstream-formats.no-items": "No hay formatos de archivo para mostrar.",
+  // "admin.registries.bitstream-formats.edit.internal.hint": "Formats marked as internal are hidden from the user, and used for administrative purposes.",
+  "admin.registries.bitstream-formats.edit.internal.hint": "Los formatos marcados como internos están ocultos al usuario y se utilizan con fines administrativos.",
 
-	// "admin.registries.bitstream-formats.table.delete": "Delete selected",
-	"admin.registries.bitstream-formats.table.delete": "Eliminar seleccionado",
+  // "admin.registries.bitstream-formats.edit.internal.label": "Internal",
+  "admin.registries.bitstream-formats.edit.internal.label": "Interno",
 
-	// "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
-	"admin.registries.bitstream-formats.table.deselect-all": "Deseleccionar todo",
+  // "admin.registries.bitstream-formats.edit.mimetype.hint": "The MIME type associated with this format, does not have to be unique.",
+  "admin.registries.bitstream-formats.edit.mimetype.hint": "El tipo MIME asociado con este formato no tiene por qué ser único.",
 
-	// "admin.registries.bitstream-formats.table.internal": "internal",
-	"admin.registries.bitstream-formats.table.internal": "interno",
+  // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "Tipo MIME",
 
-	// "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
-	"admin.registries.bitstream-formats.table.mimetype": "Tipo MIME",
+  // "admin.registries.bitstream-formats.edit.shortDescription.hint": "A unique name for this format, (e.g. Microsoft Word XP or Microsoft Word 2000)",
+  "admin.registries.bitstream-formats.edit.shortDescription.hint": "Un nombre único para este formato, (por ejemplo, Microsoft Word XP o Microsoft Word 2000)",
 
-	// "admin.registries.bitstream-formats.table.name": "Name",
-	"admin.registries.bitstream-formats.table.name": "Nombre",
+  // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
+  "admin.registries.bitstream-formats.edit.shortDescription.label": "Nombre",
 
-	// "admin.registries.bitstream-formats.table.return": "Back",
-	"admin.registries.bitstream-formats.table.return": "atrás",
+  // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
+  "admin.registries.bitstream-formats.edit.success.content": "El formato de archivo se editó correctamente.",
 
-	// "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
-	"admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Conocido",
+  // "admin.registries.bitstream-formats.edit.success.head": "Success",
+  "admin.registries.bitstream-formats.edit.success.head": "Éxito",
 
-	// "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
-	"admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Soportado",
+  // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "El nivel de apoyo que su institución promete para este formato.",
 
-	// "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
-	"admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Desconocido",
+  // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
+  "admin.registries.bitstream-formats.edit.supportLevel.label": "Nivel de soporte",
 
-	// "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
-	"admin.registries.bitstream-formats.table.supportLevel.head": "Nivel de soporte",
+  // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.head": "Registro de formato Archivo",
 
-	// "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
-	"admin.registries.bitstream-formats.title": "Registro de formato Archivo",
+  // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
+  "admin.registries.bitstream-formats.no-items": "No hay formatos de archivo para mostrar.",
 
+  // "admin.registries.bitstream-formats.table.delete": "Delete selected",
+  "admin.registries.bitstream-formats.table.delete": "Eliminar seleccionado",
 
+  // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
+  "admin.registries.bitstream-formats.table.deselect-all": "Deseleccionar todo",
 
-	// "admin.registries.metadata.breadcrumbs": "Metadata registry",
-	"admin.registries.metadata.breadcrumbs": "Registro de metadatos",
+  // "admin.registries.bitstream-formats.table.internal": "internal",
+  "admin.registries.bitstream-formats.table.internal": "interno",
 
-	// "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.",
-	"admin.registries.metadata.description": "El registro de metadatos mantiene una lista de todos los campos de metadatos disponibles en el repositorio. Estos campos pueden estar divididos entre múltiples esquemas. Sin embargo, DSpace requiere el esquema calificado de Dublin Core.",
+  // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
+  "admin.registries.bitstream-formats.table.mimetype": "Tipo MIME",
 
-	// "admin.registries.metadata.form.create": "Create metadata schema",
-	"admin.registries.metadata.form.create": "Crear esquema de metadatos",
+  // "admin.registries.bitstream-formats.table.name": "Name",
+  "admin.registries.bitstream-formats.table.name": "Nombre",
 
-	// "admin.registries.metadata.form.edit": "Edit metadata schema",
-	"admin.registries.metadata.form.edit": "Editar esquema de metadatos",
+  // "admin.registries.bitstream-formats.table.return": "Back",
+  "admin.registries.bitstream-formats.table.return": "Atrás",
 
-	// "admin.registries.metadata.form.name": "Name",
-	"admin.registries.metadata.form.name": "Nombre",
+  // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
+  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Conocido",
 
-	// "admin.registries.metadata.form.namespace": "Namespace",
-	"admin.registries.metadata.form.namespace": "Espacio de nombres",
+  // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Soportado",
 
-	// "admin.registries.metadata.head": "Metadata Registry",
-	"admin.registries.metadata.head": "Registro de metadatos",
+  // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Desconocido",
 
-	// "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
-	"admin.registries.metadata.schemas.no-items": "No hay esquemas de metadatos para mostrar.",
+  // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
+  "admin.registries.bitstream-formats.table.supportLevel.head": "Nivel de soporte",
 
-	// "admin.registries.metadata.schemas.table.delete": "Delete selected",
-	"admin.registries.metadata.schemas.table.delete": "Eliminar seleccionado",
+  // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.title": "Registro de formato Archivo",
 
-	// "admin.registries.metadata.schemas.table.id": "ID",
-	"admin.registries.metadata.schemas.table.id": "IDENTIFICACIÓN",
 
-	// "admin.registries.metadata.schemas.table.name": "Name",
-	"admin.registries.metadata.schemas.table.name": "Nombre",
 
-	// "admin.registries.metadata.schemas.table.namespace": "Namespace",
-	"admin.registries.metadata.schemas.table.namespace": "Espacio de nombres",
+  // "admin.registries.metadata.breadcrumbs": "Metadata registry",
+  "admin.registries.metadata.breadcrumbs": "Registro de metadatos",
 
-	// "admin.registries.metadata.title": "Metadata Registry",
-	"admin.registries.metadata.title": "Registro de metadatos",
+  // "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.",
+  "admin.registries.metadata.description": "El registro de metadatos mantiene una lista de todos los campos de metadatos disponibles en el repositorio. Estos campos pueden estar divididos entre múltiples esquemas. Sin embargo, DSpace requiere el esquema calificado de Dublin Core.",
 
+  // "admin.registries.metadata.form.create": "Create metadata schema",
+  "admin.registries.metadata.form.create": "Crear esquema de metadatos",
 
+  // "admin.registries.metadata.form.edit": "Edit metadata schema",
+  "admin.registries.metadata.form.edit": "Editar esquema de metadatos",
 
-	// "admin.registries.schema.breadcrumbs": "Metadata schema",
-	"admin.registries.schema.breadcrumbs": "Esquema de metadatos",
+  // "admin.registries.metadata.form.name": "Name",
+  "admin.registries.metadata.form.name": "Nombre",
 
-	// "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
-	"admin.registries.schema.description": "Este es el esquema de metadatos para \"{{ namespace }} \".",
+  // "admin.registries.metadata.form.namespace": "Namespace",
+  "admin.registries.metadata.form.namespace": "Espacio de nombres",
 
-	// "admin.registries.schema.fields.head": "Schema metadata fields",
-	"admin.registries.schema.fields.head": "Campos de metadatos de esquema",
+  // "admin.registries.metadata.head": "Metadata Registry",
+  "admin.registries.metadata.head": "Registro de metadatos",
 
-	// "admin.registries.schema.fields.no-items": "No metadata fields to show.",
-	"admin.registries.schema.fields.no-items": "No hay campos de metadatos para mostrar.",
+  // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
+  "admin.registries.metadata.schemas.no-items": "No hay esquemas de metadatos para mostrar.",
 
-	// "admin.registries.schema.fields.table.delete": "Delete selected",
-	"admin.registries.schema.fields.table.delete": "Eliminar seleccionado",
+  // "admin.registries.metadata.schemas.table.delete": "Delete selected",
+  "admin.registries.metadata.schemas.table.delete": "Eliminar seleccionado",
 
-	// "admin.registries.schema.fields.table.field": "Field",
-	"admin.registries.schema.fields.table.field": "Campo",
+  // "admin.registries.metadata.schemas.table.id": "ID",
+  "admin.registries.metadata.schemas.table.id": "IDENTIFICACIÓN",
 
-	// "admin.registries.schema.fields.table.scopenote": "Scope Note",
-	"admin.registries.schema.fields.table.scopenote": "Nota de alcance",
+  // "admin.registries.metadata.schemas.table.name": "Name",
+  "admin.registries.metadata.schemas.table.name": "Nombre",
 
-	// "admin.registries.schema.form.create": "Create metadata field",
-	"admin.registries.schema.form.create": "Crear campo de metadatos",
+  // "admin.registries.metadata.schemas.table.namespace": "Namespace",
+  "admin.registries.metadata.schemas.table.namespace": "Espacio de nombres",
 
-	// "admin.registries.schema.form.edit": "Edit metadata field",
-	"admin.registries.schema.form.edit": "Editar campo de metadatos",
+  // "admin.registries.metadata.title": "Metadata Registry",
+  "admin.registries.metadata.title": "Registro de metadatos",
 
-	// "admin.registries.schema.form.element": "Element",
-	"admin.registries.schema.form.element": "Artículo",
 
-	// "admin.registries.schema.form.qualifier": "Qualifier",
-	"admin.registries.schema.form.qualifier": "Calificatorio",
 
-	// "admin.registries.schema.form.scopenote": "Scope Note",
-	"admin.registries.schema.form.scopenote": "Nota de alcance",
+  // "admin.registries.schema.breadcrumbs": "Metadata schema",
+  "admin.registries.schema.breadcrumbs": "Esquema de metadatos",
 
-	// "admin.registries.schema.head": "Metadata Schema",
-	"admin.registries.schema.head": "Esquema de metadatos",
+  // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
+  "admin.registries.schema.description": "Este es el esquema de metadatos para \"{{ namespace }} \".",
 
-	// "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
-	"admin.registries.schema.notification.created": "Esquema de metadatos creado correctamente \"{{ prefix }} \"",
+  // "admin.registries.schema.fields.head": "Schema metadata fields",
+  "admin.registries.schema.fields.head": "Campos de metadatos de esquema",
 
-	// "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
-	"admin.registries.schema.notification.deleted.failure": "Error al eliminar {{ amount }} esquemas de metadatos",
+  // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
+  "admin.registries.schema.fields.no-items": "No hay campos de metadatos para mostrar.",
 
-	// "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
-	"admin.registries.schema.notification.deleted.success": "{{ amount }} esquemas de metadatos eliminados correctamente",
+  // "admin.registries.schema.fields.table.delete": "Delete selected",
+  "admin.registries.schema.fields.table.delete": "Eliminar seleccionado",
 
-	// "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
-	"admin.registries.schema.notification.edited": "Esquema de metadatos editado correctamente \"{{ prefix }} \"",
+  // "admin.registries.schema.fields.table.field": "Field",
+  "admin.registries.schema.fields.table.field": "Campo",
 
-	// "admin.registries.schema.notification.failure": "Error",
-	"admin.registries.schema.notification.failure": "Error",
+  // "admin.registries.schema.fields.table.scopenote": "Scope Note",
+  "admin.registries.schema.fields.table.scopenote": "Nota de alcance",
 
-	// "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
-	"admin.registries.schema.notification.field.created": "Campo de metadatos creado correctamente \"{{ field }} \"",
+  // "admin.registries.schema.form.create": "Create metadata field",
+  "admin.registries.schema.form.create": "Crear campo de metadatos",
 
-	// "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
-	"admin.registries.schema.notification.field.deleted.failure": "No se pudieron borrar los campos de metadatos de {{ amount }}",
+  // "admin.registries.schema.form.edit": "Edit metadata field",
+  "admin.registries.schema.form.edit": "Editar campo de metadatos",
 
-	// "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
-	"admin.registries.schema.notification.field.deleted.success": "{{ amount }} campos de metadatos eliminados correctamente",
+  // "admin.registries.schema.form.element": "Element",
+  "admin.registries.schema.form.element": "Artículo",
 
-	// "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
-	"admin.registries.schema.notification.field.edited": "Campo de metadatos editado correctamente \"{{ field }} \"",
+  // "admin.registries.schema.form.qualifier": "Qualifier",
+  "admin.registries.schema.form.qualifier": "Calificatorio",
 
-	// "admin.registries.schema.notification.success": "Success",
-	"admin.registries.schema.notification.success": "Éxito",
+  // "admin.registries.schema.form.scopenote": "Scope Note",
+  "admin.registries.schema.form.scopenote": "Nota de alcance",
 
-	// "admin.registries.schema.return": "Back",
-	"admin.registries.schema.return": "atrás",
+  // "admin.registries.schema.head": "Metadata Schema",
+  "admin.registries.schema.head": "Esquema de metadatos",
 
-	// "admin.registries.schema.title": "Metadata Schema Registry",
-	"admin.registries.schema.title": "Registro de esquemas de metadatos",
+  // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.created": "Esquema de metadatos creado correctamente \"{{ prefix }} \"",
 
+  // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.failure": "Error al eliminar {{ amount }} esquemas de metadatos",
 
+  // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.success": "{{ amount }} esquemas de metadatos eliminados correctamente",
 
-	// "admin.access-control.epeople.actions.delete": "Delete EPerson",
-	"admin.access-control.epeople.actions.delete": "Eliminar EPerson",
+  // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.edited": "Esquema de metadatos editado correctamente \"{{ prefix }} \"",
 
-	// "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-	"admin.access-control.epeople.actions.impersonate": "Hacerse pasar por EPerson",
+  // "admin.registries.schema.notification.failure": "Error",
+  "admin.registries.schema.notification.failure": "Error",
 
-	// "admin.access-control.epeople.actions.reset": "Reset password",
-	"admin.access-control.epeople.actions.reset": "Restablecer la contraseña",
+  // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.created": "Campo de metadatos creado correctamente \"{{ field }} \"",
 
-	// "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
-	"admin.access-control.epeople.actions.stop-impersonating": "Deja de hacerse pasar por EPerson",
+  // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.failure": "No se pudieron borrar los campos de metadatos de {{ amount }}",
 
-	// "admin.access-control.epeople.breadcrumbs": "EPeople",
-	"admin.access-control.epeople.breadcrumbs": "EPeople",
+  // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.success": "{{ amount }} campos de metadatos eliminados correctamente",
 
-	// "admin.access-control.epeople.title": "EPeople",
-	"admin.access-control.epeople.title": "EPeople",
+  // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.edited": "Campo de metadatos editado correctamente \"{{ field }} \"",
 
-	// "admin.access-control.epeople.head": "EPeople",
-	"admin.access-control.epeople.head": "EPeople",
+  // "admin.registries.schema.notification.success": "Success",
+  "admin.registries.schema.notification.success": "Éxito",
 
-	// "admin.access-control.epeople.search.head": "Search",
-	"admin.access-control.epeople.search.head": "Buscar",
+  // "admin.registries.schema.return": "Back",
+  "admin.registries.schema.return": "Atrás",
 
-	// "admin.access-control.epeople.button.see-all": "Browse All",
-	"admin.access-control.epeople.button.see-all": "Examinar todo",
+  // "admin.registries.schema.title": "Metadata Schema Registry",
+  "admin.registries.schema.title": "Registro de esquemas de metadatos",
 
-	// "admin.access-control.epeople.search.scope.metadata": "Metadata",
-	"admin.access-control.epeople.search.scope.metadata": "Metadatos",
 
-	// "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
-	"admin.access-control.epeople.search.scope.email": "Correo electrónico (exacto)",
 
-	// "admin.access-control.epeople.search.button": "Search",
-	"admin.access-control.epeople.search.button": "Buscar",
+  // "admin.access-control.epeople.actions.delete": "Delete EPerson",
+  "admin.access-control.epeople.actions.delete": "Eliminar EPerson",
 
-	// "admin.access-control.epeople.search.placeholder": "Search people...",
-	"admin.access-control.epeople.search.placeholder": "Busca gente...",
+  // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
+  "admin.access-control.epeople.actions.impersonate": "Hacerse pasar por EPerson",
 
-	// "admin.access-control.epeople.button.add": "Add EPerson",
-	"admin.access-control.epeople.button.add": "Agregar una persona",
+  // "admin.access-control.epeople.actions.reset": "Reset password",
+  "admin.access-control.epeople.actions.reset": "Restablecer la contraseña",
 
-	// "admin.access-control.epeople.table.id": "ID",
-	"admin.access-control.epeople.table.id": "IDENTIFICACIÓN",
+  // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
+  "admin.access-control.epeople.actions.stop-impersonating": "Deja de hacerse pasar por EPerson",
 
-	// "admin.access-control.epeople.table.name": "Name",
-	"admin.access-control.epeople.table.name": "Nombre",
+  // "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.breadcrumbs": "EPeople",
 
-	// "admin.access-control.epeople.table.email": "E-mail (exact)",
-	"admin.access-control.epeople.table.email": "Correo electrónico (exacto)",
+  // "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.title": "EPeople",
 
-	// "admin.access-control.epeople.table.edit": "Edit",
-	"admin.access-control.epeople.table.edit": "Editar",
+  // "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.head": "EPeople",
 
-	// "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
-	"admin.access-control.epeople.table.edit.buttons.edit": "Editar \"{{ name }}\"",
+  // "admin.access-control.epeople.search.head": "Search",
+  "admin.access-control.epeople.search.head": "Buscar",
 
-	// "admin.access-control.epeople.table.edit.buttons.edit-disabled": "You are not authorized to edit this group",
-	"admin.access-control.epeople.table.edit.buttons.edit-disabled": "No tienes autorización para editar este grupo.",
+  // "admin.access-control.epeople.button.see-all": "Browse All",
+  "admin.access-control.epeople.button.see-all": "Examinar todo",
 
-	// "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
-	"admin.access-control.epeople.table.edit.buttons.remove": "Eliminar \"{{ name }} \"",
+  // "admin.access-control.epeople.search.scope.metadata": "Metadata",
+  "admin.access-control.epeople.search.scope.metadata": "Metadatos",
 
-	// "admin.access-control.epeople.no-items": "No EPeople to show.",
-	"admin.access-control.epeople.no-items": "No hay EPeople para mostrar.",
+  // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  "admin.access-control.epeople.search.scope.email": "Correo electrónico (exacto)",
 
-	// "admin.access-control.epeople.form.create": "Create EPerson",
-	"admin.access-control.epeople.form.create": "Crear una persona",
+  // "admin.access-control.epeople.search.button": "Search",
+  "admin.access-control.epeople.search.button": "Buscar",
 
-	// "admin.access-control.epeople.form.edit": "Edit EPerson",
-	"admin.access-control.epeople.form.edit": "Editar EPerson",
+  // "admin.access-control.epeople.search.placeholder": "Search people...",
+  "admin.access-control.epeople.search.placeholder": "Busca gente...",
 
-	// "admin.access-control.epeople.form.firstName": "First name",
-	"admin.access-control.epeople.form.firstName": "Nombre de pila",
+  // "admin.access-control.epeople.button.add": "Add EPerson",
+  "admin.access-control.epeople.button.add": "Agregar una persona",
 
-	// "admin.access-control.epeople.form.lastName": "Last name",
-	"admin.access-control.epeople.form.lastName": "Apellido",
+  // "admin.access-control.epeople.table.id": "ID",
+  "admin.access-control.epeople.table.id": "IDENTIFICACIÓN",
 
-	// "admin.access-control.epeople.form.email": "E-mail",
-	"admin.access-control.epeople.form.email": "Correo electrónico",
+  // "admin.access-control.epeople.table.name": "Name",
+  "admin.access-control.epeople.table.name": "Nombre",
 
-	// "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
-	"admin.access-control.epeople.form.emailHint": "Debe ser una dirección de correo electrónico válida",
+  // "admin.access-control.epeople.table.email": "E-mail (exact)",
+  "admin.access-control.epeople.table.email": "Correo electrónico (exacto)",
 
-	// "admin.access-control.epeople.form.canLogIn": "Can log in",
-	"admin.access-control.epeople.form.canLogIn": "Puede iniciar sesión",
+  // "admin.access-control.epeople.table.edit": "Edit",
+  "admin.access-control.epeople.table.edit": "Editar",
 
-	// "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
-	"admin.access-control.epeople.form.requireCertificate": "Requiere certificado",
+  // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.edit": "Editar \"{{ name }}\"",
 
-	// "admin.access-control.epeople.form.return": "Back",
-	"admin.access-control.epeople.form.return": "atrás",
+  // "admin.access-control.epeople.table.edit.buttons.edit-disabled": "You are not authorized to edit this group",
+  "admin.access-control.epeople.table.edit.buttons.edit-disabled": "No tienes autorización para editar este grupo.",
 
-	// "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
-	"admin.access-control.epeople.form.notification.created.success": "EPerson \"{{ name }} \" creada correctamente",
+  // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.remove": "Eliminar \"{{ name }} \"",
 
-	// "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
-	"admin.access-control.epeople.form.notification.created.failure": "Error al crear EPerson \"{{ name }} \"",
+  // "admin.access-control.epeople.no-items": "No EPeople to show.",
+  "admin.access-control.epeople.no-items": "No hay EPeople para mostrar.",
 
-	// "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Failed to create EPerson \"{{name}}\", email \"{{email}}\" already in use.",
-	"admin.access-control.epeople.form.notification.created.failure.emailInUse": "Error al crear EPerson \"{{ name }}\", el correo electrónico \"{{ email }}\" ya está en uso.",
+  // "admin.access-control.epeople.form.create": "Create EPerson",
+  "admin.access-control.epeople.form.create": "Crear una persona",
 
-	// "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Failed to edit EPerson \"{{name}}\", email \"{{email}}\" already in use.",
-	"admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Error al editar EPerson \"{{ name }}\", el correo electrónico \"{{ email }}\" ya está en uso.",
+  // "admin.access-control.epeople.form.edit": "Edit EPerson",
+  "admin.access-control.epeople.form.edit": "Editar EPerson",
 
-	// "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
-	"admin.access-control.epeople.form.notification.edited.success": "EPerson \"{{ name }} \" editado correctamente",
+  // "admin.access-control.epeople.form.firstName": "First name",
+  "admin.access-control.epeople.form.firstName": "Nombre de pila",
 
-	// "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
-	"admin.access-control.epeople.form.notification.edited.failure": "Error al editar EPerson \"{{ name }} \"",
+  // "admin.access-control.epeople.form.lastName": "Last name",
+  "admin.access-control.epeople.form.lastName": "Apellido",
 
-	// "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
-	"admin.access-control.epeople.form.notification.deleted.success": "EPerson \"{{ name }} \" eliminada correctamente",
+  // "admin.access-control.epeople.form.email": "E-mail",
+  "admin.access-control.epeople.form.email": "Correo electrónico",
 
-	// "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
-	"admin.access-control.epeople.form.notification.deleted.failure": "No se pudo borrar EPerson \"{{ name }} \"",
+  // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  "admin.access-control.epeople.form.emailHint": "Debe ser una dirección de correo electrónico válida",
 
-	// "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
-	"admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Miembro de estos grupos:",
+  // "admin.access-control.epeople.form.canLogIn": "Can log in",
+  "admin.access-control.epeople.form.canLogIn": "Puede iniciar sesión",
 
-	// "admin.access-control.epeople.form.table.id": "ID",
-	"admin.access-control.epeople.form.table.id": "IDENTIFICACIÓN",
+  // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
+  "admin.access-control.epeople.form.requireCertificate": "Requiere certificado",
 
-	// "admin.access-control.epeople.form.table.name": "Name",
-	"admin.access-control.epeople.form.table.name": "Nombre",
+  // "admin.access-control.epeople.form.return": "Back",
+  "admin.access-control.epeople.form.return": "Atrás",
 
-	// "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
-	"admin.access-control.epeople.form.table.collectionOrCommunity": "Colección/Comunidad",
+  // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.success": "EPerson \"{{ name }} \" creada correctamente",
 
-	// "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
-	"admin.access-control.epeople.form.memberOfNoGroups": "Esta EPerson no es miembro de ningún grupo",
+  // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure": "Error al crear EPerson \"{{ name }} \"",
 
-	// "admin.access-control.epeople.form.goToGroups": "Add to groups",
-	"admin.access-control.epeople.form.goToGroups": "Agregar a grupos",
+  // "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Failed to create EPerson \"{{name}}\", email \"{{email}}\" already in use.",
+  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Error al crear EPerson \"{{ name }}\", el correo electrónico \"{{ email }}\" ya está en uso.",
 
-	// "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
-	"admin.access-control.epeople.notification.deleted.failure": "No se pudo borrar EPerson: \"{{ name }} \"",
+  // "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Failed to edit EPerson \"{{name}}\", email \"{{email}}\" already in use.",
+  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Error al editar EPerson \"{{ name }}\", el correo electrónico \"{{ email }}\" ya está en uso.",
 
-	// "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
-	"admin.access-control.epeople.notification.deleted.success": "EPerson eliminada correctamente: \"{{ name }} \"",
+  // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.success": "EPerson \"{{ name }} \" editado correctamente",
 
+  // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "Error al editar EPerson \"{{ name }} \"",
 
+  // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.success": "EPerson \"{{ name }} \" eliminada correctamente",
 
-	// "admin.access-control.groups.title": "Groups",
-	"admin.access-control.groups.title": "Grupos",
+  // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "No se pudo borrar EPerson \"{{ name }} \"",
 
-	// "admin.access-control.groups.breadcrumbs": "Groups",
-	"admin.access-control.groups.breadcrumbs": "Grupos",
+  // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Miembro de estos grupos:",
 
-	// "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group",
-	"admin.access-control.groups.singleGroup.breadcrumbs": "Editar grupo",
+  // "admin.access-control.epeople.form.table.id": "ID",
+  "admin.access-control.epeople.form.table.id": "IDENTIFICACIÓN",
 
-	// "admin.access-control.groups.title.singleGroup": "Edit Group",
-	"admin.access-control.groups.title.singleGroup": "Editar grupo",
+  // "admin.access-control.epeople.form.table.name": "Name",
+  "admin.access-control.epeople.form.table.name": "Nombre",
 
-	// "admin.access-control.groups.title.addGroup": "New Group",
-	"admin.access-control.groups.title.addGroup": "Nuevo grupo",
+  // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "Colección/Comunidad",
 
-	// "admin.access-control.groups.addGroup.breadcrumbs": "New Group",
-	"admin.access-control.groups.addGroup.breadcrumbs": "Nuevo grupo",
+  // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
+  "admin.access-control.epeople.form.memberOfNoGroups": "Esta EPerson no es miembro de ningún grupo",
 
-	// "admin.access-control.groups.head": "Groups",
-	"admin.access-control.groups.head": "Grupos",
+  // "admin.access-control.epeople.form.goToGroups": "Add to groups",
+  "admin.access-control.epeople.form.goToGroups": "Agregar a grupos",
 
-	// "admin.access-control.groups.button.add": "Add group",
-	"admin.access-control.groups.button.add": "Añadir grupo",
+  // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "No se pudo borrar EPerson: \"{{ name }} \"",
 
-	// "admin.access-control.groups.search.head": "Search groups",
-	"admin.access-control.groups.search.head": "Grupos de búsqueda",
+  // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "EPerson eliminada correctamente: \"{{ name }} \"",
 
-	// "admin.access-control.groups.button.see-all": "Browse all",
-	"admin.access-control.groups.button.see-all": "Examinar todo",
 
-	// "admin.access-control.groups.search.button": "Search",
-	"admin.access-control.groups.search.button": "Buscar",
 
-	// "admin.access-control.groups.search.placeholder": "Search groups...",
-	"admin.access-control.groups.search.placeholder": "Buscar grupos...",
+  // "admin.access-control.groups.title": "Groups",
+  "admin.access-control.groups.title": "Grupos",
 
-	// "admin.access-control.groups.table.id": "ID",
-	"admin.access-control.groups.table.id": "IDENTIFICACIÓN",
+  // "admin.access-control.groups.breadcrumbs": "Groups",
+  "admin.access-control.groups.breadcrumbs": "Grupos",
 
-	// "admin.access-control.groups.table.name": "Name",
-	"admin.access-control.groups.table.name": "Nombre",
+  // "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "Editar grupo",
 
-	// "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
-	"admin.access-control.groups.table.collectionOrCommunity": "Colección/Comunidad",
+  // "admin.access-control.groups.title.singleGroup": "Edit Group",
+  "admin.access-control.groups.title.singleGroup": "Editar grupo",
 
-	// "admin.access-control.groups.table.members": "Members",
-	"admin.access-control.groups.table.members": "Miembros",
+  // "admin.access-control.groups.title.addGroup": "New Group",
+  "admin.access-control.groups.title.addGroup": "Nuevo grupo",
 
-	// "admin.access-control.groups.table.edit": "Edit",
-	"admin.access-control.groups.table.edit": "Editar",
+  // "admin.access-control.groups.addGroup.breadcrumbs": "New Group",
+  "admin.access-control.groups.addGroup.breadcrumbs": "Nuevo grupo",
 
-	// "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
-	"admin.access-control.groups.table.edit.buttons.edit": "Editar \"{{ name }}\"",
+  // "admin.access-control.groups.head": "Groups",
+  "admin.access-control.groups.head": "Grupos",
 
-	// "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
-	"admin.access-control.groups.table.edit.buttons.remove": "Eliminar \"{{ name }}\"",
+  // "admin.access-control.groups.button.add": "Add group",
+  "admin.access-control.groups.button.add": "Añadir grupo",
 
-	// "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
-	"admin.access-control.groups.no-items": "No se encontraron grupos con esto en su nombre o esto como UUID",
+  // "admin.access-control.groups.search.head": "Search groups",
+  "admin.access-control.groups.search.head": "Grupos de búsqueda",
 
-	// "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
-	"admin.access-control.groups.notification.deleted.success": "El grupo \"{{ name }}\" se eliminó correctamente",
+  // "admin.access-control.groups.button.see-all": "Browse all",
+  "admin.access-control.groups.button.see-all": "Examinar todo",
 
-	// "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
-	"admin.access-control.groups.notification.deleted.failure.title": "No se pudo borrar el grupo \"{{ name }}\"",
+  // "admin.access-control.groups.search.button": "Search",
+  "admin.access-control.groups.search.button": "Buscar",
 
-	// "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
-	"admin.access-control.groups.notification.deleted.failure.content": "Causa: \"{{ cause }} \"",
+  // "admin.access-control.groups.search.placeholder": "Search groups...",
+  "admin.access-control.groups.search.placeholder": "Buscar grupos...",
 
+  // "admin.access-control.groups.table.id": "ID",
+  "admin.access-control.groups.table.id": "IDENTIFICACIÓN",
 
+  // "admin.access-control.groups.table.name": "Name",
+  "admin.access-control.groups.table.name": "Nombre",
 
-	// "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
-	"admin.access-control.groups.form.alert.permanent": "Este grupo es permanente, por lo que no se puede editar ni eliminar. Sin embargo, puedes añadir y eliminar miembros del grupo utilizando esta página.",
+  // "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.table.collectionOrCommunity": "Colección/Comunidad",
 
-	// "admin.access-control.groups.form.alert.workflowGroup": "This group can’t be modified or deleted because it corresponds to a role in the submission and workflow process in the \"{{name}}\" {{comcol}}. You can delete it from the <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> tab on the edit {{comcol}} page. You can still add and remove group members using this page.",
-	"admin.access-control.groups.form.alert.workflowGroup": "Este grupo no puede ser modificado o eliminado porque corresponde a un rol en el proceso de presentación y flujo de trabajo en el \"{{ name }}\" {{ comcol }}. Puede eliminarlo desde la pestaña <a href='{{ comcolEditRolesRoute }}'>\"asignar roles\"</a> de la página de edición del {{ comcol }}. Todavía puede añadir y eliminar miembros del grupo utilizando esta página.",
+  // "admin.access-control.groups.table.members": "Members",
+  "admin.access-control.groups.table.members": "Miembros",
 
-	// "admin.access-control.groups.form.head.create": "Create group",
-	"admin.access-control.groups.form.head.create": "Crea un grupo",
+  // "admin.access-control.groups.table.edit": "Edit",
+  "admin.access-control.groups.table.edit": "Editar",
 
-	// "admin.access-control.groups.form.head.edit": "Edit group",
-	"admin.access-control.groups.form.head.edit": "Editar grupo",
+  // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.edit": "Editar \"{{ name }}\"",
 
-	// "admin.access-control.groups.form.groupName": "Group name",
-	"admin.access-control.groups.form.groupName": "Nombre del grupo",
+  // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.remove": "Eliminar \"{{ name }}\"",
 
-	// "admin.access-control.groups.form.groupCommunity": "Community or Collection",
-	"admin.access-control.groups.form.groupCommunity": "Comunidad o Colección",
+  // "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
+  "admin.access-control.groups.no-items": "No se encontraron grupos con esto en su nombre o esto como UUID",
 
-	// "admin.access-control.groups.form.groupDescription": "Description",
-	"admin.access-control.groups.form.groupDescription": "Descripción",
+  // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.success": "El grupo \"{{ name }}\" se eliminó correctamente",
 
-	// "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
-	"admin.access-control.groups.form.notification.created.success": "Grupo creado con éxito \"{{ name }} \"",
+  // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "No se pudo borrar el grupo \"{{ name }}\"",
 
-	// "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
-	"admin.access-control.groups.form.notification.created.failure": "No se pudo crear el grupo \"{{ name }} \"",
+  // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
+  "admin.access-control.groups.notification.deleted.failure.content": "Causa: \"{{ cause }} \"",
 
-	// "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Failed to create Group with name: \"{{name}}\", make sure the name is not already in use.",
-	"admin.access-control.groups.form.notification.created.failure.groupNameInUse": "No se pudo crear el grupo con el nombre: \"{{ name }}\", asegúrese de que el nombre no esté en uso.",
 
-	// "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
-	"admin.access-control.groups.form.notification.edited.failure": "No se pudo editar el grupo \"{{ name }} \"",
 
-	// "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
-	"admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "¡El nombre \"{{ name }} \" ya está en uso!",
+  // "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
+  "admin.access-control.groups.form.alert.permanent": "Este grupo es permanente, por lo que no se puede editar ni eliminar. Sin embargo, puedes añadir y eliminar miembros del grupo utilizando esta página.",
 
-	// "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
-	"admin.access-control.groups.form.notification.edited.success": "Grupo editado correctamente \"{{ name }} \"",
+  // "admin.access-control.groups.form.alert.workflowGroup": "This group can’t be modified or deleted because it corresponds to a role in the submission and workflow process in the \"{{name}}\" {{comcol}}. You can delete it from the <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> tab on the edit {{comcol}} page. You can still add and remove group members using this page.",
+  "admin.access-control.groups.form.alert.workflowGroup": "Este grupo no puede ser modificado o eliminado porque corresponde a un rol en el proceso de presentación y flujo de trabajo en el \"{{ name }}\" {{ comcol }}. Puede eliminarlo desde la pestaña <a href='{{ comcolEditRolesRoute }}'>\"asignar roles\"</a> de la página de edición del {{ comcol }}. Todavía puede añadir y eliminar miembros del grupo utilizando esta página.",
 
-	// "admin.access-control.groups.form.actions.delete": "Delete Group",
-	"admin.access-control.groups.form.actions.delete": "Eliminar grupo",
+  // "admin.access-control.groups.form.head.create": "Create group",
+  "admin.access-control.groups.form.head.create": "Crea un grupo",
 
-	// "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
-	"admin.access-control.groups.form.delete-group.modal.header": "Eliminar grupo \"{{ dsoName }} \"",
+  // "admin.access-control.groups.form.head.edit": "Edit group",
+  "admin.access-control.groups.form.head.edit": "Editar grupo",
 
-	// "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"",
-	"admin.access-control.groups.form.delete-group.modal.info": "¿Está seguro de que desea eliminar el grupo \"{{ dsoName }} \"?",
+  // "admin.access-control.groups.form.groupName": "Group name",
+  "admin.access-control.groups.form.groupName": "Nombre del grupo",
 
-	// "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
-	"admin.access-control.groups.form.delete-group.modal.cancel": "Cancelar",
+  // "admin.access-control.groups.form.groupCommunity": "Community or Collection",
+  "admin.access-control.groups.form.groupCommunity": "Comunidad o Colección",
 
-	// "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
-	"admin.access-control.groups.form.delete-group.modal.confirm": "Borrar",
+  // "admin.access-control.groups.form.groupDescription": "Description",
+  "admin.access-control.groups.form.groupDescription": "Descripción",
 
-	// "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
-	"admin.access-control.groups.form.notification.deleted.success": "El grupo \"{{ name }} \" se eliminó correctamente",
+  // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.success": "Grupo creado con éxito \"{{ name }} \"",
 
-	// "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
-	"admin.access-control.groups.form.notification.deleted.failure.title": "No se pudo borrar el grupo \"{{ name }} \"",
+  // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure": "No se pudo crear el grupo \"{{ name }} \"",
 
-	// "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
-	"admin.access-control.groups.form.notification.deleted.failure.content": "Causa: \"{{ cause }} \"",
+  // "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Failed to create Group with name: \"{{name}}\", make sure the name is not already in use.",
+  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "No se pudo crear el grupo con el nombre: \"{{ name }}\", asegúrese de que el nombre no esté en uso.",
 
-	// "admin.access-control.groups.form.members-list.head": "EPeople",
-	"admin.access-control.groups.form.members-list.head": "EPeople",
+  // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.failure": "No se pudo editar el grupo \"{{ name }} \"",
 
-	// "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
-	"admin.access-control.groups.form.members-list.search.head": "Agregar EPeople",
+  // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "¡El nombre \"{{ name }} \" ya está en uso!",
 
-	// "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
-	"admin.access-control.groups.form.members-list.button.see-all": "Examinar todo",
+  // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.success": "Grupo editado correctamente \"{{ name }} \"",
 
-	// "admin.access-control.groups.form.members-list.headMembers": "Current Members",
-	"admin.access-control.groups.form.members-list.headMembers": "Miembros actuales",
+  // "admin.access-control.groups.form.actions.delete": "Delete Group",
+  "admin.access-control.groups.form.actions.delete": "Eliminar grupo",
 
-	// "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-	"admin.access-control.groups.form.members-list.search.scope.metadata": "Metadatos",
+  // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.header": "Eliminar grupo \"{{ dsoName }} \"",
 
-	// "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
-	"admin.access-control.groups.form.members-list.search.scope.email": "Correo electrónico (exacto)",
+  // "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.info": "¿Está seguro de que desea eliminar el grupo \"{{ dsoName }} \"?",
 
-	// "admin.access-control.groups.form.members-list.search.button": "Search",
-	"admin.access-control.groups.form.members-list.search.button": "Buscar",
+  // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
+  "admin.access-control.groups.form.delete-group.modal.cancel": "Cancelar",
 
-	// "admin.access-control.groups.form.members-list.table.id": "ID",
-	"admin.access-control.groups.form.members-list.table.id": "IDENTIFICACIÓN",
+  // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
+  "admin.access-control.groups.form.delete-group.modal.confirm": "Borrar",
 
-	// "admin.access-control.groups.form.members-list.table.name": "Name",
-	"admin.access-control.groups.form.members-list.table.name": "Nombre",
+  // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.success": "El grupo \"{{ name }} \" se eliminó correctamente",
 
-	// "admin.access-control.groups.form.members-list.table.identity": "Identity",
-	"admin.access-control.groups.form.members-list.table.identity": "Identidad",
+  // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "No se pudo borrar el grupo \"{{ name }} \"",
 
-	// "admin.access-control.groups.form.members-list.table.email": "Email",
-	"admin.access-control.groups.form.members-list.table.email": "Correo electrónico",
+  // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.content": "Causa: \"{{ cause }} \"",
 
-	// "admin.access-control.groups.form.members-list.table.netid": "NetID",
-	"admin.access-control.groups.form.members-list.table.netid": "NetID",
+  // "admin.access-control.groups.form.members-list.head": "EPeople",
+  "admin.access-control.groups.form.members-list.head": "EPeople",
 
-	// "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
-	"admin.access-control.groups.form.members-list.table.edit": "Eliminar / Agregar",
+  // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
+  "admin.access-control.groups.form.members-list.search.head": "Agregar EPeople",
 
-	// "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
-	"admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Eliminar miembro con nombre \"{{ name }} \"",
+  // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.members-list.button.see-all": "Examinar todo",
 
-	// "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
-	"admin.access-control.groups.form.members-list.notification.success.addMember": "Miembro agregado exitosamente: \"{{ name }} \"",
+  // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
+  "admin.access-control.groups.form.members-list.headMembers": "Miembros actuales",
 
-	// "admin.access-control.groups.form.members-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
-	"admin.access-control.groups.form.members-list.notification.failure.addMember": "No se pudo agregar el miembro: \"{{ name }} \"",
+  // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
+  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadatos",
 
-	// "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
-	"admin.access-control.groups.form.members-list.notification.success.deleteMember": "Miembro eliminado correctamente: \"{{ name }} \"",
+  // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
+  "admin.access-control.groups.form.members-list.search.scope.email": "Correo electrónico (exacto)",
 
-	// "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
-	"admin.access-control.groups.form.members-list.notification.failure.deleteMember": "No se pudo borrar el miembro: \"{{ name }} \"",
+  // "admin.access-control.groups.form.members-list.search.button": "Search",
+  "admin.access-control.groups.form.members-list.search.button": "Buscar",
 
-	// "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
-	"admin.access-control.groups.form.members-list.table.edit.buttons.add": "Agregar miembro con nombre \"{{ name }} \"",
+  // "admin.access-control.groups.form.members-list.table.id": "ID",
+  "admin.access-control.groups.form.members-list.table.id": "ID",
 
-	// "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-	"admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No hay un grupo activo actual, envíe un nombre primero.",
+  // "admin.access-control.groups.form.members-list.table.name": "Name",
+  "admin.access-control.groups.form.members-list.table.name": "Nombre",
 
-	// "admin.access-control.groups.form.members-list.no-members-yet": "No members in group yet, search and add.",
-	"admin.access-control.groups.form.members-list.no-members-yet": "Aún no hay miembros en el grupo, busque y agregue.",
+  // "admin.access-control.groups.form.members-list.table.identity": "Identity",
+  "admin.access-control.groups.form.members-list.table.identity": "Identidad",
 
-	// "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
-	"admin.access-control.groups.form.members-list.no-items": "No se encontraron personas en esa búsqueda",
+  // "admin.access-control.groups.form.members-list.table.email": "Email",
+  "admin.access-control.groups.form.members-list.table.email": "Correo electrónico",
 
-	// "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
-	"admin.access-control.groups.form.subgroups-list.notification.failure": "Algo salió mal: \"{{ cause }} \"",
+  // "admin.access-control.groups.form.members-list.table.netid": "NetID",
+  "admin.access-control.groups.form.members-list.table.netid": "NetID",
 
-	// "admin.access-control.groups.form.subgroups-list.head": "Groups",
-	"admin.access-control.groups.form.subgroups-list.head": "Grupos",
+  // "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
+  "admin.access-control.groups.form.members-list.table.edit": "Eliminar / Agregar",
 
-	// "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
-	"admin.access-control.groups.form.subgroups-list.search.head": "Agregar subgrupo",
+  // "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Eliminar miembro con nombre \"{{ name }} \"",
 
-	// "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
-	"admin.access-control.groups.form.subgroups-list.button.see-all": "Examinar todo",
+  // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "Miembro agregado exitosamente: \"{{ name }} \"",
 
-	// "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
-	"admin.access-control.groups.form.subgroups-list.headSubgroups": "Subgrupos actuales",
+  // "admin.access-control.groups.form.members-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.addMember": "No se pudo agregar el miembro: \"{{ name }} \"",
 
-	// "admin.access-control.groups.form.subgroups-list.search.button": "Search",
-	"admin.access-control.groups.form.subgroups-list.search.button": "Buscar",
+  // "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Miembro eliminado correctamente: \"{{ name }} \"",
 
-	// "admin.access-control.groups.form.subgroups-list.table.id": "ID",
-	"admin.access-control.groups.form.subgroups-list.table.id": "IDENTIFICACIÓN",
+  // "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "No se pudo borrar el miembro: \"{{ name }} \"",
 
-	// "admin.access-control.groups.form.subgroups-list.table.name": "Name",
-	"admin.access-control.groups.form.subgroups-list.table.name": "Nombre",
+  // "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Agregar miembro con nombre \"{{ name }} \"",
 
-	// "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community",
-	"admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Colección/Comunidad",
+  // "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No hay un grupo activo actual, envíe un nombre primero.",
 
-	// "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
-	"admin.access-control.groups.form.subgroups-list.table.edit": "Eliminar / Agregar",
+  // "admin.access-control.groups.form.members-list.no-members-yet": "No members in group yet, search and add.",
+  "admin.access-control.groups.form.members-list.no-members-yet": "Aún no hay miembros en el grupo, busque y agregue.",
 
-	// "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"",
-	"admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Eliminar subgrupo con nombre \"{{ name }} \"",
+  // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
+  "admin.access-control.groups.form.members-list.no-items": "No se encontraron E-People en esa búsqueda",
 
-	// "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
-	"admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Agregar subgrupo con el nombre \"{{ name }} \"",
+  // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "Algo salió mal: \"{{ cause }} \"",
 
-	// "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
-	"admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Grupo actual",
+  // "admin.access-control.groups.form.subgroups-list.head": "Groups",
+  "admin.access-control.groups.form.subgroups-list.head": "Grupos",
 
-	// "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
-	"admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Subgrupo agregado exitosamente: \"{{ name }} \"",
+  // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
+  "admin.access-control.groups.form.subgroups-list.search.head": "Agregar subgrupo",
 
-	// "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"",
-	"admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "No se pudo agregar el subgrupo: \"{{ name }} \"",
+  // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Examinar todo",
 
-	// "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
-	"admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Subgrupo eliminado correctamente: \"{{ name }} \"",
+  // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Subgrupos actuales",
 
-	// "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{name}}\"",
-	"admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "No se pudo borrar el subgrupo: \"{{ name }} \"",
+  // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
+  "admin.access-control.groups.form.subgroups-list.search.button": "Buscar",
 
-	// "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-	"admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No hay un grupo activo actual, envíe un nombre primero.",
+  // "admin.access-control.groups.form.subgroups-list.table.id": "ID",
+  "admin.access-control.groups.form.subgroups-list.table.id": "IDENTIFICACIÓN",
 
-	// "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "This is the current group, can't be added.",
-	"admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "Este es el grupo actual, no se puede agregar.",
+  // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
+  "admin.access-control.groups.form.subgroups-list.table.name": "Nombre",
 
-	// "admin.access-control.groups.form.subgroups-list.no-items": "No groups found with this in their name or this as UUID",
-	"admin.access-control.groups.form.subgroups-list.no-items": "No se encontraron grupos con esto en su nombre o esto como UUID",
+  // "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Colección/Comunidad",
 
-	// "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
-	"admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Aún no hay subgrupos en el grupo.",
+  // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
+  "admin.access-control.groups.form.subgroups-list.table.edit": "Eliminar / Agregar",
 
-	// "admin.access-control.groups.form.return": "Back",
-	"admin.access-control.groups.form.return": "atrás",
+  // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Eliminar subgrupo con nombre \"{{ name }} \"",
 
+  // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Agregar subgrupo con el nombre \"{{ name }} \"",
 
+  // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
+  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Grupo actual",
 
-	// "admin.search.breadcrumbs": "Administrative Search",
-	"admin.search.breadcrumbs": "Búsqueda administrativa",
+  // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Subgrupo agregado exitosamente: \"{{ name }} \"",
 
-	// "admin.search.collection.edit": "Edit",
-	"admin.search.collection.edit": "Editar",
+  // "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "No se pudo agregar el subgrupo: \"{{ name }} \"",
 
-	// "admin.search.community.edit": "Edit",
-	"admin.search.community.edit": "Editar",
+  // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Subgrupo eliminado correctamente: \"{{ name }} \"",
 
-	// "admin.search.item.delete": "Delete",
-	"admin.search.item.delete": "Borrar",
+  // "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "No se pudo borrar el subgrupo: \"{{ name }} \"",
 
-	// "admin.search.item.edit": "Edit",
-	"admin.search.item.edit": "Editar",
+  // "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No hay un grupo activo actual, envíe un nombre primero.",
 
-	// "admin.search.item.make-private": "Make Private",
-	"admin.search.item.make-private": "Hacerlo privado",
+  // "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "This is the current group, can't be added.",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "Este es el grupo actual, no se puede agregar.",
 
-	// "admin.search.item.make-public": "Make Public",
-	"admin.search.item.make-public": "Hacer público",
+  // "admin.access-control.groups.form.subgroups-list.no-items": "No groups found with this in their name or this as UUID",
+  "admin.access-control.groups.form.subgroups-list.no-items": "No se encontraron grupos con esto en su nombre o esto como UUID",
 
-	// "admin.search.item.move": "Move",
-	"admin.search.item.move": "Moverse",
+  // "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
+  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Aún no hay subgrupos en el grupo.",
 
-	// "admin.search.item.reinstate": "Reinstate",
-	"admin.search.item.reinstate": "Reintegrar",
+  // "admin.access-control.groups.form.return": "Back",
+  "admin.access-control.groups.form.return": "Atrás",
 
-	// "admin.search.item.withdraw": "Withdraw",
-	"admin.search.item.withdraw": "Retirar",
 
-	// "admin.search.title": "Administrative Search",
-	"admin.search.title": "Búsqueda administrativa",
 
-	// "administrativeView.search.results.head": "Administrative Search",
-	"administrativeView.search.results.head": "Búsqueda administrativa",
+  // "admin.search.breadcrumbs": "Administrative Search",
+  "admin.search.breadcrumbs": "Búsqueda administrativa",
 
+  // "admin.search.collection.edit": "Edit",
+  "admin.search.collection.edit": "Editar",
 
+  // "admin.search.community.edit": "Edit",
+  "admin.search.community.edit": "Editar",
 
+  // "admin.search.item.delete": "Delete",
+  "admin.search.item.delete": "Borrar",
 
-	// "admin.workflow.breadcrumbs": "Administer Workflow",
-	"admin.workflow.breadcrumbs": "Administrar flujo de trabajo",
+  // "admin.search.item.edit": "Edit",
+  "admin.search.item.edit": "Editar",
 
-	// "admin.workflow.title": "Administer Workflow",
-	"admin.workflow.title": "Administrar flujo de trabajo",
+  // "admin.search.item.make-private": "Make non-discoverable",
+  "admin.search.item.make-private": "Hacerlo privado",
 
-	// "admin.workflow.item.workflow": "Workflow",
-	"admin.workflow.item.workflow": "Flujo de trabajo",
+  // "admin.search.item.make-public": "Make discoverable",
+  "admin.search.item.make-public": "Hacer público",
 
-	// "admin.workflow.item.delete": "Delete",
-	"admin.workflow.item.delete": "Borrar",
+  // "admin.search.item.move": "Move",
+  "admin.search.item.move": "Moverse",
 
-	// "admin.workflow.item.send-back": "Send back",
-	"admin.workflow.item.send-back": "Enviar de vuelta",
+  // "admin.search.item.reinstate": "Reinstate",
+  "admin.search.item.reinstate": "Reintegrar",
 
+  // "admin.search.item.withdraw": "Withdraw",
+  "admin.search.item.withdraw": "Retirar",
 
+  // "admin.search.title": "Administrative Search",
+  "admin.search.title": "Búsqueda administrativa",
 
-	// "admin.metadata-import.breadcrumbs": "Import Metadata",
-	"admin.metadata-import.breadcrumbs": "Importar metadatos",
+  // "administrativeView.search.results.head": "Administrative Search",
+  "administrativeView.search.results.head": "Búsqueda administrativa",
 
-	// "admin.metadata-import.title": "Import Metadata",
-	"admin.metadata-import.title": "Importar metadatos",
 
-	// "admin.metadata-import.page.header": "Import Metadata",
-	"admin.metadata-import.page.header": "Importar metadatos",
 
-	// "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
-	"admin.metadata-import.page.help": "Puede soltar o explorar archivos CSV que contienen operaciones de metadatos por lotes en archivos aquí",
 
-	// "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
-	"admin.metadata-import.page.dropMsg": "Suelta un CSV de metadatos para importar",
+  // "admin.workflow.breadcrumbs": "Administer Workflow",
+  "admin.workflow.breadcrumbs": "Administrar flujo de trabajo",
 
-	// "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
-	"admin.metadata-import.page.dropMsgReplace": "Suelta para reemplazar el CSV de metadatos para importar",
+  // "admin.workflow.title": "Administer Workflow",
+  "admin.workflow.title": "Administrar flujo de trabajo",
 
-	// "admin.metadata-import.page.button.return": "Back",
-	"admin.metadata-import.page.button.return": "atrás",
+  // "admin.workflow.item.workflow": "Workflow",
+  "admin.workflow.item.workflow": "Flujo de trabajo",
 
-	// "admin.metadata-import.page.button.proceed": "Proceed",
-	"admin.metadata-import.page.button.proceed": "Continuar",
+  // "admin.workflow.item.delete": "Delete",
+  "admin.workflow.item.delete": "Borrar",
 
-	// "admin.metadata-import.page.error.addFile": "Select file first!",
-	"admin.metadata-import.page.error.addFile": "¡Seleccione el archivo primero!",
+  // "admin.workflow.item.send-back": "Send back",
+  "admin.workflow.item.send-back": "Enviar de vuelta",
 
 
 
+  // "admin.metadata-import.breadcrumbs": "Import Metadata",
+  "admin.metadata-import.breadcrumbs": "Importar metadatos",
 
-	// "auth.errors.invalid-user": "Invalid email address or password.",
-	"auth.errors.invalid-user": "Dirección de correo electrónico o contraseña no válidos.",
+  // "admin.metadata-import.title": "Import Metadata",
+  "admin.metadata-import.title": "Importar metadatos",
 
-	// "auth.messages.expired": "Your session has expired. Please log in again.",
-	"auth.messages.expired": "Su sesión ha caducado. Inicie sesión de nuevo.",
+  // "admin.metadata-import.page.header": "Import Metadata",
+  "admin.metadata-import.page.header": "Importar metadatos",
 
-	// "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
-	"auth.messages.token-refresh-failed": "No se pudo actualizar el token de la sesión. Inicie sesión de nuevo.",
+  // "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
+  "admin.metadata-import.page.help": "Puede soltar o explorar archivos CSV que contienen operaciones de metadatos por lotes en archivos aquí",
 
+  // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
+  "admin.metadata-import.page.dropMsg": "Suelta un CSV de metadatos para importar",
 
+  // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
+  "admin.metadata-import.page.dropMsgReplace": "Suelta para reemplazar el CSV de metadatos para importar",
 
-	// "bitstream.download.page": "Now downloading {{bitstream}}..." ,
-	"bitstream.download.page": "Descargando {{ bitstream }}...",
+  // "admin.metadata-import.page.button.return": "Back",
+  "admin.metadata-import.page.button.return": "Atrás",
 
+  // "admin.metadata-import.page.button.proceed": "Proceed",
+  "admin.metadata-import.page.button.proceed": "Continuar",
 
+  // "admin.metadata-import.page.error.addFile": "Select file first!",
+  "admin.metadata-import.page.error.addFile": "¡Seleccione el archivo primero!",
 
-	// "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
-	"bitstream.edit.authorizations.link": "Editar las políticas de archivo",
+  // "admin.metadata-import.page.validateOnly": "Validate Only",
+  "admin.metadata-import.page.validateOnly": "Solo Validar",
 
-	// "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
-	"bitstream.edit.authorizations.title": "Editar las políticas de archivo",
+  // "admin.metadata-import.page.validateOnly.hint": "When selected, the uploaded CSV will be validated. You will receive a report of detected changes, but no changes will be saved.",
+  "admin.metadata-import.page.validateOnly.hint": "Al seleccionar, se validará el CSV subido. Recibirá un informe con los cambios detectados, pero no se efectuarán dichos cambios.",
 
-	// "bitstream.edit.return": "Back",
-	"bitstream.edit.return": "atrás",
 
-	// "bitstream.edit.bitstream": "Bitstream: ",
-	"bitstream.edit.bitstream": "Archivo:",
 
-	// "bitstream.edit.form.description.hint": "Optionally, provide a brief description of the file, for example \"<i>Main article</i>\" or \"<i>Experiment data readings</i>\".",
-	"bitstream.edit.form.description.hint": "Opcionalmente, proporcione una breve descripción del archivo, por ejemplo \"<i>Artículo principal</i>\" o \"<i>Lecturas de datos del experimento</i>\".",
 
-	// "bitstream.edit.form.description.label": "Description",
-	"bitstream.edit.form.description.label": "Descripción",
+  // "auth.errors.invalid-user": "Invalid email address or password.",
+  "auth.errors.invalid-user": "Dirección de correo electrónico o contraseña no válidos.",
 
-	// "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. <b>This date cannot be modified on this form.</b> To set an embargo date for a bitstream, go to the <i>Item Status</i> tab, click <i>Authorizations...</i>, create or edit the bitstream's <i>READ</i> policy, and set the <i>Start Date</i> as desired.",
-	"bitstream.edit.form.embargo.hint": "El primer día a partir del cual se permite el acceso. <b>Esta fecha no se puede modificar en este formulario.</b> Para establecer una fecha de embargo para un archivo, vaya a la pestaña <i> Estado del artículo </i>, haga clic en <i> Autorizaciones... </ i >, cree o edite la política <i> READ </i> del archivo y configure la <i> Fecha de inicio </i> como desee.",
+  // "auth.messages.expired": "Your session has expired. Please log in again.",
+  "auth.messages.expired": "Su sesión ha caducado. Inicie sesión de nuevo.",
 
-	// "bitstream.edit.form.embargo.label": "Embargo until specific date",
-	"bitstream.edit.form.embargo.label": "Embargo hasta fecha concreta",
+  // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
+  "auth.messages.token-refresh-failed": "No se pudo actualizar el token de la sesión. Inicie sesión de nuevo.",
 
-	// "bitstream.edit.form.fileName.hint": "Change the filename for the bitstream. Note that this will change the display bitstream URL, but old links will still resolve as long as the sequence ID does not change.",
-	"bitstream.edit.form.fileName.hint": "Cambie el nombre de archivo del archivo. Tenga en cuenta que esto cambiará la URL de archivo de visualización, pero los enlaces antiguos seguirán resolviéndose siempre que la ID de secuencia no cambie.",
 
-	// "bitstream.edit.form.fileName.label": "Filename",
-	"bitstream.edit.form.fileName.label": "Nombre del archivo",
 
-	// "bitstream.edit.form.newFormat.label": "Describe new format",
-	"bitstream.edit.form.newFormat.label": "Describe el nuevo formato",
+  // "bitstream.download.page": "Now downloading {{bitstream}}..." ,
+  "bitstream.download.page": "Descargando {{ bitstream }}...",
 
-	// "bitstream.edit.form.newFormat.hint": "The application you used to create the file, and the version number (for example, \"<i>ACMESoft SuperApp version 1.5</i>\").",
-	"bitstream.edit.form.newFormat.hint": "La aplicación que usó para crear el archivo y el número de versión (por ejemplo, \"<i> ACMESoft SuperApp versión 1.5 </i>\").",
+  // "bitstream.download.page.back": "Back" ,
+  "bitstream.download.page.back": "Atrás" ,
 
-	// "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
-	"bitstream.edit.form.primaryBitstream.label": "archivo primario",
 
-	// "bitstream.edit.form.selectedFormat.hint": "If the format is not in the above list, <b>select \"format not in list\" above</b> and describe it under \"Describe new format\".",
-	"bitstream.edit.form.selectedFormat.hint": "Si el formato no está en la lista anterior, <b> seleccione \"el formato no está en la lista \" arriba </b> y descríbalo en \"Describir el nuevo formato \".",
+  // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.link": "Editar las políticas de archivo",
 
-	// "bitstream.edit.form.selectedFormat.label": "Selected Format",
-	"bitstream.edit.form.selectedFormat.label": "Formato seleccionado",
+  // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.title": "Editar las políticas de archivo",
 
-	// "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
-	"bitstream.edit.form.selectedFormat.unknown": "El formato no está en la lista",
+  // "bitstream.edit.return": "Back",
+  "bitstream.edit.return": "Atrás",
 
-	// "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
-	"bitstream.edit.notifications.error.format.title": "Se produjo un error al guardar el formato del archivo.",
+  // "bitstream.edit.bitstream": "Bitstream: ",
+  "bitstream.edit.bitstream": "Archivo:",
 
-	// "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
-	"bitstream.edit.notifications.saved.content": "Se guardaron sus cambios en este archivo.",
+  // "bitstream.edit.form.description.hint": "Optionally, provide a brief description of the file, for example \"<i>Main article</i>\" or \"<i>Experiment data readings</i>\".",
+  "bitstream.edit.form.description.hint": "Opcionalmente, proporcione una breve descripción del archivo, por ejemplo \"<i>Artículo principal</i>\" o \"<i>Lecturas de datos del experimento</i>\".",
 
-	// "bitstream.edit.notifications.saved.title": "Bitstream saved",
-	"bitstream.edit.notifications.saved.title": "Archivo guardado",
+  // "bitstream.edit.form.description.label": "Description",
+  "bitstream.edit.form.description.label": "Descripción",
 
-	// "bitstream.edit.title": "Edit bitstream",
-	"bitstream.edit.title": "Editar archivo",
+  // "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. <b>This date cannot be modified on this form.</b> To set an embargo date for a bitstream, go to the <i>Item Status</i> tab, click <i>Authorizations...</i>, create or edit the bitstream's <i>READ</i> policy, and set the <i>Start Date</i> as desired.",
+  "bitstream.edit.form.embargo.hint": "El primer día a partir del cual se permite el acceso. <b>Esta fecha no se puede modificar en este formulario.</b> Para establecer una fecha de embargo para un archivo, vaya a la pestaña <i> Estado del artículo </i>, haga clic en <i> Autorizaciones... </ i >, cree o edite la política <i> READ </i> del archivo y configure la <i> Fecha de inicio </i> como desee.",
 
+  // "bitstream.edit.form.embargo.label": "Embargo until specific date",
+  "bitstream.edit.form.embargo.label": "Embargo hasta fecha concreta",
 
+  // "bitstream.edit.form.fileName.hint": "Change the filename for the bitstream. Note that this will change the display bitstream URL, but old links will still resolve as long as the sequence ID does not change.",
+  "bitstream.edit.form.fileName.hint": "Cambie el nombre de archivo del archivo. Tenga en cuenta que esto cambiará la URL de archivo de visualización, pero los enlaces antiguos seguirán resolviéndose siempre que la ID de secuencia no cambie.",
 
-	// "browse.comcol.by.author": "By Author",
-	"browse.comcol.by.author": "Por autor",
+  // "bitstream.edit.form.fileName.label": "Filename",
+  "bitstream.edit.form.fileName.label": "Nombre del archivo",
 
-	// "browse.comcol.by.dateissued": "By Issue Date",
-	"browse.comcol.by.dateissued": "Por fecha de emisión",
+  // "bitstream.edit.form.newFormat.label": "Describe new format",
+  "bitstream.edit.form.newFormat.label": "Describe el nuevo formato",
 
-	// "browse.comcol.by.subject": "By Subject",
-	"browse.comcol.by.subject": "Por tema",
+  // "bitstream.edit.form.newFormat.hint": "The application you used to create the file, and the version number (for example, \"<i>ACMESoft SuperApp version 1.5</i>\").",
+  "bitstream.edit.form.newFormat.hint": "La aplicación que usó para crear el archivo y el número de versión (por ejemplo, \"<i> ACMESoft SuperApp versión 1.5 </i>\").",
 
-	// "browse.comcol.by.title": "By Title",
-	"browse.comcol.by.title": "Por titulo",
+  // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
+  "bitstream.edit.form.primaryBitstream.label": "archivo primario",
 
-	// "browse.comcol.head": "Browse",
-	"browse.comcol.head": "Examinar",
+  // "bitstream.edit.form.selectedFormat.hint": "If the format is not in the above list, <b>select \"format not in list\" above</b> and describe it under \"Describe new format\".",
+  "bitstream.edit.form.selectedFormat.hint": "Si el formato no está en la lista anterior, <b> seleccione \"el formato no está en la lista \" arriba </b> y descríbalo en \"Describir el nuevo formato \".",
 
-	// "browse.empty": "No items to show.",
-	"browse.empty": "No hay artículos para mostrar.",
+  // "bitstream.edit.form.selectedFormat.label": "Selected Format",
+  "bitstream.edit.form.selectedFormat.label": "Formato seleccionado",
 
-	// "browse.metadata.author": "Author",
-	"browse.metadata.author": "Autor",
+  // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
+  "bitstream.edit.form.selectedFormat.unknown": "El formato no está en la lista",
 
-	// "browse.metadata.dateissued": "Issue Date",
-	"browse.metadata.dateissued": "Fecha de asunto",
+  // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
+  "bitstream.edit.notifications.error.format.title": "Se produjo un error al guardar el formato del archivo.",
 
-	// "browse.metadata.subject": "Subject",
-	"browse.metadata.subject": "Tema",
+  // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
+  "bitstream.edit.form.iiifLabel.label": "Etiqueta IIIF",
 
-	// "browse.metadata.title": "Title",
-	"browse.metadata.title": "Título",
+  // "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
+  "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
 
-	// "browse.metadata.author.breadcrumbs": "Browse by Author",
-	"browse.metadata.author.breadcrumbs": "Buscar por autor",
+  // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
+  "bitstream.edit.form.iiifToc.label": "Índice del IIIF",
 
-	// "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
-	"browse.metadata.dateissued.breadcrumbs": "Examinar por fecha",
+  // "bitstream.edit.form.iiifToc.hint": "Adding text here makes this the start of a new table of contents range.",
+  "bitstream.edit.form.iiifToc.hint": "Añadir texto aquí origina un nuevo comienzo del índice.",
 
-	// "browse.metadata.subject.breadcrumbs": "Browse by Subject",
-	"browse.metadata.subject.breadcrumbs": "Examinar por tema",
+  // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
+  "bitstream.edit.form.iiifWidth.label": "Anchura del marco IIIF",
 
-	// "browse.metadata.title.breadcrumbs": "Browse by Title",
-	"browse.metadata.title.breadcrumbs": "Examinar por título",
+  // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
+  "bitstream.edit.form.iiifWidth.hint": "La anchura del marco normalmente debería coincidir con la anchura de la imagen.",
 
-	// "browse.next.button": "Next",
-	"browse.next.button": "próximo",
+  // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
+  "bitstream.edit.form.iiifHeight.label": "Altura del marco IIIF",
 
-	// "browse.previous.button": "Previous",
-	"browse.previous.button": "Anterior",
+  // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
+  "bitstream.edit.form.iiifHeight.hint": "La altura del marco normalmente debería coincidir con la altura de la imagen",
 
-	// "browse.startsWith.choose_start": "(Choose start)",
-	"browse.startsWith.choose_start": "(Elija inicio)",
 
-	// "browse.startsWith.choose_year": "(Choose year)",
-	"browse.startsWith.choose_year": "(Elegir año)",
+  // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
+  "bitstream.edit.notifications.saved.content": "Se guardaron sus cambios en este archivo.",
 
-	// "browse.startsWith.choose_year.label": "Choose the issue year",
-	"browse.startsWith.choose_year.label": "Elija el año de emisión",
+  // "bitstream.edit.notifications.saved.title": "Bitstream saved",
+  "bitstream.edit.notifications.saved.title": "Archivo guardado",
 
-	// "browse.startsWith.jump": "Jump to a point in the index:",
-	"browse.startsWith.jump": "Saltar a un punto del índice:",
+  // "bitstream.edit.title": "Edit bitstream",
+  "bitstream.edit.title": "Editar archivo",
 
-	// "browse.startsWith.months.april": "April",
-	"browse.startsWith.months.april": "abril",
+  // "bitstream-request-a-copy.alert.canDownload1": "You already have access to this file. If you want to download the file, click ",
+  "bitstream-request-a-copy.alert.canDownload1": "Ya tiene acceso al fichero, si quiere descargarlo pulse ",
 
-	// "browse.startsWith.months.august": "August",
-	"browse.startsWith.months.august": "agosto",
+  // "bitstream-request-a-copy.alert.canDownload2": "here",
+  "bitstream-request-a-copy.alert.canDownload2": "aquí",
 
-	// "browse.startsWith.months.december": "December",
-	"browse.startsWith.months.december": "diciembre",
+  // "bitstream-request-a-copy.header": "Request a copy of the file",
+  "bitstream-request-a-copy.header": "Solicitar una copia del fichero",
 
-	// "browse.startsWith.months.february": "February",
-	"browse.startsWith.months.february": "febrero",
+  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
+  "bitstream-request-a-copy.intro": "Introduzca la siguiente información para solicitar una copia del siguiente ítem: ",
 
-	// "browse.startsWith.months.january": "January",
-	"browse.startsWith.months.january": "enero",
+  // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
+  "bitstream-request-a-copy.intro.bitstream.one": "Solicitando el fichero siguiente: ",
+ 
+  // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
+  "bitstream-request-a-copy.intro.bitstream.all": "Solicitando todos los ficheros. ",
 
-	// "browse.startsWith.months.july": "July",
-	"browse.startsWith.months.july": "julio",
+  // "bitstream-request-a-copy.name.label": "Name *",
+  "bitstream-request-a-copy.name.label": "Nombre *",
 
-	// "browse.startsWith.months.june": "June",
-	"browse.startsWith.months.june": "junio",
+  // "bitstream-request-a-copy.name.error": "The name is required",
+  "bitstream-request-a-copy.name.error": "Se requiere un Nombre",
 
-	// "browse.startsWith.months.march": "March",
-	"browse.startsWith.months.march": "marcha",
+  // "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  "bitstream-request-a-copy.email.label": "Su dirección de correo electrónico *",
 
-	// "browse.startsWith.months.may": "May",
-	"browse.startsWith.months.may": "Mayo",
+  // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
+  "bitstream-request-a-copy.email.hint": "Se enviará el fichero a esta dirección de correo electrónico.",
 
-	// "browse.startsWith.months.none": "(Choose month)",
-	"browse.startsWith.months.none": "(Elija mes)",
+  // "bitstream-request-a-copy.email.error": "Please enter a valid email address.",
+  "bitstream-request-a-copy.email.error": "Por favor, introduzca una dirección de correo electrónico válida.",
 
-	// "browse.startsWith.months.none.label": "Choose the issue month",
-	"browse.startsWith.months.none.label": "Elija el mes de emisión",
+  // "bitstream-request-a-copy.allfiles.label": "Files",
+  "bitstream-request-a-copy.allfiles.label": "Ficheros",
 
-	// "browse.startsWith.months.november": "November",
-	"browse.startsWith.months.november": "noviembre",
+  // "bitstream-request-a-copy.files-all-false.label": "Only the requested file",
+  "bitstream-request-a-copy.files-all-false.label": "Solo el fichero indicado",
 
-	// "browse.startsWith.months.october": "October",
-	"browse.startsWith.months.october": "octubre",
+  // "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access",
+  "bitstream-request-a-copy.files-all-true.label": "Todos los ficheros (de este ítem) en acceso restringido",
 
-	// "browse.startsWith.months.september": "September",
-	"browse.startsWith.months.september": "septiembre",
+  // "bitstream-request-a-copy.message.label": "Message",
+  "bitstream-request-a-copy.message.label": "Mensaje",
 
-	// "browse.startsWith.submit": "Browse",
-	"browse.startsWith.submit": "Examinar",
+  // "bitstream-request-a-copy.return": "Back",
+  "bitstream-request-a-copy.return": "Atrás",
 
-	// "browse.startsWith.type_date": "Or type in a date (year-month) and click 'Browse'",
-	"browse.startsWith.type_date": "O escriba una fecha (año-mes) y haga clic en 'Examinar'",
+  // "bitstream-request-a-copy.submit": "Request copy",
+  "bitstream-request-a-copy.submit": "Solicitar copia",
 
-	// "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
-	"browse.startsWith.type_date.label": "O escriba una fecha (año-mes) y haga clic en el botón Examinar",
+  // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
+  "bitstream-request-a-copy.submit.success": "La solicitud de ítem se ha enviado.",
 
-	// "browse.startsWith.type_text": "Type the first few letters and click on the Browse button",
-	"browse.startsWith.type_text": "Escriba las primeras letras y haga clic en el botón Examinar",
+  // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
+  "bitstream-request-a-copy.submit.error": "Hubo un fallo en el envío de la solicitud de ítem.",
 
-	// "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-	"browse.title": "Examinando {{ collection }} por {{ field }} {{ value }}",
 
+  // "browse.back.all-results": "All browse results",
+  "browse.back.all-results": "Todos los resultados de la búsqueda",
 
-	// "chips.remove": "Remove chip",
-	"chips.remove": "Quitar chip",
+  // "browse.comcol.by.author": "By Author",
+  "browse.comcol.by.author": "Por autor",
 
+  // "browse.comcol.by.dateissued": "By Issue Date",
+  "browse.comcol.by.dateissued": "Por fecha de emisión",
 
+  // "browse.comcol.by.subject": "By Subject",
+  "browse.comcol.by.subject": "Por materia",
 
-	// "collection.create.head": "Create a Collection",
-	"collection.create.head": "Crear una colección",
+  // "browse.comcol.by.title": "By Title",
+  "browse.comcol.by.title": "Por titulo",
 
-	// "collection.create.notifications.success": "Successfully created the Collection",
-	"collection.create.notifications.success": "Creó con éxito la colección",
+  // "browse.comcol.head": "Browse",
+  "browse.comcol.head": "Examinar",
 
-	// "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
-	"collection.create.sub-head": "Crea una colección para la comunidad {{ parent }}",
+  // "browse.empty": "No items to show.",
+  "browse.empty": "No hay ítems para mostrar.",
 
-	// "collection.curate.header": "Curate Collection: {{collection}}",
-	"collection.curate.header": "Colección seleccionada: {{ collection }}",
+  // "browse.metadata.author": "Author",
+  "browse.metadata.author": "Autor",
 
-	// "collection.delete.cancel": "Cancel",
-	"collection.delete.cancel": "Cancelar",
+  // "browse.metadata.dateissued": "Issue Date",
+  "browse.metadata.dateissued": "Fecha de publicación",
 
-	// "collection.delete.confirm": "Confirm",
-	"collection.delete.confirm": "Confirmar",
+  // "browse.metadata.subject": "Subject",
+  "browse.metadata.subject": "Materia",
 
-	// "collection.delete.processing": "Deleting",
-	"collection.delete.processing": "Eliminando",
+  // "browse.metadata.title": "Title",
+  "browse.metadata.title": "Título",
 
-	// "collection.delete.head": "Delete Collection",
-	"collection.delete.head": "Eliminar colección",
+  // "browse.metadata.author.breadcrumbs": "Browse by Author",
+  "browse.metadata.author.breadcrumbs": "Buscar por autor",
 
-	// "collection.delete.notification.fail": "Collection could not be deleted",
-	"collection.delete.notification.fail": "No se pudo borrar la colección",
+  // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
+  "browse.metadata.dateissued.breadcrumbs": "Examinar por fecha",
 
-	// "collection.delete.notification.success": "Successfully deleted collection",
-	"collection.delete.notification.success": "Colección eliminada correctamente",
+  // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
+  "browse.metadata.subject.breadcrumbs": "Examinar por materia",
 
-	// "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
-	"collection.delete.text": "¿Estás seguro de que quieres eliminar la colección \"{{ dso }} \"?",
+  // "browse.metadata.title.breadcrumbs": "Browse by Title",
+  "browse.metadata.title.breadcrumbs": "Examinar por título",
 
+  // "pagination.next.button": "Next",
+  "pagination.next.button": "Siguiente",
 
+  // "pagination.previous.button": "Previous",
+  "pagination.previous.button": "Anterior",
 
-	// "collection.edit.delete": "Delete this collection",
-	"collection.edit.delete": "Eliminar esta colección",
+  // "pagination.next.button.disabled.tooltip": "No more pages of results",
+  "pagination.next.button.disabled.tooltip": "No hay mas páginas de resultados",
 
-	// "collection.edit.head": "Edit Collection",
-	"collection.edit.head": "Editar colección",
+  // "browse.startsWith": ", starting with {{ startsWith }}",
+  "browse.startsWith": ", comenzando por {{ startsWith }}",
 
-	// "collection.edit.breadcrumbs": "Edit Collection",
-	"collection.edit.breadcrumbs": "Editar colección",
+  // "browse.startsWith.choose_start": "(Choose start)",
+  "browse.startsWith.choose_start": "(Elija inicio)",
 
+  // "browse.startsWith.choose_year": "(Choose year)",
+  "browse.startsWith.choose_year": "(Elegir año)",
 
+  // "browse.startsWith.choose_year.label": "Choose the issue year",
+  "browse.startsWith.choose_year.label": "Elija el año de publicación",
 
-	// "collection.edit.tabs.mapper.head": "Item Mapper",
-	"collection.edit.tabs.mapper.head": "Asignador de artículos",
+  // "browse.startsWith.jump": "Filter results by year or month",
+  "browse.startsWith.jump": "Filtrar  resultado spor año o por mes:",
 
-	// "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
-	"collection.edit.tabs.item-mapper.title": "Edición de colección: mapeador de artículos",
+  // "browse.startsWith.months.april": "April",
+  "browse.startsWith.months.april": "abril",
 
-	// "collection.edit.item-mapper.cancel": "Cancel",
-	"collection.edit.item-mapper.cancel": "Cancelar",
+  // "browse.startsWith.months.august": "August",
+  "browse.startsWith.months.august": "agosto",
 
-	// "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
-	"collection.edit.item-mapper.collection": "Colección: \"<b>{{ name }}</b>\"",
+  // "browse.startsWith.months.december": "December",
+  "browse.startsWith.months.december": "diciembre",
 
-	// "collection.edit.item-mapper.confirm": "Map selected items",
-	"collection.edit.item-mapper.confirm": "Asignar artículos seleccionados",
+  // "browse.startsWith.months.february": "February",
+  "browse.startsWith.months.february": "febrero",
 
-	// "collection.edit.item-mapper.description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.",
-	"collection.edit.item-mapper.description": "Esta es la herramienta de asignación de artículos que permite a los administradores de colecciones asignar artículos de otras colecciones a esta colección. Puede buscar artículos de otras colecciones y mapearlos, o explorar la lista de artículos mapeados actualmente.",
+  // "browse.startsWith.months.january": "January",
+  "browse.startsWith.months.january": "enero",
 
-	// "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
-	"collection.edit.item-mapper.head": "Asignador de artículos: asigna artículos de otras colecciones",
+  // "browse.startsWith.months.july": "July",
+  "browse.startsWith.months.july": "julio",
 
-	// "collection.edit.item-mapper.no-search": "Please enter a query to search",
-	"collection.edit.item-mapper.no-search": "Ingrese una consulta para buscar",
+  // "browse.startsWith.months.june": "June",
+  "browse.startsWith.months.june": "junio",
 
-	// "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
-	"collection.edit.item-mapper.notifications.map.error.content": "Se produjeron errores en la asignación de {{ amount }} artículos.",
+  // "browse.startsWith.months.march": "March",
+  "browse.startsWith.months.march": "marzo",
 
-	// "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
-	"collection.edit.item-mapper.notifications.map.error.head": "Errores de mapeo",
+  // "browse.startsWith.months.may": "May",
+  "browse.startsWith.months.may": "mayo",
 
-	// "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
-	"collection.edit.item-mapper.notifications.map.success.content": "{{ amount }} artículos asignados correctamente.",
+  // "browse.startsWith.months.none": "(Choose month)",
+  "browse.startsWith.months.none": "(Elija mes)",
 
-	// "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
-	"collection.edit.item-mapper.notifications.map.success.head": "Mapeo completado",
+  // "browse.startsWith.months.none.label": "Choose the issue month",
+  "browse.startsWith.months.none.label": "Elija el mes de publicación",
 
-	// "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.",
-	"collection.edit.item-mapper.notifications.unmap.error.content": "Se produjeron errores al eliminar las asignaciones de {{ amount }} artículos.",
+  // "browse.startsWith.months.november": "November",
+  "browse.startsWith.months.november": "noviembre",
 
-	// "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
-	"collection.edit.item-mapper.notifications.unmap.error.head": "Eliminar errores de mapeo",
+  // "browse.startsWith.months.october": "October",
+  "browse.startsWith.months.october": "octubre",
 
-	// "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
-	"collection.edit.item-mapper.notifications.unmap.success.content": "Se eliminaron correctamente las asignaciones de {{ amount }} artículos.",
+  // "browse.startsWith.months.september": "September",
+  "browse.startsWith.months.september": "septiembre",
 
-	// "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
-	"collection.edit.item-mapper.notifications.unmap.success.head": "Eliminar mapeo completado",
+  // "browse.startsWith.submit": "Browse",
+  "browse.startsWith.submit": "Examinar",
 
-	// "collection.edit.item-mapper.remove": "Remove selected item mappings",
-	"collection.edit.item-mapper.remove": "Eliminar asignaciones de artículos seleccionados",
+  // "browse.startsWith.type_date": "Filter results by date",
+  "browse.startsWith.type_date": "Resultados por fecha",
 
-	// "collection.edit.item-mapper.search-form.placeholder": "Search items...",
-	"collection.edit.item-mapper.search-form.placeholder": "Buscar artículos...",
+  // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
+  "browse.startsWith.type_date.label": "O escriba una fecha (año-mes) y haga clic en el botón Examinar",
 
-	// "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
-	"collection.edit.item-mapper.tabs.browse": "Examinar artículos mapeados",
+  // "browse.startsWith.type_text": "Filter results by typing the first few letters",
+  "browse.startsWith.type_text": "Seleccione resultados tecleando las primeras letras",
 
-	// "collection.edit.item-mapper.tabs.map": "Map new items",
-	"collection.edit.item-mapper.tabs.map": "Asignar nuevos artículos",
+  // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "Examinando {{ collection }} por {{ field }} {{ value }}",
 
+  // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  "browse.title.page": "Examinando {{ collection }}porby {{ field }} {{ value }}",
 
-	// "collection.edit.logo.delete.title": "Delete logo",
-	"collection.edit.logo.delete.title": "Eliminar logo",
 
-	// "collection.edit.logo.delete-undo.title": "Undo delete",
-	"collection.edit.logo.delete-undo.title": "Deshacer eliminación",
+  // "chips.remove": "Remove chip",
+  "chips.remove": "Quitar chip",
 
-	// "collection.edit.logo.label": "Collection logo",
-	"collection.edit.logo.label": "Logotipo de la colección",
 
-	// "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
-	"collection.edit.logo.notifications.add.error": "Error al cargar el logotipo de la colección. Verifique el contenido antes de volver a intentarlo.",
 
-	// "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
-	"collection.edit.logo.notifications.add.success": "Subir el logotipo de la colección correctamente.",
+  // "collection.create.head": "Create a Collection",
+  "collection.create.head": "Crear una colección",
 
-	// "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
-	"collection.edit.logo.notifications.delete.success.title": "Logotipo eliminado",
+  // "collection.create.notifications.success": "Successfully created the Collection",
+  "collection.create.notifications.success": "Colección creada con éxito",
 
-	// "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
-	"collection.edit.logo.notifications.delete.success.content": "Se eliminó correctamente el logotipo de la colección.",
+  // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
+  "collection.create.sub-head": "Crea una colección para la comunidad {{ parent }}",
 
-	// "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
-	"collection.edit.logo.notifications.delete.error.title": "Error al eliminar el logotipo",
+  // "collection.curate.header": "Curate Collection: {{collection}}",
+  "collection.curate.header": "Colección seleccionada: {{ collection }}",
 
-	// "collection.edit.logo.upload": "Drop a Collection Logo to upload",
-	"collection.edit.logo.upload": "Suelta un logotipo de colección para cargar",
+  // "collection.delete.cancel": "Cancel",
+  "collection.delete.cancel": "Cancelar",
 
+  // "collection.delete.confirm": "Confirm",
+  "collection.delete.confirm": "Confirmar",
 
+  // "collection.delete.processing": "Deleting",
+  "collection.delete.processing": "Eliminando",
 
-	// "collection.edit.notifications.success": "Successfully edited the Collection",
-	"collection.edit.notifications.success": "Editó con éxito la colección",
+  // "collection.delete.head": "Delete Collection",
+  "collection.delete.head": "Eliminar colección",
 
-	// "collection.edit.return": "Back",
-	"collection.edit.return": "atrás",
+  // "collection.delete.notification.fail": "Collection could not be deleted",
+  "collection.delete.notification.fail": "No se pudo borrar la colección",
 
+  // "collection.delete.notification.success": "Successfully deleted collection",
+  "collection.delete.notification.success": "Colección eliminada correctamente",
 
+  // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
+  "collection.delete.text": "¿Estás seguro de que quieres eliminar la colección \"{{ dso }} \"?",
 
-	// "collection.edit.tabs.curate.head": "Curate",
-	"collection.edit.tabs.curate.head": "Cura",
 
-	// "collection.edit.tabs.curate.title": "Collection Edit - Curate",
-	"collection.edit.tabs.curate.title": "Edición de colección - Curate",
 
-	// "collection.edit.tabs.authorizations.head": "Authorizations",
-	"collection.edit.tabs.authorizations.head": "Autorizaciones",
+  // "collection.edit.delete": "Delete this collection",
+  "collection.edit.delete": "Eliminar esta colección",
 
-	// "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
-	"collection.edit.tabs.authorizations.title": "Edición de colección: autorizaciones",
+  // "collection.edit.head": "Edit Collection",
+  "collection.edit.head": "Editar colección",
 
-	// "collection.edit.tabs.metadata.head": "Edit Metadata",
-	"collection.edit.tabs.metadata.head": "Editar metadatos",
+  // "collection.edit.breadcrumbs": "Edit Collection",
+  "collection.edit.breadcrumbs": "Editar colección",
 
-	// "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
-	"collection.edit.tabs.metadata.title": "Edición de colección: metadatos",
 
-	// "collection.edit.tabs.roles.head": "Assign Roles",
-	"collection.edit.tabs.roles.head": "Asignar roles",
 
-	// "collection.edit.tabs.roles.title": "Collection Edit - Roles",
-	"collection.edit.tabs.roles.title": "Edición de colección: funciones",
+  // "collection.edit.tabs.mapper.head": "Item Mapper",
+  "collection.edit.tabs.mapper.head": "Mapeo de ítems",
 
-	// "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
-	"collection.edit.tabs.source.external": "Esta colección recolecta su contenido de una fuente externa",
+  // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
+  "collection.edit.tabs.item-mapper.title": "Editar colección: mapeo de ítems",
 
-	// "collection.edit.tabs.source.form.errors.oaiSource.required": "You must provide a set id of the target collection.",
-	"collection.edit.tabs.source.form.errors.oaiSource.required": "Debe proporcionar un ID de conjunto de la colección de destino.",
+  // "collection.edit.item-mapper.cancel": "Cancel",
+  "collection.edit.item-mapper.cancel": "Cancelar",
 
-	// "collection.edit.tabs.source.form.harvestType": "Content being harvested",
-	"collection.edit.tabs.source.form.harvestType": "Contenido que se está recolectando",
+  // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
+  "collection.edit.item-mapper.collection": "Colección: \"<b>{{ name }}</b>\"",
 
-	// "collection.edit.tabs.source.form.head": "Configure an external source",
-	"collection.edit.tabs.source.form.head": "Configurar una fuente externa",
+  // "collection.edit.item-mapper.confirm": "Map selected items",
+  "collection.edit.item-mapper.confirm": "Mapear ítems seleccionados",
 
-	// "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
-	"collection.edit.tabs.source.form.metadataConfigId": "Formato de metadatos",
+  // "collection.edit.item-mapper.description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.",
+  "collection.edit.item-mapper.description": "Esta es la herramienta de mapeo de ítems que permite a los administradores de colecciones asignar ítems de otras colecciones a esta colección. Puede buscar ítems de otras colecciones y mapearlos, o explorar la lista de ítems mapeados actualmente.",
 
-	// "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
-	"collection.edit.tabs.source.form.oaiSetId": "ID de conjunto específico de OAI",
+  // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
+  "collection.edit.item-mapper.head": "Mapeo de ítems: mapea ítems de otras colecciones",
 
-	// "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
-	"collection.edit.tabs.source.form.oaiSource": "Proveedor OAI",
+  // "collection.edit.item-mapper.no-search": "Please enter a query to search",
+  "collection.edit.item-mapper.no-search": "Introduzca una consulta para buscar",
 
-	// "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadata and bitstreams (requires ORE support)",
-	"collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Recolectar metadatos y archivos (requiere soporte ORE)",
+  // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.error.content": "Se produjeron errores en la asignación de {{ amount }} ítems.",
 
-	// "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest metadata and references to bitstreams (requires ORE support)",
-	"collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Recolectar metadatos y referencias a archivos (requiere soporte ORE)",
+  // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
+  "collection.edit.item-mapper.notifications.map.error.head": "Errores de mapeo",
 
-	// "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
-	"collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Recolectar solo metadatos",
+  // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.success.content": "{{ amount }}  ítems mapeados correctamente.",
 
-	// "collection.edit.tabs.source.head": "Content Source",
-	"collection.edit.tabs.source.head": "Fuente de contenido",
+  // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
+  "collection.edit.item-mapper.notifications.map.success.head": "Mapeo completado",
 
-	// "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-	"collection.edit.tabs.source.notifications.discarded.content": "Tus cambios fueron descartados. ",
+  // "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.error.content": "Se produjeron errores al eliminar los mapeos  de {{ amount }} ítems.",
 
-	// "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
-	"collection.edit.tabs.source.notifications.discarded.title": "Cambiado descartado",
+  // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
+  "collection.edit.item-mapper.notifications.unmap.error.head": "Eliminar errores de mapeo",
 
-	// "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
-	"collection.edit.tabs.source.notifications.invalid.content": "Tus cambios no se guardaron. Asegúrese de que todos los campos sean válidos antes de guardar.",
+  // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "Se eliminaron correctamente los mapeos  de {{ amount }} ítems.",
 
-	// "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
-	"collection.edit.tabs.source.notifications.invalid.title": "Metadatos inválidos",
+  // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
+  "collection.edit.item-mapper.notifications.unmap.success.head": "Finalizada la eliminación del mapeo",
 
-	// "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
-	"collection.edit.tabs.source.notifications.saved.content": "Se guardaron sus cambios en la fuente del contenido de esta colección.",
+  // "collection.edit.item-mapper.remove": "Remove selected item mappings",
+  "collection.edit.item-mapper.remove": "Eliminar los mapeos de ítems seleccionados",
 
-	// "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
-	"collection.edit.tabs.source.notifications.saved.title": "Fuente de contenido guardada",
+  // "collection.edit.item-mapper.search-form.placeholder": "Search items...",
+  "collection.edit.item-mapper.search-form.placeholder": "Buscar ítems...",
 
-	// "collection.edit.tabs.source.title": "Collection Edit - Content Source",
-	"collection.edit.tabs.source.title": "Edición de colección: fuente de contenido",
+  // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
+  "collection.edit.item-mapper.tabs.browse": "Examinar ítems mapeados",
 
+  // "collection.edit.item-mapper.tabs.map": "Map new items",
+  "collection.edit.item-mapper.tabs.map": "Asignar nuevos ítems",
 
 
-	// "collection.edit.template.add-button": "Add",
-	"collection.edit.template.add-button": "Agregar",
+  // "collection.edit.logo.delete.title": "Delete logo",
+  "collection.edit.logo.delete.title": "Eliminar logo",
 
-	// "collection.edit.template.breadcrumbs": "Item template",
-	"collection.edit.template.breadcrumbs": "Plantilla de artículo",
+  // "collection.edit.logo.delete-undo.title": "Undo delete",
+  "collection.edit.logo.delete-undo.title": "Deshacer eliminación",
 
-	// "collection.edit.template.cancel": "Cancel",
-	"collection.edit.template.cancel": "Cancelar",
+  // "collection.edit.logo.label": "Collection logo",
+  "collection.edit.logo.label": "Logotipo de la colección",
 
-	// "collection.edit.template.delete-button": "Delete",
-	"collection.edit.template.delete-button": "Borrar",
+  // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
+  "collection.edit.logo.notifications.add.error": "Error al cargar el logotipo de la colección. Verifique el contenido antes de volver a intentarlo.",
 
-	// "collection.edit.template.edit-button": "Edit",
-	"collection.edit.template.edit-button": "Editar",
+  // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
+  "collection.edit.logo.notifications.add.success": "Subida correcta del logotipo de la colección.",
 
-	// "collection.edit.template.error": "An error occurred retrieving the template item",
-	"collection.edit.template.error": "Se produjo un error al recuperar el artículo de la plantilla.",
+  // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "collection.edit.logo.notifications.delete.success.title": "Logotipo eliminado",
 
-	// "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
-	"collection.edit.template.head": "Editar artículo de plantilla para la colección \"{{ collection }} \"",
+  // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
+  "collection.edit.logo.notifications.delete.success.content": "Se eliminó correctamente el logotipo de la colección.",
 
-	// "collection.edit.template.label": "Template item",
-	"collection.edit.template.label": "Artículo de plantilla",
+  // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
+  "collection.edit.logo.notifications.delete.error.title": "Error al eliminar el logotipo",
 
-	// "collection.edit.template.loading": "Loading template item...",
-	"collection.edit.template.loading": "Cargando artículo de plantilla...",
+  // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
+  "collection.edit.logo.upload": "Suelta un logotipo de colección para cargarlo",
 
-	// "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
-	"collection.edit.template.notifications.delete.error": "No se pudo eliminar la plantilla del artículo.",
 
-	// "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
-	"collection.edit.template.notifications.delete.success": "Se eliminó correctamente la plantilla del artículo.",
 
-	// "collection.edit.template.title": "Edit Template Item",
-	"collection.edit.template.title": "Editar artículo de plantilla",
+  // "collection.edit.notifications.success": "Successfully edited the Collection",
+  "collection.edit.notifications.success": "Editó con éxito la colección",
 
+  // "collection.edit.return": "Back",
+  "collection.edit.return": "Atrás",
 
 
-	// "collection.form.abstract": "Short Description",
-	"collection.form.abstract": "Breve descripción",
 
-	// "collection.form.description": "Introductory text (HTML)",
-	"collection.form.description": "Texto introductorio (HTML)",
+  // "collection.edit.tabs.curate.head": "Curate",
+  "collection.edit.tabs.curate.head": "Curar",
 
-	// "collection.form.errors.title.required": "Please enter a collection name",
-	"collection.form.errors.title.required": "Ingrese un nombre de colección",
+  // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
+  "collection.edit.tabs.curate.title": "Edición de colección - Curar",
 
-	// "collection.form.license": "License",
-	"collection.form.license": "Licencia",
+  // "collection.edit.tabs.authorizations.head": "Authorizations",
+  "collection.edit.tabs.authorizations.head": "Autorizaciones",
 
-	// "collection.form.provenance": "Provenance",
-	"collection.form.provenance": "Procedencia",
+  // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
+  "collection.edit.tabs.authorizations.title": "Edición de colección: autorizaciones",
 
-	// "collection.form.rights": "Copyright text (HTML)",
-	"collection.form.rights": "Texto de copyright (HTML)",
+  // "collection.edit.item.authorizations.load-bundle-button": "Load more bundles",
+  "collection.edit.item.authorizations.load-bundle-button": "Cargar mas bloques",
 
-	// "collection.form.tableofcontents": "News (HTML)",
-	"collection.form.tableofcontents": "Noticias (HTML)",
+  // "collection.edit.item.authorizations.load-more-button": "Load more",
+  "collection.edit.item.authorizations.load-more-button": "Cargar mas",
 
-	// "collection.form.title": "Name",
-	"collection.form.title": "Nombre",
+  // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
+  "collection.edit.item.authorizations.show-bitstreams-button": "Mostrar las autorizaciones de los ficheros del bloque",
 
+  // "collection.edit.tabs.metadata.head": "Edit Metadata",
+  "collection.edit.tabs.metadata.head": "Editar metadatos",
 
+  // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
+  "collection.edit.tabs.metadata.title": "Edición de colección: metadatos",
 
-	// "collection.listelement.badge": "Collection",
-	"collection.listelement.badge": "Colección",
+  // "collection.edit.tabs.roles.head": "Assign Roles",
+  "collection.edit.tabs.roles.head": "Asignar roles",
 
+  // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
+  "collection.edit.tabs.roles.title": "Edición de colección - Roles",
 
+  // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
+  "collection.edit.tabs.source.external": "Esta colección recolecta su contenido de una fuente externa",
 
-	// "collection.page.browse.recent.head": "Recent Submissions",
-	"collection.page.browse.recent.head": "Envíos recientes",
+  // "collection.edit.tabs.source.form.errors.oaiSource.required": "You must provide a set id of the target collection.",
+  "collection.edit.tabs.source.form.errors.oaiSource.required": "Debe proporcionar el set-ID  de la colección de destino.",
 
-	// "collection.page.browse.recent.empty": "No items to show",
-	"collection.page.browse.recent.empty": "No hay artículos para mostrar",
+  // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
+  "collection.edit.tabs.source.form.harvestType": "Contenido que se está recolectando",
 
-	// "collection.page.edit": "Edit this collection",
-	"collection.page.edit": "Editar esta colección",
+  // "collection.edit.tabs.source.form.head": "Configure an external source",
+  "collection.edit.tabs.source.form.head": "Configurar una fuente externa",
 
-	// "collection.page.handle": "Permanent URI for this collection",
-	"collection.page.handle": "URI permanente para esta colección",
+  // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
+  "collection.edit.tabs.source.form.metadataConfigId": "Formato de metadatos",
 
-	// "collection.page.license": "License",
-	"collection.page.license": "Licencia",
+  // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
+  "collection.edit.tabs.source.form.oaiSetId": "ID de set específico de OAI",
 
-	// "collection.page.news": "News",
-	"collection.page.news": "Noticias",
+  // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
+  "collection.edit.tabs.source.form.oaiSource": "Proveedor OAI",
 
+  // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadata and bitstreams (requires ORE support)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Recolectar metadatos y archivos (requiere soporte ORE)",
 
+  // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest metadata and references to bitstreams (requires ORE support)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Recolectar metadatos y referencias a archivos (requiere soporte ORE)",
 
-	// "collection.select.confirm": "Confirm selected",
-	"collection.select.confirm": "Confirmar seleccionado",
+  // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Recolectar solo metadatos",
 
-	// "collection.select.empty": "No collections to show",
-	"collection.select.empty": "No hay colecciones para mostrar",
+  // "collection.edit.tabs.source.head": "Content Source",
+  "collection.edit.tabs.source.head": "Origen del contenido",
 
-	// "collection.select.table.title": "Title",
-	"collection.select.table.title": "Título",
+  // "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "collection.edit.tabs.source.notifications.discarded.content": "Tus cambios fueron descartados.  Para recuperarlos, pulse el botón 'Deshacer'",
 
+  // "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
+  "collection.edit.tabs.source.notifications.discarded.title": "Cambiado descartado",
 
+  // "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
+  "collection.edit.tabs.source.notifications.invalid.content": "Tus cambios no se guardaron. Asegúrese de que todos los campos sean válidos antes de guardar.",
 
-	// "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
-	"collection.source.update.notifications.error.content": "La configuración proporcionada se ha probado y no funcionó.",
+  // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
+  "collection.edit.tabs.source.notifications.invalid.title": "Metadatos inválidos",
 
-	// "collection.source.update.notifications.error.title": "Server Error",
-	"collection.source.update.notifications.error.title": "Error del Servidor",
+  // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
+  "collection.edit.tabs.source.notifications.saved.content": "Se guardaron sus cambios en la fuente de contenido de esta colección.",
 
+  // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
+  "collection.edit.tabs.source.notifications.saved.title": "Fuente de contenido guardada",
 
+  // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
+  "collection.edit.tabs.source.title": "Edición de colección: fuente de contenido",
 
-	// "communityList.breadcrumbs": "Community List",
-	"communityList.breadcrumbs": "Lista de la comunidad",
 
-	// "communityList.tabTitle": "Community List",
-	"communityList.tabTitle": "Lista de la comunidad",
 
-	// "communityList.title": "List of Communities",
-	"communityList.title": "Lista de comunidades",
+  // "collection.edit.template.add-button": "Add",
+  "collection.edit.template.add-button": "Agregar",
 
-	// "communityList.showMore": "Show More",
-	"communityList.showMore": "Mostrar más",
+  // "collection.edit.template.breadcrumbs": "Item template",
+  "collection.edit.template.breadcrumbs": "Plantilla de ítem",
 
+  // "collection.edit.template.cancel": "Cancel",
+  "collection.edit.template.cancel": "Cancelar",
 
+  // "collection.edit.template.delete-button": "Delete",
+  "collection.edit.template.delete-button": "Borrar",
 
-	// "community.create.head": "Create a Community",
-	"community.create.head": "Crea una comunidad",
+  // "collection.edit.template.edit-button": "Edit",
+  "collection.edit.template.edit-button": "Editar",
 
-	// "community.create.notifications.success": "Successfully created the Community",
-	"community.create.notifications.success": "Creó con éxito la comunidad",
+  // "collection.edit.template.error": "An error occurred retrieving the template item",
+  "collection.edit.template.error": "Se produjo un error al recuperar la plantilla del ítem.",
 
-	// "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
-	"community.create.sub-head": "Cree una subcomunidad para la comunidad {{ parent }}",
+  // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
+  "collection.edit.template.head": "Editar plantilla del ítem para la colección \"{{ collection }} \"",
 
-	// "community.curate.header": "Curate Community: {{community}}",
-	"community.curate.header": "Comunidad seleccionada: {{ community }}",
+  // "collection.edit.template.label": "Template item",
+  "collection.edit.template.label": "Plantilla de ítem",
 
-	// "community.delete.cancel": "Cancel",
-	"community.delete.cancel": "Cancelar",
+  // "collection.edit.template.loading": "Loading template item...",
+  "collection.edit.template.loading": "Cargando plantilla de ítem...",
 
-	// "community.delete.confirm": "Confirm",
-	"community.delete.confirm": "Confirmar",
+  // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
+  "collection.edit.template.notifications.delete.error": "No se pudo eliminar la plantilla de ítem.",
 
-	// "community.delete.processing": "Deleting...",
-	"community.delete.processing": "Eliminando...",
+  // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
+  "collection.edit.template.notifications.delete.success": "Se eliminó correctamente la plantilla de ítem.",
 
-	// "community.delete.head": "Delete Community",
-	"community.delete.head": "Eliminar comunidad",
+  // "collection.edit.template.title": "Edit Template Item",
+  "collection.edit.template.title": "Editar plantilla de ítem",
 
-	// "community.delete.notification.fail": "Community could not be deleted",
-	"community.delete.notification.fail": "No se pudo eliminar la comunidad",
 
-	// "community.delete.notification.success": "Successfully deleted community",
-	"community.delete.notification.success": "Comunidad eliminada con éxito",
 
-	// "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
-	"community.delete.text": "¿Estás seguro de que deseas eliminar la comunidad \"{{ dso }} \"?",
+  // "collection.form.abstract": "Short Description",
+  "collection.form.abstract": "Breve descripción",
 
-	// "community.edit.delete": "Delete this community",
-	"community.edit.delete": "Eliminar esta comunidad",
+  // "collection.form.description": "Introductory text (HTML)",
+  "collection.form.description": "Texto introductorio (HTML)",
 
-	// "community.edit.head": "Edit Community",
-	"community.edit.head": "Editar comunidad",
+  // "collection.form.errors.title.required": "Please enter a collection name",
+  "collection.form.errors.title.required": "Introduzca un nombre de colección",
 
-	// "community.edit.breadcrumbs": "Edit Community",
-	"community.edit.breadcrumbs": "Editar comunidad",
+  // "collection.form.license": "License",
+  "collection.form.license": "Licencia",
 
+  // "collection.form.provenance": "Provenance",
+  "collection.form.provenance": "Procedencia",
 
-	// "community.edit.logo.delete.title": "Delete logo",
-	"community.edit.logo.delete.title": "Eliminar logo",
+  // "collection.form.rights": "Copyright text (HTML)",
+  "collection.form.rights": "Texto de copyright (HTML)",
 
-	// "community.edit.logo.delete-undo.title": "Undo delete",
-	"community.edit.logo.delete-undo.title": "Deshacer eliminación",
+  // "collection.form.tableofcontents": "News (HTML)",
+  "collection.form.tableofcontents": "Noticias (HTML)",
 
-	// "community.edit.logo.label": "Community logo",
-	"community.edit.logo.label": "Logotipo de la comunidad",
+  // "collection.form.title": "Name",
+  "collection.form.title": "Nombre",
 
-	// "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
-	"community.edit.logo.notifications.add.error": "Error al cargar el logotipo de la comunidad. Verifique el contenido antes de volver a intentarlo.",
+  // "collection.form.entityType": "Entity Type",
+  "collection.form.entityType": "Tipo de entidad",
 
-	// "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
-	"community.edit.logo.notifications.add.success": "Subir el logotipo de la comunidad correctamente.",
 
-	// "community.edit.logo.notifications.delete.success.title": "Logo deleted",
-	"community.edit.logo.notifications.delete.success.title": "Logotipo eliminado",
 
-	// "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
-	"community.edit.logo.notifications.delete.success.content": "Se eliminó correctamente el logotipo de la comunidad.",
+  // "collection.listelement.badge": "Collection",
+  "collection.listelement.badge": "Colección",
 
-	// "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
-	"community.edit.logo.notifications.delete.error.title": "Error al eliminar el logotipo",
 
-	// "community.edit.logo.upload": "Drop a Community Logo to upload",
-	"community.edit.logo.upload": "Suelta un logotipo de la comunidad para cargar",
 
+  // "collection.page.browse.recent.head": "Recent Submissions",
+  "collection.page.browse.recent.head": "Envíos recientes",
 
+  // "collection.page.browse.recent.empty": "No items to show",
+  "collection.page.browse.recent.empty": "No hay ítems para mostrar",
 
-	// "community.edit.notifications.success": "Successfully edited the Community",
-	"community.edit.notifications.success": "Editó con éxito la comunidad",
+  // "collection.page.edit": "Edit this collection",
+  "collection.page.edit": "Editar esta colección",
 
-	// "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
-	"community.edit.notifications.unauthorized": "No tienes privilegios para realizar este cambio",
+  // "collection.page.handle": "Permanent URI for this collection",
+  "collection.page.handle": "URI permanente para esta colección",
 
-	// "community.edit.notifications.error": "An error occured while editing the Community",
-	"community.edit.notifications.error": "Se produjo un error al editar la comunidad.",
+  // "collection.page.license": "License",
+  "collection.page.license": "Licencia",
 
-	// "community.edit.return": "Back",
-	"community.edit.return": "atrás",
+  // "collection.page.news": "News",
+  "collection.page.news": "Noticias",
 
+  // "collection.select.confirm": "Confirm selected",
+  "collection.select.confirm": "Confirmar seleccionado",
 
+  // "collection.select.empty": "No collections to show",
+  "collection.select.empty": "No hay colecciones para mostrar",
 
-	// "community.edit.tabs.curate.head": "Curate",
-	"community.edit.tabs.curate.head": "Cura",
+  // "collection.select.table.title": "Title",
+  "collection.select.table.title": "Título",
 
-	// "community.edit.tabs.curate.title": "Community Edit - Curate",
-	"community.edit.tabs.curate.title": "Edición de la comunidad - Curate",
 
-	// "community.edit.tabs.metadata.head": "Edit Metadata",
-	"community.edit.tabs.metadata.head": "Editar metadatos",
+  // "collection.source.controls.head": "Harvest Controls",
+  "collection.source.controls.head": "Controles de recolección",
+  
+  // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
+  "collection.source.controls.test.submit.error": "Hubo fallos al realizar las pruebas de comprobación de los ajustes",
+  
+  // "collection.source.controls.test.failed": "The script to test the settings has failed",
+  "collection.source.controls.test.failed": "La prueba de los ajustes ha fallado",
+  
+  // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
+  "collection.source.controls.test.completed": "El script de prueba de los ajustes ha terminado correctamente ",
+  
+  // "collection.source.controls.test.submit": "Test configuration",
+  "collection.source.controls.test.submit": "Probar la configuración",
+  
+  // "collection.source.controls.test.running": "Testing configuration...",
+  "collection.source.controls.test.running": "Probando la configuración...",
+  
+  // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
+  "collection.source.controls.import.submit.success": "La importación ha comenzado correctamente",
+  
+  // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
+  "collection.source.controls.import.submit.error": "Hubo algún fallo al iniciar la importación",
+  
+  // "collection.source.controls.import.submit": "Import now",
+  "collection.source.controls.import.submit": "Importar ahora",
+  
+  // "collection.source.controls.import.running": "Importing...",
+  "collection.source.controls.import.running": "Importando...",
+  
+  // "collection.source.controls.import.failed": "An error occurred during the import",
+  "collection.source.controls.import.failed": "Ha ocurrido un error durante la importación",
+  
+  // "collection.source.controls.import.completed": "The import completed",
+  "collection.source.controls.import.completed": "La importación finalizó",
+  
+  // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
+  "collection.source.controls.reset.submit.success": "La restauración y reimportación ha comenzado correctamente",
+  
+  // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
+  "collection.source.controls.reset.submit.error": "Ha ocurrido un error al iniciar la restauración y reimportación",
+  
+  // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
+  "collection.source.controls.reset.failed": "Ha ocurrido un error en la restauración y reimportación",
+  
+  // "collection.source.controls.reset.completed": "The reset and reimport completed",
+  "collection.source.controls.reset.completed": "Restauración y reimportación finalizadas",
+  
+  // "collection.source.controls.reset.submit": "Reset and reimport",
+  "collection.source.controls.reset.submit": "Restauración y reimportación",
+  
+  // "collection.source.controls.reset.running": "Resetting and reimporting...",
+  "collection.source.controls.reset.running": "Restaurando y reimportando...",
+  
+  // "collection.source.controls.harvest.status": "Harvest status:",
+  "collection.source.controls.harvest.status": "Estado de la Recolección:",
+  
+  // "collection.source.controls.harvest.start": "Harvest start time:",
+  "collection.source.controls.harvest.start": "Comienzo de la recolección:",
+  
+  // "collection.source.controls.harvest.last": "Last time harvested:",
+  "collection.source.controls.harvest.last": "Fecha de la última recolección:",
+  
+  // "collection.source.controls.harvest.message": "Harvest info:",
+  "collection.source.controls.harvest.message": "Información de recolección:",
+  
+  // "collection.source.controls.harvest.no-information": "N/A",
+  "collection.source.controls.harvest.no-information": "N/A",
 
-	// "community.edit.tabs.metadata.title": "Community Edit - Metadata",
-	"community.edit.tabs.metadata.title": "Edición de la comunidad: metadatos",
 
-	// "community.edit.tabs.roles.head": "Assign Roles",
-	"community.edit.tabs.roles.head": "Asignar roles",
+  // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
+  "collection.source.update.notifications.error.content": "La configuración proporcionada se ha probado y no funcionó.",
 
-	// "community.edit.tabs.roles.title": "Community Edit - Roles",
-	"community.edit.tabs.roles.title": "Edición de la comunidad: funciones",
+  // "collection.source.update.notifications.error.title": "Server Error",
+  "collection.source.update.notifications.error.title": "Error del Servidor",
 
-	// "community.edit.tabs.authorizations.head": "Authorizations",
-	"community.edit.tabs.authorizations.head": "Autorizaciones",
 
-	// "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-	"community.edit.tabs.authorizations.title": "Edición de la comunidad: autorizaciones",
 
+  // "communityList.breadcrumbs": "Community List",
+  "communityList.breadcrumbs": "Lista de comunidades",
 
+  // "communityList.tabTitle": "Community List",
+  "communityList.tabTitle": "Lista de comunidades",
 
-	// "community.listelement.badge": "Community",
-	"community.listelement.badge": "Comunidad",
+  // "communityList.title": "List of communities",
+  "communityList.title": "Lista de Comunidades",
 
+  // "communityList.showMore": "Show More",
+  "communityList.showMore": "Mostrar más",
 
 
-	// "comcol-role.edit.no-group": "None",
-	"comcol-role.edit.no-group": "Ninguno",
 
-	// "comcol-role.edit.create": "Create",
-	"comcol-role.edit.create": "Crear",
+  // "community.create.head": "Create a Community",
+  "community.create.head": "Crear una comunidad",
 
-	// "comcol-role.edit.restrict": "Restrict",
-	"comcol-role.edit.restrict": "Restringir",
+  // "community.create.notifications.success": "Successfully created the Community",
+  "community.create.notifications.success": "Creada con éxito la comunidad",
 
-	// "comcol-role.edit.delete": "Delete",
-	"comcol-role.edit.delete": "Borrar",
+  // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
+  "community.create.sub-head": "Crear una subcomunidad para la comunidad {{ parent }}",
 
+  // "community.curate.header": "Curate Community: {{community}}",
+  "community.curate.header": "Comunidad seleccionada: {{ community }}",
 
-	// "comcol-role.edit.community-admin.name": "Administrators",
-	"comcol-role.edit.community-admin.name": "Administradores",
+  // "community.delete.cancel": "Cancel",
+  "community.delete.cancel": "Cancelar",
 
-	// "comcol-role.edit.collection-admin.name": "Administrators",
-	"comcol-role.edit.collection-admin.name": "Administradores",
+  // "community.delete.confirm": "Confirm",
+  "community.delete.confirm": "Confirmar",
 
+  // "community.delete.processing": "Deleting...",
+  "community.delete.processing": "Eliminando...",
 
-	// "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
-	"comcol-role.edit.community-admin.description": "Los administradores de la comunidad pueden crear subcomunidades o colecciones y gestionar o asignar la gestión para esas subcomunidades o colecciones. Además, deciden quién puede enviar artículos a las subcolecciones, editar los metadatos del artículo (después del envío) y agregar (mapear) artículos existentes de otras colecciones (sujeto a autorización).",
+  // "community.delete.head": "Delete Community",
+  "community.delete.head": "Eliminar comunidad",
 
-	// "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).",
-	"comcol-role.edit.collection-admin.description": "Los administradores de la colección deciden quién puede enviar artículos a la colección, editar los metadatos del artículo (después del envío) y agregar (mapear) artículos existentes de otras colecciones a esta colección (sujeto a autorización para esa colección).",
+  // "community.delete.notification.fail": "Community could not be deleted",
+  "community.delete.notification.fail": "No se pudo eliminar la comunidad",
 
+  // "community.delete.notification.success": "Successfully deleted community",
+  "community.delete.notification.success": "Comunidad eliminada con éxito",
 
-	// "comcol-role.edit.submitters.name": "Submitters",
-	"comcol-role.edit.submitters.name": "Remitentes",
+  // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
+  "community.delete.text": "¿Está seguro de que desea eliminar la comunidad \"{{ dso }} \"?",
 
-	// "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.",
-	"comcol-role.edit.submitters.description": "Los E-People y Grupos que tienen permiso para enviar nuevos artículos a esta colección.",
+  // "community.edit.delete": "Delete this community",
+  "community.edit.delete": "Eliminar esta comunidad",
 
+  // "community.edit.head": "Edit Community",
+  "community.edit.head": "Editar comunidad",
 
-	// "comcol-role.edit.item_read.name": "Default item read access",
-	"comcol-role.edit.item_read.name": "Acceso de lectura de artículo predeterminado",
+  // "community.edit.breadcrumbs": "Edit Community",
+  "community.edit.breadcrumbs": "Editar comunidad",
 
-	// "comcol-role.edit.item_read.description": "E-People and Groups that can read new items submitted to this collection. Changes to this role are not retroactive. Existing items in the system will still be viewable by those who had read access at the time of their addition.",
-	"comcol-role.edit.item_read.description": "E-People y Grupos que pueden leer nuevos artículos enviados a esta colección. Los cambios en este rol no son retroactivos. Los artículos existentes en el sistema aún serán visibles para aquellos que tenían acceso de lectura en el momento de su adición.",
 
-	// "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
-	"comcol-role.edit.item_read.anonymous-group": "La lectura predeterminada para los artículos entrantes está configurada actualmente como Anónimo.",
+  // "community.edit.logo.delete.title": "Delete logo",
+  "community.edit.logo.delete.title": "Eliminar logo",
 
+  // "community.edit.logo.delete-undo.title": "Undo delete",
+  "community.edit.logo.delete-undo.title": "Deshacer eliminación",
 
-	// "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
-	"comcol-role.edit.bitstream_read.name": "Acceso de lectura de archivo predeterminado",
+  // "community.edit.logo.label": "Community logo",
+  "community.edit.logo.label": "Logotipo de la comunidad",
 
-	// "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
-	"comcol-role.edit.bitstream_read.description": "Los administradores de la comunidad pueden crear subcomunidades o colecciones y gestionar o asignar la gestión para esas subcomunidades o colecciones. Además, deciden quién puede enviar artículos a las subcolecciones, editar los metadatos del artículo (después del envío) y agregar (mapear) artículos existentes de otras colecciones (sujeto a autorización).",
+  // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  "community.edit.logo.notifications.add.error": "Error al cargar el logotipo de la comunidad. Verifique el contenido antes de volver a intentarlo.",
 
-	// "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
-	"comcol-role.edit.bitstream_read.anonymous-group": "La lectura predeterminada para los archivos entrantes se establece actualmente en Anónimo.",
+  // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
+  "community.edit.logo.notifications.add.success": "Subir el logotipo de la comunidad correctamente.",
 
+  // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "community.edit.logo.notifications.delete.success.title": "Logotipo eliminado",
 
-	// "comcol-role.edit.editor.name": "Editors",
-	"comcol-role.edit.editor.name": "Editores",
+  // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
+  "community.edit.logo.notifications.delete.success.content": "Se eliminó correctamente el logotipo de la comunidad.",
 
-	// "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
-	"comcol-role.edit.editor.description": "Los editores pueden editar los metadatos de los envíos entrantes y luego aceptarlos o rechazarlos.",
+  // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
+  "community.edit.logo.notifications.delete.error.title": "Error al eliminar el logotipo",
 
+  // "community.edit.logo.upload": "Drop a Community Logo to upload",
+  "community.edit.logo.upload": "Suelta un logotipo de la comunidad para cargar",
 
-	// "comcol-role.edit.finaleditor.name": "Final editors",
-	"comcol-role.edit.finaleditor.name": "Editores finales",
 
-	// "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
-	"comcol-role.edit.finaleditor.description": "Los editores finales pueden editar los metadatos de los envíos entrantes, pero no podrán rechazarlos.",
 
+  // "community.edit.notifications.success": "Successfully edited the Community",
+  "community.edit.notifications.success": "Editó con éxito la comunidad",
 
-	// "comcol-role.edit.reviewer.name": "Reviewers",
-	"comcol-role.edit.reviewer.name": "Revisores",
+  // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
+  "community.edit.notifications.unauthorized": "No tienes privilegios para realizar este cambio",
 
-	// "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.",
-	"comcol-role.edit.reviewer.description": "Los revisores pueden aceptar o rechazar envíos entrantes. Sin embargo, no pueden editar los metadatos del envío.",
+  // "community.edit.notifications.error": "An error occured while editing the Community",
+  "community.edit.notifications.error": "Se produjo un error al editar la comunidad.",
 
+  // "community.edit.return": "Back",
+  "community.edit.return": "Atrás",
 
 
-	// "community.form.abstract": "Short Description",
-	"community.form.abstract": "Breve descripción",
 
-	// "community.form.description": "Introductory text (HTML)",
-	"community.form.description": "Texto introductorio (HTML)",
+  // "community.edit.tabs.curate.head": "Curate",
+  "community.edit.tabs.curate.head": "Cura",
 
-	// "community.form.errors.title.required": "Please enter a community name",
-	"community.form.errors.title.required": "Ingrese un nombre de comunidad",
+  // "community.edit.tabs.curate.title": "Community Edit - Curate",
+  "community.edit.tabs.curate.title": "Edición de la comunidad - Curate",
 
-	// "community.form.rights": "Copyright text (HTML)",
-	"community.form.rights": "Texto de copyright (HTML)",
+  // "community.edit.tabs.metadata.head": "Edit Metadata",
+  "community.edit.tabs.metadata.head": "Editar metadatos",
 
-	// "community.form.tableofcontents": "News (HTML)",
-	"community.form.tableofcontents": "Noticias (HTML)",
+  // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
+  "community.edit.tabs.metadata.title": "Edición de la comunidad: metadatos",
 
-	// "community.form.title": "Name",
-	"community.form.title": "Nombre",
+  // "community.edit.tabs.roles.head": "Assign Roles",
+  "community.edit.tabs.roles.head": "Asignar roles",
 
-	// "community.page.edit": "Edit this community",
-	"community.page.edit": "Editar esta comunidad",
+  // "community.edit.tabs.roles.title": "Community Edit - Roles",
+  "community.edit.tabs.roles.title": "Edición de la comunidad: funciones",
 
-	// "community.page.handle": "Permanent URI for this community",
-	"community.page.handle": "URI permanente para esta comunidad",
+  // "community.edit.tabs.authorizations.head": "Authorizations",
+  "community.edit.tabs.authorizations.head": "Autorizaciones",
 
-	// "community.page.license": "License",
-	"community.page.license": "Licencia",
+  // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
+  "community.edit.tabs.authorizations.title": "Edición de la comunidad: autorizaciones",
 
-	// "community.page.news": "News",
-	"community.page.news": "Noticias",
 
-	// "community.all-lists.head": "Subcommunities and Collections",
-	"community.all-lists.head": "Subcomunidades y colecciones",
 
-	// "community.sub-collection-list.head": "Collections of this Community",
-	"community.sub-collection-list.head": "Colecciones de esta comunidad",
+  // "community.listelement.badge": "Community",
+  "community.listelement.badge": "Comunidad",
 
-	// "community.sub-community-list.head": "Communities of this Community",
-	"community.sub-community-list.head": "Comunidades de esta comunidad",
 
 
+  // "comcol-role.edit.no-group": "None",
+  "comcol-role.edit.no-group": "Ninguno",
 
-	// "cookies.consent.accept-all": "Accept all",
-	"cookies.consent.accept-all": "Aceptar todo",
+  // "comcol-role.edit.create": "Create",
+  "comcol-role.edit.create": "Crear",
 
-	// "cookies.consent.accept-selected": "Accept selected",
-	"cookies.consent.accept-selected": "Aceptar seleccionado",
+  // "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role",
+  "comcol-role.edit.create.error.title": "Error al crear un grupo para el rol '{{ role }}'",
 
-	// "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
-	"cookies.consent.app.opt-out.description": "Esta aplicación se carga de forma predeterminada (pero puede optar por no participar)",
+  // "comcol-role.edit.restrict": "Restrict",
+  "comcol-role.edit.restrict": "Restringir",
 
-	// "cookies.consent.app.opt-out.title": "(opt-out)",
-	"cookies.consent.app.opt-out.title": "(optar por no)",
+  // "comcol-role.edit.delete": "Delete",
+  "comcol-role.edit.delete": "Borrar",
 
-	// "cookies.consent.app.purpose": "purpose",
-	"cookies.consent.app.purpose": "objetivo",
+  // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
+  "comcol-role.edit.delete.error.title": "Error al borrar el grupo del rol '{{ role }}'",
 
-	// "cookies.consent.app.required.description": "This application is always required",
-	"cookies.consent.app.required.description": "Esta aplicación siempre es necesaria",
 
-	// "cookies.consent.app.required.title": "(always required)",
-	"cookies.consent.app.required.title": "(siempre requerido)",
+  // "comcol-role.edit.community-admin.name": "Administrators",
+  "comcol-role.edit.community-admin.name": "Administradores",
 
-	// "cookies.consent.update": "There were changes since your last visit, please update your consent.",
-	"cookies.consent.update": "Hubo cambios desde su última visita, actualice su consentimiento.",
+  // "comcol-role.edit.collection-admin.name": "Administrators",
+  "comcol-role.edit.collection-admin.name": "Administradores",
 
-	// "cookies.consent.close": "Close",
-	"cookies.consent.close": "Cerrar",
 
-	// "cookies.consent.decline": "Decline",
-	"cookies.consent.decline": "Disminución",
+  // "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
+  "comcol-role.edit.community-admin.description": "Los administradores de la comunidad pueden crear subcomunidades o colecciones y gestionar o asignar la gestión para esas subcomunidades o colecciones. Además, deciden quién puede enviar artículos a las subcolecciones, editar los metadatos del artículo (después del envío) y agregar (mapear) artículos existentes de otras colecciones (sujeto a autorización).",
 
-	// "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
-	"cookies.consent.content-notice.description": "Recopilamos y procesamos su información personal para los siguientes propósitos: <strong> Autenticación, Preferencias, Reconocimiento y Estadísticas </strong>. <br/> Para obtener más información, lea nuestra {privacyPolicy}.",
+  // "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).",
+  "comcol-role.edit.collection-admin.description": "Los administradores de la colección deciden quién puede enviar artículos a la colección, editar los metadatos del artículo (después del envío) y agregar (mapear) artículos existentes de otras colecciones a esta colección (sujeto a autorización para esa colección).",
 
-	// "cookies.consent.content-notice.learnMore": "Customize",
-	"cookies.consent.content-notice.learnMore": "Personalizar",
 
-	// "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
-	"cookies.consent.content-modal.description": "Aquí puede ver y personalizar la información que recopilamos sobre usted.",
+  // "comcol-role.edit.submitters.name": "Submitters",
+  "comcol-role.edit.submitters.name": "Remitentes",
 
-	// "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
-	"cookies.consent.content-modal.privacy-policy.name": "política de privacidad",
+  // "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.",
+  "comcol-role.edit.submitters.description": "Los E-People y Grupos que tienen permiso para enviar nuevos artículos a esta colección.",
 
-	// "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
-	"cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
 
-	// "cookies.consent.content-modal.title": "Information that we collect",
-	"cookies.consent.content-modal.title": "Información que recopilamos",
+  // "comcol-role.edit.item_read.name": "Default item read access",
+  "comcol-role.edit.item_read.name": "Acceso de lectura de artículo predeterminado",
 
+  // "comcol-role.edit.item_read.description": "E-People and Groups that can read new items submitted to this collection. Changes to this role are not retroactive. Existing items in the system will still be viewable by those who had read access at the time of their addition.",
+  "comcol-role.edit.item_read.description": "E-People y Grupos que pueden leer nuevos artículos enviados a esta colección. Los cambios en este rol no son retroactivos. Los artículos existentes en el sistema aún serán visibles para aquellos que tenían acceso de lectura en el momento de su adición.",
 
+  // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
+  "comcol-role.edit.item_read.anonymous-group": "La lectura predeterminada para los artículos entrantes está configurada actualmente como Anónimo.",
 
-	// "cookies.consent.app.title.authentication": "Authentication",
-	"cookies.consent.app.title.authentication": "Autenticación",
 
-	// "cookies.consent.app.description.authentication": "Required for signing you in",
-	"cookies.consent.app.description.authentication": "Requerido para iniciar sesión",
+  // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
+  "comcol-role.edit.bitstream_read.name": "Acceso de lectura de archivo predeterminado",
 
+  // "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
+  "comcol-role.edit.bitstream_read.description": "Los administradores de la comunidad pueden crear subcomunidades o colecciones y gestionar o asignar la gestión para esas subcomunidades o colecciones. Además, deciden quién puede enviar artículos a las subcolecciones, editar los metadatos del artículo (después del envío) y agregar (mapear) artículos existentes de otras colecciones (sujeto a autorización).",
 
-	// "cookies.consent.app.title.preferences": "Preferences",
-	"cookies.consent.app.title.preferences": "Preferencias",
+  // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
+  "comcol-role.edit.bitstream_read.anonymous-group": "La lectura predeterminada para los archivos entrantes se establece actualmente en Anónimo.",
 
-	// "cookies.consent.app.description.preferences": "Required for saving your preferences",
-	"cookies.consent.app.description.preferences": "Requerido para guardar sus preferencias",
 
+  // "comcol-role.edit.editor.name": "Editors",
+  "comcol-role.edit.editor.name": "Editores",
 
+  // "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
+  "comcol-role.edit.editor.description": "Los editores pueden editar los metadatos de los envíos entrantes y luego aceptarlos o rechazarlos.",
 
-	// "cookies.consent.app.title.acknowledgement": "Acknowledgement",
-	"cookies.consent.app.title.acknowledgement": "Reconocimiento",
 
-	// "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
-	"cookies.consent.app.description.acknowledgement": "Requerido para guardar sus reconocimientos y consentimientos",
+  // "comcol-role.edit.finaleditor.name": "Final editors",
+  "comcol-role.edit.finaleditor.name": "Editores finales",
 
+  // "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
+  "comcol-role.edit.finaleditor.description": "Los editores finales pueden editar los metadatos de los envíos entrantes, pero no podrán rechazarlos.",
 
 
-	// "cookies.consent.app.title.google-analytics": "Google Analytics",
-	"cookies.consent.app.title.google-analytics": "Google analitico",
+  // "comcol-role.edit.reviewer.name": "Reviewers",
+  "comcol-role.edit.reviewer.name": "Revisores",
 
-	// "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
-	"cookies.consent.app.description.google-analytics": "Nos permite rastrear datos estadísticos",
+  // "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.",
+  "comcol-role.edit.reviewer.description": "Los revisores pueden aceptar o rechazar envíos entrantes. Sin embargo, no pueden editar los metadatos del envío.",
 
 
 
-	// "cookies.consent.purpose.functional": "Functional",
-	"cookies.consent.purpose.functional": "Funcional",
+  // "community.form.abstract": "Short Description",
+  "community.form.abstract": "Breve descripción",
 
-	// "cookies.consent.purpose.statistical": "Statistical",
-	"cookies.consent.purpose.statistical": "Estadístico",
+  // "community.form.description": "Introductory text (HTML)",
+  "community.form.description": "Texto introductorio (HTML)",
 
+  // "community.form.errors.title.required": "Please enter a community name",
+  "community.form.errors.title.required": "Introduzca un nombre de comunidad",
 
-	// "curation-task.task.checklinks.label":  "Check Links in Metadata",
-	"curation-task.task.checklinks.label": "Comprobar enlaces en metadatos",
+  // "community.form.rights": "Copyright text (HTML)",
+  "community.form.rights": "Texto de copyright (HTML)",
 
-	// "curation-task.task.noop.label": "NOOP",
-	"curation-task.task.noop.label": "NOOP",
+  // "community.form.tableofcontents": "News (HTML)",
+  "community.form.tableofcontents": "Noticias (HTML)",
 
-	// "curation-task.task.profileformats.label": "Profile Bitstream Formats",
-	"curation-task.task.profileformats.label": "Formatos de archivo de perfil",
+  // "community.form.title": "Name",
+  "community.form.title": "Nombre",
 
-	// "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
-	"curation-task.task.requiredmetadata.label": "Verifique los metadatos requeridos",
+  // "community.page.edit": "Edit this community",
+  "community.page.edit": "Editar esta comunidad",
 
-	// "curation-task.task.translate.label": "Microsoft Translator",
-	"curation-task.task.translate.label": "Traductor de Microsoft",
+  // "community.page.handle": "Permanent URI for this community",
+  "community.page.handle": "URI permanente para esta comunidad",
 
-	// "curation-task.task.vscan.label": "Virus Scan",
-	"curation-task.task.vscan.label": "Búsqueda de virus",
+  // "community.page.license": "License",
+  "community.page.license": "Licencia",
 
+  // "community.page.news": "News",
+  "community.page.news": "Noticias",
 
+  // "community.all-lists.head": "Subcommunities and Collections",
+  "community.all-lists.head": "Subcomunidades y colecciones",
 
-	// "curation.form.task-select.label": "Task:",
-	"curation.form.task-select.label": "Tarea:",
+  // "community.sub-collection-list.head": "Collections of this Community",
+  "community.sub-collection-list.head": "Colecciones de esta comunidad",
 
-	// "curation.form.submit": "Start",
-	"curation.form.submit": "Comienzo",
+  // "community.sub-community-list.head": "Communities of this Community",
+  "community.sub-community-list.head": "Comunidades de esta comunidad",
 
-	// "curation.form.submit.success.head": "The curation task has been started successfully",
-	"curation.form.submit.success.head": "La tarea de conservación se ha iniciado con éxito.",
 
-	// "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
-	"curation.form.submit.success.content": "Serás redirigido a la página de proceso correspondiente.",
 
-	// "curation.form.submit.error.head": "Running the curation task failed",
-	"curation.form.submit.error.head": "Error al ejecutar la tarea de conservación",
+  // "cookies.consent.accept-all": "Accept all",
+  "cookies.consent.accept-all": "Aceptar todo",
 
-	// "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
-	"curation.form.submit.error.content": "Se produjo un error al intentar iniciar la tarea de conservación.",
+  // "cookies.consent.accept-selected": "Accept selected",
+  "cookies.consent.accept-selected": "Aceptar seleccionado",
 
-	// "curation.form.handle.label": "Handle:",
-	"curation.form.handle.label": "Resolver:",
+  // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
+  "cookies.consent.app.opt-out.description": "Esta aplicación se carga de forma predeterminada (pero puede optar por salir)",
 
-	// "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
-	"curation.form.handle.hint": "Sugerencia: ingrese [your-handle-prefix] / 0 para ejecutar una tarea en todo el sitio (no todas las tareas pueden admitir esta capacidad)",
+  // "cookies.consent.app.opt-out.title": "(opt-out)",
+  "cookies.consent.app.opt-out.title": "(optar por salir)",
 
+  // "cookies.consent.app.purpose": "purpose",
+  "cookies.consent.app.purpose": "objetivo",
 
+  // "cookies.consent.app.required.description": "This application is always required",
+  "cookies.consent.app.required.description": "Esta aplicación siempre es necesaria",
 
-	// "dso.name.untitled": "Untitled",
-	"dso.name.untitled": "Intitulado",
+  // "cookies.consent.app.required.title": "(always required)",
+  "cookies.consent.app.required.title": "(siempre requerido)",
 
+  // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
+  "cookies.consent.update": "Hubo cambios desde su última visita, actualice su consentimiento.",
 
+  // "cookies.consent.close": "Close",
+  "cookies.consent.close": "Cerrar",
 
-	// "dso-selector.create.collection.head": "New collection",
-	"dso-selector.create.collection.head": "Nueva colección",
+  // "cookies.consent.decline": "Decline",
+  "cookies.consent.decline": "Disminución",
 
-	// "dso-selector.create.collection.sub-level": "Create a new collection in",
-	"dso-selector.create.collection.sub-level": "Crea una nueva colección en",
+  // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
+  "cookies.consent.content-notice.description": "Recopilamos y procesamos su información personal para los siguientes propósitos: <strong> Autenticación, Preferencias, Reconocimiento y Estadísticas </strong>. <br/> Para obtener más información, lea nuestra {privacyPolicy}.",
 
-	// "dso-selector.create.community.head": "New community",
-	"dso-selector.create.community.head": "Nueva comunidad",
+  // "cookies.consent.content-notice.learnMore": "Customize",
+  "cookies.consent.content-notice.learnMore": "Personalizar",
 
-	// "dso-selector.create.community.sub-level": "Create a new community in",
-	"dso-selector.create.community.sub-level": "Crea una nueva comunidad en",
+  // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
+  "cookies.consent.content-modal.description": "Aquí puede ver y personalizar la información que recopilamos sobre usted.",
 
-	// "dso-selector.create.community.top-level": "Create a new top-level community",
-	"dso-selector.create.community.top-level": "Crea una nueva comunidad de alto nivel",
+  // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
+  "cookies.consent.content-modal.privacy-policy.name": "política de privacidad",
 
-	// "dso-selector.create.item.head": "New item",
-	"dso-selector.create.item.head": "Nuevo artículo",
+  // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
+  "cookies.consent.content-modal.privacy-policy.text": "Para mas información, lea por favor nuestra{privacyPolicy}.",
 
-	// "dso-selector.create.item.sub-level": "Create a new item in",
-	"dso-selector.create.item.sub-level": "Crea un nuevo artículo en",
+  // "cookies.consent.content-modal.title": "Information that we collect",
+  "cookies.consent.content-modal.title": "Información que recopilamos",
 
-	// "dso-selector.create.submission.head": "New submission",
-	"dso-selector.create.submission.head": "Nuevo envío",
 
-	// "dso-selector.edit.collection.head": "Edit collection",
-	"dso-selector.edit.collection.head": "Editar colección",
 
-	// "dso-selector.edit.community.head": "Edit community",
-	"dso-selector.edit.community.head": "Editar comunidad",
+  // "cookies.consent.app.title.authentication": "Authentication",
+  "cookies.consent.app.title.authentication": "Autenticación",
 
-	// "dso-selector.edit.item.head": "Edit item",
-	"dso-selector.edit.item.head": "Editar artículo",
+  // "cookies.consent.app.description.authentication": "Required for signing you in",
+  "cookies.consent.app.description.authentication": "Requerido para iniciar sesión",
 
-	// "dso-selector.error.title": "An error occurred searching for a {{ type }}",
-	"dso-selector.error.title": "Se produjo un error al buscar un {{ type }}",
 
-	// "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
-	"dso-selector.export-metadata.dspaceobject.head": "Exportar metadatos de",
+  // "cookies.consent.app.title.preferences": "Preferences",
+  "cookies.consent.app.title.preferences": "Preferencias",
 
-	// "dso-selector.no-results": "No {{ type }} found",
-	"dso-selector.no-results": "No se encontró {{ type }}",
+  // "cookies.consent.app.description.preferences": "Required for saving your preferences",
+  "cookies.consent.app.description.preferences": "Requerido para guardar sus preferencias",
 
-	// "dso-selector.placeholder": "Search for a {{ type }}",
-	"dso-selector.placeholder": "Busque un {{ type }}",
 
 
+  // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
+  "cookies.consent.app.title.acknowledgement": "Reconocimiento",
 
-	// "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
-	"confirmation-modal.export-metadata.header": "Exportar metadatos para {{ dsoName }}",
+  // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
+  "cookies.consent.app.description.acknowledgement": "Requerido para guardar sus reconocimientos y consentimientos",
 
-	// "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
-	"confirmation-modal.export-metadata.info": "¿Está seguro de que desea exportar metadatos para {{ dsoName }}?",
 
-	// "confirmation-modal.export-metadata.cancel": "Cancel",
-	"confirmation-modal.export-metadata.cancel": "Cancelar",
 
-	// "confirmation-modal.export-metadata.confirm": "Export",
-	"confirmation-modal.export-metadata.confirm": "Exportar",
+  // "cookies.consent.app.title.google-analytics": "Google Analytics",
+  "cookies.consent.app.title.google-analytics": "Google Analytics",
 
-	// "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
-	"confirmation-modal.delete-eperson.header": "Eliminar EPerson \"{{ dsoName }} \"",
+  // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
+  "cookies.consent.app.description.google-analytics": "Nos permite rastrear datos estadísticos",
 
-	// "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
-	"confirmation-modal.delete-eperson.info": "¿Está seguro de que desea eliminar EPerson \"{{ dsoName }} \"?",
 
-	// "confirmation-modal.delete-eperson.cancel": "Cancel",
-	"confirmation-modal.delete-eperson.cancel": "Cancelar",
 
-	// "confirmation-modal.delete-eperson.confirm": "Delete",
-	"confirmation-modal.delete-eperson.confirm": "Borrar",
+  // "cookies.consent.purpose.functional": "Functional",
+  "cookies.consent.purpose.functional": "Funcional",
 
+  // "cookies.consent.purpose.statistical": "Statistical",
+  "cookies.consent.purpose.statistical": "Estadístico",
 
-	// "error.bitstream": "Error fetching bitstream",
-	"error.bitstream": "Error al obtener el archivo",
 
-	// "error.browse-by": "Error fetching items",
-	"error.browse-by": "Error al obtener artículos",
+  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
+  "curation-task.task.checklinks.label": "Comprobar enlaces en metadatos",
 
-	// "error.collection": "Error fetching collection",
-	"error.collection": "Error al recuperar la colección",
+  // "curation-task.task.noop.label": "NOOP",
+  "curation-task.task.noop.label": "NOOP",
 
-	// "error.collections": "Error fetching collections",
-	"error.collections": "Error al obtener colecciones",
+  // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
+  "curation-task.task.profileformats.label": "Formatos de perfil de archivo de perfil",
 
-	// "error.community": "Error fetching community",
-	"error.community": "Error al recuperar la comunidad",
+  // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
+  "curation-task.task.requiredmetadata.label": "Comprobar los metadatos requeridos",
 
-	// "error.identifier": "No item found for the identifier",
-	"error.identifier": "No se encontró ningún artículo para el identificador",
+  // "curation-task.task.translate.label": "Microsoft Translator",
+  "curation-task.task.translate.label": "Traductor de Microsoft",
 
-	// "error.default": "Error",
-	"error.default": "Error",
+  // "curation-task.task.vscan.label": "Virus Scan",
+  "curation-task.task.vscan.label": "Búsqueda de virus",
 
-	// "error.item": "Error fetching item",
-	"error.item": "Error al obtener el artículo",
 
-	// "error.items": "Error fetching items",
-	"error.items": "Error al obtener artículos",
 
-	// "error.objects": "Error fetching objects",
-	"error.objects": "Error al recuperar objetos",
+  // "curation.form.task-select.label": "Task:",
+  "curation.form.task-select.label": "Tarea:",
 
-	// "error.recent-submissions": "Error fetching recent submissions",
-	"error.recent-submissions": "Error al obtener envíos recientes",
+  // "curation.form.submit": "Start",
+  "curation.form.submit": "Comienzo",
 
-	// "error.search-results": "Error fetching search results",
-	"error.search-results": "Error al obtener los resultados de la búsqueda",
+  // "curation.form.submit.success.head": "The curation task has been started successfully",
+  "curation.form.submit.success.head": "La tarea de curación se ha iniciado con éxito.",
 
-	// "error.sub-collections": "Error fetching sub-collections",
-	"error.sub-collections": "Error al obtener subcolecciones",
+  // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
+  "curation.form.submit.success.content": "Será redirigido a la página del proceso correspondiente.",
 
-	// "error.sub-communities": "Error fetching sub-communities",
-	"error.sub-communities": "Error al obtener subcomunidades",
+  // "curation.form.submit.error.head": "Running the curation task failed",
+  "curation.form.submit.error.head": "Error al ejecutar la tarea de curación",
 
-	// "error.submission.sections.init-form-error": "An error occurred during section initialize, please check your input-form configuration. Details are below : <br> <br>",
-	"error.submission.sections.init-form-error": "Se produjo un error durante la inicialización de la sección, verifique la configuración del formulario de entrada. ",
+  // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+  "curation.form.submit.error.content": "Se produjo un error al intentar iniciar la tarea de curación.",
 
-	// "error.top-level-communities": "Error fetching top-level communities",
-	"error.top-level-communities": "Error al obtener las comunidades de nivel superior",
+  // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
+  "curation.form.submit.error.invalid-handle": "No se pudo determinar el handle de este objeto",
 
-	// "error.validation.license.notgranted": "You must grant this license to complete your submission. If you are unable to grant this license at this time you may save your work and return later or remove the submission.",
-	"error.validation.license.notgranted": "Debe otorgar esta licencia para completar su envío. Si no puede otorgar esta licencia en este momento, puede guardar su trabajo y regresar más tarde o eliminar el envío.",
+  // "curation.form.handle.label": "Handle:",
+  "curation.form.handle.label": "Handle:",
 
-	// "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
-	"error.validation.pattern": "Esta entrada está restringida por el patrón actual: {{ pattern }}.",
+  // "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
+  "curation.form.handle.hint": "Sugerencia: Introduzca [su-prefijo-handle] / 0 para ejecutar una tarea en toda su instalación (no todas las tareas permiten esta opción)",
 
-	// "error.validation.filerequired": "The file upload is mandatory",
-	"error.validation.filerequired": "La carga del archivo es obligatoria",
 
+  // "deny-request-copy.email.message": "Dear {{ recipientName }},\nIn response to your request I regret to inform you that it's not possible to send you a copy of the file(s) you have requested, concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am an author.\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>",
+  "deny-request-copy.email.message": "Estimado {{ recipientName }},\nrespondiendo a su solicitud, lamento informarle que noe s posible I regret to inform you that it's not possible to send you a copy of the file(s) you have requested, concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am an author.\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>",
 
+  // "deny-request-copy.email.subject": "Request copy of document",
+  "deny-request-copy.email.subject": "Solicitar una copia del documento",
 
-	// "file-section.error.header": "Error obtaining files for this item",
-	"file-section.error.header": "Error al obtener archivos para este artículo",
+  // "deny-request-copy.error": "An error occurred",
+  "deny-request-copy.error": "Ha ocurrido un error",
 
+  // "deny-request-copy.header": "Deny document copy request",
+  "deny-request-copy.header": "Denegar copia del documento",
 
+  // "deny-request-copy.intro": "This message will be sent to the applicant of the request",
+  "deny-request-copy.intro": "Éste es el texto que será enviado al solicitante.",
 
-	// "footer.copyright": "copyright © 2002-{{ year }}",
-	"footer.copyright": "copyright © 2002 - {{ year }}",
+  // "deny-request-copy.success": "Successfully denied item request",
+  "deny-request-copy.success": "Solicitud de copia de documento denegada",
 
-	// "footer.link.dspace": "DSpace software",
-	"footer.link.dspace": "Software DSpace",
 
-	// "footer.link.lyrasis": "LYRASIS",
-	"footer.link.lyrasis": "LYRASIS",
 
-	// "footer.link.cookies": "Cookie settings",
-	"footer.link.cookies": "Configuración de cookies",
+  // "dso.name.untitled": "Untitled",
+  "dso.name.untitled": "Sin título",
 
-	// "footer.link.privacy-policy": "Privacy policy",
-	"footer.link.privacy-policy": "Política de privacidad",
 
-	// "footer.link.end-user-agreement":"End User Agreement",
-	"footer.link.end-user-agreement": "Acuerdo de usuario final",
+  // "dso-selector.create.collection.head": "New collection",
+  "dso-selector.create.collection.head": "Nueva colección",
 
+  // "dso-selector.create.collection.sub-level": "Create a new collection in",
+  "dso-selector.create.collection.sub-level": "Crea una nueva colección en",
 
+  // "dso-selector.create.community.head": "New community",
+  "dso-selector.create.community.head": "Nueva comunidad",
 
-	// "forgot-email.form.header": "Forgot Password",
-	"forgot-email.form.header": "Has olvidado tu contraseña",
+  // "dso-selector.create.community.sub-level": "Create a new community in",
+  "dso-selector.create.community.sub-level": "Crea una nueva comunidad en",
 
-	// "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-	"forgot-email.form.info": "Ingrese Registre una cuenta para suscribirse a colecciones para recibir actualizaciones por correo electrónico y envíe nuevos artículos a DSpace.",
+  // "dso-selector.create.community.top-level": "Create a new top-level community",
+  "dso-selector.create.community.top-level": "Crea una nueva comunidad de alto nivel",
 
-	// "forgot-email.form.email": "Email Address *",
-	"forgot-email.form.email": "Dirección de correo electrónico *",
+  // "dso-selector.create.item.head": "New item",
+  "dso-selector.create.item.head": "Nuevo ítem",
 
-	// "forgot-email.form.email.error.required": "Please fill in an email address",
-	"forgot-email.form.email.error.required": "Por favor ingrese una dirección de correo electrónico",
+  // "dso-selector.create.item.sub-level": "Create a new item in",
+  "dso-selector.create.item.sub-level": "Crea un nuevo ítem en",
 
-	// "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
-	"forgot-email.form.email.error.pattern": "Por favor ingrese una dirección de correo electrónico válida",
+  // "dso-selector.create.submission.head": "New submission",
+  "dso-selector.create.submission.head": "Nuevo envío",
 
-	// "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
-	"forgot-email.form.email.hint": "Esta dirección será verificada y utilizada como su nombre de inicio de sesión.",
+  // "dso-selector.edit.collection.head": "Edit collection",
+  "dso-selector.edit.collection.head": "Editar colección",
 
-	// "forgot-email.form.submit": "Save",
-	"forgot-email.form.submit": "Guardar",
+  // "dso-selector.edit.community.head": "Edit community",
+  "dso-selector.edit.community.head": "Editar comunidad",
 
-	// "forgot-email.form.success.head": "Verification email sent",
-	"forgot-email.form.success.head": "El mensaje de verificación ha sido enviado",
+  // "dso-selector.edit.item.head": "Edit item",
+  "dso-selector.edit.item.head": "Editar ítem",
 
-	// "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-	"forgot-email.form.success.content": "Se envió un correo electrónico a {{ email }} que contiene una URL especial y más instrucciones.",
+  // "dso-selector.error.title": "An error occurred searching for a {{ type }}",
+  "dso-selector.error.title": "Se ha producido un error al buscar un {{ type }}",
 
-	// "forgot-email.form.error.head": "Error when trying to register email",
-	"forgot-email.form.error.head": "Error al intentar registrar el correo electrónico",
+  // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
+  "dso-selector.export-metadata.dspaceobject.head": "Exportar metadatos desde",
 
-	// "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
-	"forgot-email.form.error.content": "Se produjo un error al registrar la siguiente dirección de correo electrónico: {{ email }}",
+  // "dso-selector.no-results": "No {{ type }} found",
+  "dso-selector.no-results": "No se encontró {{ type }}",
 
+  // "dso-selector.placeholder": "Search for a {{ type }}",
+  "dso-selector.placeholder": "Busque un {{ type }}",
 
+  // "dso-selector.select.collection.head": "Select a collection",
+  "dso-selector.select.collection.head": "Seleccione una colección",
 
-	// "forgot-password.title": "Forgot Password",
-	"forgot-password.title": "Has olvidado tu contraseña",
+  // "dso-selector.set-scope.community.head": "Select a search scope",
+  "dso-selector.set-scope.community.head": "Seleccione un ámbito de búsqueda",
 
-	// "forgot-password.form.head": "Forgot Password",
-	"forgot-password.form.head": "Has olvidado tu contraseña",
+  // "dso-selector.set-scope.community.button": "Search all of DSpace",
+  "dso-selector.set-scope.community.button": "Buscar en todo  DSpace",
 
-	// "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": "Ingrese una nueva contraseña en el cuadro a continuación y confírmela escribiéndola nuevamente en el segundo cuadro. Debe tener al menos seis caracteres.",
+  // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
+  "dso-selector.set-scope.community.input-header": "Busque una comunidad o colección",
 
-	// "forgot-password.form.card.security": "Security",
-	"forgot-password.form.card.security": "Seguridad",
+  // "dso-selector.claim.item.head": "Profile tips",
+  "dso-selector.claim.item.head": "Consejos de perfil",
 
-	// "forgot-password.form.identification.header": "Identify",
-	"forgot-password.form.identification.header": "Identificar",
+  // "dso-selector.claim.item.body": "These are existing profiles that may be related to you. If you recognize yourself in one of these profiles, select it and on the detail page, among the options, choose to claim it. Otherwise you can create a new profile from scratch using the button below.",
+  "dso-selector.claim.item.body": "Hay perfiles que podrían estar relacionados con usted. SI se ve reflejado en uno de ellos, selecciónelo y en la página de detalles, elija la opción de reclamarlo. Opcionalmente puede crear un nuevo perfil desde cero usando el botón inferior.",
 
-	// "forgot-password.form.identification.email": "Email address: ",
-	"forgot-password.form.identification.email": "Dirección de correo electrónico:",
+  // "dso-selector.claim.item.not-mine-label": "None of these are mine",
+  "dso-selector.claim.item.not-mine-label": "Ninguno de esos es mio",
 
-	// "forgot-password.form.label.password": "Password",
-	"forgot-password.form.label.password": "Contraseña",
+  // "dso-selector.claim.item.create-from-scratch": "Create a new one",
+  "dso-selector.claim.item.create-from-scratch": "Crear uno nuevo",
 
-	// "forgot-password.form.label.passwordrepeat": "Retype to confirm",
-	"forgot-password.form.label.passwordrepeat": "Rescriba para confirmar",
+  // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
+  "confirmation-modal.export-metadata.header": "Exportar metadatos para {{ dsoName }}",
 
-	// "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
-	"forgot-password.form.error.empty-password": "Ingrese una contraseña en el cuadro a continuación.",
+  // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
+  "confirmation-modal.export-metadata.info": "¿Está seguro de que desea exportar metadatos para {{ dsoName }}?",
 
-	// "forgot-password.form.error.matching-passwords": "The passwords do not match.",
-	"forgot-password.form.error.matching-passwords": "Las contraseñas no coinciden.",
+  // "confirmation-modal.export-metadata.cancel": "Cancel",
+  "confirmation-modal.export-metadata.cancel": "Cancelar",
 
-	// "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
-	"forgot-password.form.error.password-length": "La contraseña debe tener al menos 6 caracteres.",
+  // "confirmation-modal.export-metadata.confirm": "Export",
+  "confirmation-modal.export-metadata.confirm": "Exportar",
 
-	// "forgot-password.form.notification.error.title": "Error when trying to submit new password",
-	"forgot-password.form.notification.error.title": "Error al intentar enviar una nueva contraseña",
+  // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.header": "Borrar usuario \"{{ dsoName }} \"",
 
-	// "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.",
-	"forgot-password.form.notification.success.content": "El restablecimiento de la contraseña fue exitoso. Ha iniciado sesión como el usuario creado.",
+  // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "¿Está seguro de que desea eliminar al usuario \"{{ dsoName }} \"?",
 
-	// "forgot-password.form.notification.success.title": "Password reset completed",
-	"forgot-password.form.notification.success.title": "Se completó el restablecimiento de la contraseña",
+  // "confirmation-modal.delete-eperson.cancel": "Cancel",
+  "confirmation-modal.delete-eperson.cancel": "Cancelar",
 
-	// "forgot-password.form.submit": "Submit password",
-	"forgot-password.form.submit": "Enviar contraseña",
+  // "confirmation-modal.delete-eperson.confirm": "Delete",
+  "confirmation-modal.delete-eperson.confirm": "Borrar",
 
+  // "confirmation-modal.delete-profile.header": "Delete Profile",
+  "confirmation-modal.delete-profile.header": "Borrar Perfil",
 
+  // "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile",
+  "confirmation-modal.delete-profile.info": "¿Está seguro que quiere borrar su perfil?",
 
-	// "form.add": "Add more",
-	"form.add": "Añadir más",
+  // "confirmation-modal.delete-profile.cancel": "Cancel",
+  "confirmation-modal.delete-profile.cancel": "Cancelar",
 
-	// "form.add-help": "Click here to add the current entry and to add another one",
-	"form.add-help": "Haga clic aquí para agregar la entrada actual y para agregar otra",
+  // "confirmation-modal.delete-profile.confirm": "Delete",
+  "confirmation-modal.delete-profile.confirm": "Borrar",
 
-	// "form.cancel": "Cancel",
-	"form.cancel": "Cancelar",
 
-	// "form.clear": "Clear",
-	"form.clear": "Claro",
+  // "error.bitstream": "Error fetching bitstream",
+  "error.bitstream": "Error al obtener el archivo",
 
-	// "form.clear-help": "Click here to remove the selected value",
-	"form.clear-help": "Haga clic aquí para eliminar el valor seleccionado",
+  // "error.browse-by": "Error fetching items",
+  "error.browse-by": "Error al recuperar ítems",
 
-	// "form.discard": "Discard",
-	"form.discard": "Descarte",
+  // "error.collection": "Error fetching collection",
+  "error.collection": "Error al recuperar la colección",
 
-	// "form.drag": "Drag",
-	"form.drag": "Arrastrar",
+  // "error.collections": "Error fetching collections",
+  "error.collections": "Error al recuperar colecciones",
 
-	// "form.edit": "Edit",
-	"form.edit": "Editar",
+  // "error.community": "Error fetching community",
+  "error.community": "Error al recuperar la comunidad",
 
-	// "form.edit-help": "Click here to edit the selected value",
-	"form.edit-help": "Haga clic aquí para editar el valor seleccionado",
+  // "error.identifier": "No item found for the identifier",
+  "error.identifier": "No se encontró ningún ítem con ese identificador",
 
-	// "form.first-name": "First name",
-	"form.first-name": "Nombre de pila",
+  // "error.default": "Error",
+  "error.default": "Error",
 
-	// "form.group-collapse": "Collapse",
-	"form.group-collapse": "Colapso",
+  // "error.item": "Error fetching item",
+  "error.item": "Error al recuperar el ítem",
 
-	// "form.group-collapse-help": "Click here to collapse",
-	"form.group-collapse-help": "Haga clic aquí para colapsar",
+  // "error.items": "Error fetching items",
+  "error.items": "Error al recuperar ítems",
 
-	// "form.group-expand": "Expand",
-	"form.group-expand": "Expandir",
+  // "error.objects": "Error fetching objects",
+  "error.objects": "Error al recuperar objetos",
 
-	// "form.group-expand-help": "Click here to expand and add more elements",
-	"form.group-expand-help": "Haga clic aquí para expandir y agregar más artículos",
+  // "error.recent-submissions": "Error fetching recent submissions",
+  "error.recent-submissions": "Error al recuperar los envíos recientes",
 
-	// "form.last-name": "Last name",
-	"form.last-name": "Apellido",
+  // "error.search-results": "Error fetching search results",
+  "error.search-results": "Error al recuperar los resultados de búsqueda",
 
-	// "form.loading": "Loading...",
-	"form.loading": "Cargando...",
+  // "error.invalid-search-query": "Search query is not valid. Please check <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a> best practices for further information about this error.",
+  "error.invalid-search-query": "La búsqueda no es válida. Revise en <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">la sintaxis de búsquedas Solr</a> para mas información sobre este error.",
 
-	// "form.lookup": "Lookup",
-	"form.lookup": "Buscar",
+  // "error.sub-collections": "Error fetching sub-collections",
+  "error.sub-collections": "Error al recuperar subcolecciones",
 
-	// "form.lookup-help": "Click here to look up an existing relation",
-	"form.lookup-help": "Haga clic aquí para buscar una relación existente",
+  // "error.sub-communities": "Error fetching sub-communities",
+  "error.sub-communities": "Error al recuperar subcomunidades",
 
-	// "form.no-results": "No results found",
-	"form.no-results": "No se han encontrado resultados",
+  // "error.submission.sections.init-form-error": "An error occurred during section initialize, please check your input-form configuration. Details are below : <br> <br>",
+  "error.submission.sections.init-form-error": "Se produjo un error durante la inicialización de la sección, verifique la configuración de su formulario de entrada. Se dan detalles a continuación:",
 
-	// "form.no-value": "No value entered",
-	"form.no-value": "No se ingresó ningún valor",
+  // "error.top-level-communities": "Error fetching top-level communities",
+  "error.top-level-communities": "Error al recuperar las comunidades de nivel superior",
 
-	// "form.other-information": {},
-	"form.other-information": {},
+  // "error.validation.license.notgranted": "You must grant this license to complete your submission. If you are unable to grant this license at this time you may save your work and return later or remove the submission.",
+  "error.validation.license.notgranted": "Debe conceda esta licencia de depósito para completar el envío. Si no puede conceder esta licencia en este momento, puede guardar su trabajo y regresar más tarde o bien eliminar el envío.",
 
-	// "form.remove": "Remove",
-	"form.remove": "Eliminar",
+  // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
+  "error.validation.pattern": "Esta entrada está restringida por este patrón actual: {{ pattern }}.",
 
-	// "form.save": "Save",
-	"form.save": "Guardar",
+  // "error.validation.filerequired": "The file upload is mandatory",
+  "error.validation.filerequired": "La carga de un archivo es obligatoria",
 
-	// "form.save-help": "Save changes",
-	"form.save-help": "Guardar cambios",
+  // "error.validation.required": "This field is required",
+  "error.validation.required": "Se requiere este campo",
 
-	// "form.search": "Search",
-	"form.search": "Buscar",
+  // "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  "error.validation.NotValidEmail": "Este no es correo electrónico válido",
 
-	// "form.search-help": "Click here to look for an existing correspondence",
-	"form.search-help": "Haga clic aquí para buscar una correspondencia existente",
+  // "error.validation.emailTaken": "This E-mail is already taken",
+  "error.validation.emailTaken": "Este correo electrónico ya está en uso",
 
-	// "form.submit": "Save",
-	"form.submit": "Guardar",
+  // "error.validation.groupExists": "This group already exists",
+  "error.validation.groupExists": "Este grupo ya existe",
 
-	// "form.repeatable.sort.tip": "Drop the item in the new position",
-	"form.repeatable.sort.tip": "Suelta el artículo en la nueva posición",
 
+  // "feed.description": "Syndication feed",
+  "feed.description": "Hilo de sindicación",
 
-	// "home.description": "",
-	"home.description": "",
 
-	// "home.breadcrumbs": "Home",
-	"home.breadcrumbs": "Hogar",
+  // "file-section.error.header": "Error obtaining files for this item",
+  "file-section.error.header": "Error al obtener archivos para este ítem",
 
-	// "home.search-form.placeholder": "Search the repository ...",
-	"home.search-form.placeholder": "Buscar en el repositorio ...",
 
-	// "home.title": "Home",
-	"home.title": "Hogar",
 
-	// "home.top-level-communities.head": "Communities in DSpace",
-	"home.top-level-communities.head": "Comunidades en DSpace",
+  // "footer.copyright": "copyright © 2002-{{ year }}",
+  "footer.copyright": "copyright © 2002 - {{ year }}",
 
-	// "home.top-level-communities.help": "Select a community to browse its collections.",
-	"home.top-level-communities.help": "Seleccione una comunidad para explorar sus colecciones.",
+  // "footer.link.dspace": "DSpace software",
+  "footer.link.dspace": "Software DSpace",
 
+  // "footer.link.lyrasis": "LYRASIS",
+  "footer.link.lyrasis": "LYRASIS",
 
+  // "footer.link.cookies": "Cookie settings",
+  "footer.link.cookies": "Configuración de cookies",
 
-	// "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
-	"info.end-user-agreement.accept": "He leído y acepto el Acuerdo de usuario final.",
+  // "footer.link.privacy-policy": "Privacy policy",
+  "footer.link.privacy-policy": "Política de privacidad",
 
-	// "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
-	"info.end-user-agreement.accept.error": "Se produjo un error al aceptar el Acuerdo de usuario final.",
+  // "footer.link.end-user-agreement":"End User Agreement",
+  "footer.link.end-user-agreement": "Acuerdo de usuario final",
 
-	// "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
-	"info.end-user-agreement.accept.success": "Se actualizó correctamente el Acuerdo de usuario final.",
+  // "footer.link.feedback":"Send Feedback",
+  "footer.link.feedback":"Enviar Sugerencias",
 
-	// "info.end-user-agreement.breadcrumbs": "End User Agreement",
-	"info.end-user-agreement.breadcrumbs": "Acuerdo de usuario final",
 
-	// "info.end-user-agreement.buttons.cancel": "Cancel",
-	"info.end-user-agreement.buttons.cancel": "Cancelar",
 
-	// "info.end-user-agreement.buttons.save": "Save",
-	"info.end-user-agreement.buttons.save": "Guardar",
+  // "forgot-email.form.header": "Forgot Password",
+  "forgot-email.form.header": "Olvido de contraseña",
 
-	// "info.end-user-agreement.head": "End User Agreement",
-	"info.end-user-agreement.head": "Acuerdo de usuario final",
+  // "forgot-email.form.info": "Enter the email address associated with the account.",
+  "forgot-email.form.info": "Introduzca la dirección de correo electrónico que proporcionó cuando se registró.",
 
-	// "info.end-user-agreement.title": "End User Agreement",
-	"info.end-user-agreement.title": "Acuerdo de usuario final",
+  // "forgot-email.form.email": "Email Address *",
+  "forgot-email.form.email": "Dirección de correo electrónico *",
 
-	// "info.privacy.breadcrumbs": "Privacy Statement",
-	"info.privacy.breadcrumbs": "Declaracion de privacidad",
+  // "forgot-email.form.email.error.required": "Please fill in an email address",
+  "forgot-email.form.email.error.required": "Por favor introduzca una dirección de correo electrónico",
 
-	// "info.privacy.head": "Privacy Statement",
-	"info.privacy.head": "Declaracion de privacidad",
+  // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
+  "forgot-email.form.email.error.pattern": "Por favor introduzca una dirección de correo electrónico válida",
 
-	// "info.privacy.title": "Privacy Statement",
-	"info.privacy.title": "Declaracion de privacidad",
+  // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
+  "forgot-email.form.email.hint": "Se le enviará un mensaje a esa dirección con las instrucciones pertinentes.",
 
+  // "forgot-email.form.submit": "Reset password",
+  "forgot-email.form.submit": "Restablecer contraseña",
 
+  // "forgot-email.form.success.head": "Password reset email sent",
+  "forgot-email.form.success.head": "Se ha enviado el mensaje de restablecemieto de contraseña",
 
-	// "item.alerts.private": "This item is private",
-	"item.alerts.private": "Este artículo es privado",
+  // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "forgot-email.form.success.content": "Se ha enviado un correo a {{ email }} que contiene una URL especial e instrucciones adicionales.",
 
-	// "item.alerts.withdrawn": "This item has been withdrawn",
-	"item.alerts.withdrawn": "Este artículo ha sido retirado",
+  // "forgot-email.form.error.head": "Error when trying to reset password",
+  "forgot-email.form.error.head": "Error al intentar restablecer la contraseña",
 
+  // "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
+  "forgot-email.form.error.content": "Ha ocurrido una error intentando restablecer la contraseña para la cuenta asociada al correo electrónico: {{ email }}",
 
 
-	// "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
-	"item.edit.authorizations.heading": "Con este editor puede ver y modificar las políticas de un artículo, además de modificar las políticas de los componentes individuales del artículo: paquetes y archivos. Brevemente, un artículo es un contenedor de paquetes y los paquetes son contenedores de archivos. Los contenedores suelen tener políticas AGREGAR/ELIMINAR/LEER/ESCRIBIR, mientras que los archivos solo tienen políticas LEER/ESCRIBIR.",
 
-	// "item.edit.authorizations.title": "Edit item's Policies",
-	"item.edit.authorizations.title": "Editar las políticas del artículo",
+  // "forgot-password.title": "Forgot Password",
+  "forgot-password.title": "Olvido de contraseña",
 
+  // "forgot-password.form.head": "Forgot Password",
+  "forgot-password.form.head": "Olvido de contraseña",
 
+  // "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": "Introduzca una nueva contraseña en el cuadro a continuación y confírmela reescribiéndola en el segundo cuadro. Debe tener al menos seis caracteres.",
 
-	// "item.badge.private": "Private",
-	"item.badge.private": "Privado",
+  // "forgot-password.form.card.security": "Security",
+  "forgot-password.form.card.security": "Seguridad",
 
-	// "item.badge.withdrawn": "Withdrawn",
-	"item.badge.withdrawn": "Retirado",
+  // "forgot-password.form.identification.header": "Identify",
+  "forgot-password.form.identification.header": "Identificar",
 
+  // "forgot-password.form.identification.email": "Email address: ",
+  "forgot-password.form.identification.email": "Dirección de correo electrónico:",
 
+  // "forgot-password.form.label.password": "Password",
+  "forgot-password.form.label.password": "Contraseña",
 
-	// "item.bitstreams.upload.bundle": "Bundle",
-	"item.bitstreams.upload.bundle": "Manojo",
+  // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
+  "forgot-password.form.label.passwordrepeat": "Reescriba para confirmar",
 
-	// "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
-	"item.bitstreams.upload.bundle.placeholder": "Seleccione un paquete",
+  // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+  "forgot-password.form.error.empty-password": "Introduzca una contraseña en el cuadro a continuación.",
 
-	// "item.bitstreams.upload.bundle.new": "Create bundle",
-	"item.bitstreams.upload.bundle.new": "Crear paquete",
+  // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
+  "forgot-password.form.error.matching-passwords": "Las contraseñas no coinciden.",
 
-	// "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
-	"item.bitstreams.upload.bundles.empty": "Este artículo no contiene ningún paquete para cargar un archivo.",
+  // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
+  "forgot-password.form.error.password-length": "La contraseña debe tener al menos 6 caracteres.",
 
-	// "item.bitstreams.upload.cancel": "Cancel",
-	"item.bitstreams.upload.cancel": "Cancelar",
+  // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
+  "forgot-password.form.notification.error.title": "Error al intentar enviar una nueva contraseña",
 
-	// "item.bitstreams.upload.drop-message": "Drop a file to upload",
-	"item.bitstreams.upload.drop-message": "Suelta un archivo para subir",
+  // "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.",
+  "forgot-password.form.notification.success.content": "El restablecimiento de la contraseña fue exitoso. Ha iniciado sesión como el usuario creado.",
 
-	// "item.bitstreams.upload.item": "Item: ",
-	"item.bitstreams.upload.item": "Artículo:",
+  // "forgot-password.form.notification.success.title": "Password reset completed",
+  "forgot-password.form.notification.success.title": "Se completó el restablecimiento de la contraseña",
 
-	// "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
-	"item.bitstreams.upload.notifications.bundle.created.content": "Nuevo paquete creado con éxito.",
+  // "forgot-password.form.submit": "Submit password",
+  "forgot-password.form.submit": "Enviar contraseña",
 
-	// "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
-	"item.bitstreams.upload.notifications.bundle.created.title": "Paquete creado",
 
-	// "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
-	"item.bitstreams.upload.notifications.upload.failed": "Subida fallida. Verifique el contenido antes de volver a intentarlo.",
 
-	// "item.bitstreams.upload.title": "Upload bitstream",
-	"item.bitstreams.upload.title": "Subir archivo",
+  // "form.add": "Add more",
+  "form.add": "Añadir más",
 
+  // "form.add-help": "Click here to add the current entry and to add another one",
+  "form.add-help": "Haga clic aquí para agregar la entrada actual y para agregar otra",
 
+  // "form.cancel": "Cancel",
+  "form.cancel": "Cancelar",
 
-	// "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
-	"item.edit.bitstreams.bundle.edit.buttons.upload": "Subir",
+  // "form.clear": "Clear",
+  "form.clear": "Limpiar",
 
-	// "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
-	"item.edit.bitstreams.bundle.displaying": "Actualmente se muestran {{ amount }} archivos de {{ total }}.",
+  // "form.clear-help": "Click here to remove the selected value",
+  "form.clear-help": "Haga clic aquí para eliminar el valor seleccionado",
 
-	// "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
-	"item.edit.bitstreams.bundle.load.all": "Cargar todo ({{ total }})",
+  // "form.discard": "Discard",
+  "form.discard": "Descartar",
 
-	// "item.edit.bitstreams.bundle.load.more": "Load more",
-	"item.edit.bitstreams.bundle.load.more": "Carga más",
+  // "form.drag": "Drag",
+  "form.drag": "Arrastrar",
 
-	// "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
-	"item.edit.bitstreams.bundle.name": "PAQUETE: {{ name }}",
+  // "form.edit": "Edit",
+  "form.edit": "Editar",
 
-	// "item.edit.bitstreams.discard-button": "Discard",
-	"item.edit.bitstreams.discard-button": "Descarte",
+  // "form.edit-help": "Click here to edit the selected value",
+  "form.edit-help": "Haga clic aquí para editar el valor seleccionado",
 
-	// "item.edit.bitstreams.edit.buttons.download": "Download",
-	"item.edit.bitstreams.edit.buttons.download": "Descargar",
+  // "form.first-name": "First name",
+  "form.first-name": "Nombre de pila",
 
-	// "item.edit.bitstreams.edit.buttons.drag": "Drag",
-	"item.edit.bitstreams.edit.buttons.drag": "Arrastrar",
+  // "form.group-collapse": "Collapse",
+  "form.group-collapse": "Contraer",
 
-	// "item.edit.bitstreams.edit.buttons.edit": "Edit",
-	"item.edit.bitstreams.edit.buttons.edit": "Editar",
+  // "form.group-collapse-help": "Click here to collapse",
+  "form.group-collapse-help": "Haga clic aquí para contraer",
 
-	// "item.edit.bitstreams.edit.buttons.remove": "Remove",
-	"item.edit.bitstreams.edit.buttons.remove": "Eliminar",
+  // "form.group-expand": "Expand",
+  "form.group-expand": "Expandir",
 
-	// "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
-	"item.edit.bitstreams.edit.buttons.undo": "Deshacer cambios",
+  // "form.group-expand-help": "Click here to expand and add more elements",
+  "form.group-expand-help": "Haga clic aquí para expandir y agregar más elementos",
 
-	// "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
-	"item.edit.bitstreams.empty": "Este artículo no contiene ningún archivo. Haga clic en el botón de carga para crear uno.",
+  // "form.last-name": "Last name",
+  "form.last-name": "Apellido",
 
-	// "item.edit.bitstreams.headers.actions": "Actions",
-	"item.edit.bitstreams.headers.actions": "Comportamiento",
+  // "form.loading": "Loading...",
+  "form.loading": "Cargando...",
 
-	// "item.edit.bitstreams.headers.bundle": "Bundle",
-	"item.edit.bitstreams.headers.bundle": "Manojo",
+  // "form.lookup": "Lookup",
+  "form.lookup": "Buscar",
 
-	// "item.edit.bitstreams.headers.description": "Description",
-	"item.edit.bitstreams.headers.description": "Descripción",
+  // "form.lookup-help": "Click here to look up an existing relation",
+  "form.lookup-help": "Haga clic aquí para buscar una relación existente",
 
-	// "item.edit.bitstreams.headers.format": "Format",
-	"item.edit.bitstreams.headers.format": "Formato",
+  // "form.no-results": "No results found",
+  "form.no-results": "No se han encontrado resultados",
 
-	// "item.edit.bitstreams.headers.name": "Name",
-	"item.edit.bitstreams.headers.name": "Nombre",
+  // "form.no-value": "No value entered",
+  "form.no-value": "No se introdujo ningún valor",
 
-	// "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-	"item.edit.bitstreams.notifications.discarded.content": "Tus cambios fueron descartados. ",
+  // "form.other-information": {},
+  "form.other-information": {},
 
-	// "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
-	"item.edit.bitstreams.notifications.discarded.title": "Cambios descartados",
+  // "form.remove": "Remove",
+  "form.remove": "Eliminar",
 
-	// "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
-	"item.edit.bitstreams.notifications.move.failed.title": "Error al mover archivos",
+  // "form.save": "Save",
+  "form.save": "Guardar",
 
-	// "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this item's bitstreams and bundles have been saved.",
-	"item.edit.bitstreams.notifications.move.saved.content": "Se han guardado los cambios de movimiento en los archivos y paquetes de este artículo.",
+  // "form.save-help": "Save changes",
+  "form.save-help": "Guardar cambios",
 
-	// "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
-	"item.edit.bitstreams.notifications.move.saved.title": "Mover cambios guardados",
+  // "form.search": "Search",
+  "form.search": "Buscar",
 
-	// "item.edit.bitstreams.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
-	"item.edit.bitstreams.notifications.outdated.content": "Otro usuario ha cambiado el artículo en el que está trabajando actualmente. ",
+  // "form.search-help": "Click here to look for an existing correspondence",
+  "form.search-help": "Haga clic aquí para buscar una correspondencia existente",
 
-	// "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
-	"item.edit.bitstreams.notifications.outdated.title": "Cambios desactualizados",
+  // "form.submit": "Save",
+  "form.submit": "Guardar",
 
-	// "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
-	"item.edit.bitstreams.notifications.remove.failed.title": "Error al eliminar archivo",
+  // "form.repeatable.sort.tip": "Drop the item in the new position",
+  "form.repeatable.sort.tip": "Suelte el ítem en la nueva posición",
 
-	// "item.edit.bitstreams.notifications.remove.saved.content": "Your removal changes to this item's bitstreams have been saved.",
-	"item.edit.bitstreams.notifications.remove.saved.content": "Se han guardado los cambios de eliminación de los archivos de este artículo.",
 
-	// "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
-	"item.edit.bitstreams.notifications.remove.saved.title": "Se guardaron los cambios de eliminación",
+  // "grant-deny-request-copy.deny": "Don't send copy",
+  "grant-deny-request-copy.deny": "No envíe copia",
 
-	// "item.edit.bitstreams.reinstate-button": "Undo",
-	"item.edit.bitstreams.reinstate-button": "Deshacer",
+  // "grant-deny-request-copy.email.back": "Back",
+  "grant-deny-request-copy.email.back": "Atrás",
 
-	// "item.edit.bitstreams.save-button": "Save",
-	"item.edit.bitstreams.save-button": "Guardar",
+  // "grant-deny-request-copy.email.message": "Message",
+  "grant-deny-request-copy.email.message": "Mensaje",
 
-	// "item.edit.bitstreams.upload-button": "Upload",
-	"item.edit.bitstreams.upload-button": "Subir",
+  // "grant-deny-request-copy.email.message.empty": "Please enter a message",
+  "grant-deny-request-copy.email.message.empty": "Por favor, introduzca un mensaje",
 
+  // "grant-deny-request-copy.email.permissions.info": "You may use this occasion to reconsider the access restrictions on the document, to avoid having to respond to these requests. If you’d like to ask the repository administrators to remove these restrictions, please check the box below.",
+  "grant-deny-request-copy.email.permissions.info": "Puede aprovechar la ocasión para reconsiderar las restricciones de acceso al documento (para evitar tener que responder a estas solicitudes).  Para consultar con los administadores del repositorio para retirar estas resticciones, marque por favor la casilla inferior.",
 
+  // "grant-deny-request-copy.email.permissions.label": "Change to open access",
+  "grant-deny-request-copy.email.permissions.label": "Cambio a Acceso Abierto",
 
-	// "item.edit.delete.cancel": "Cancel",
-	"item.edit.delete.cancel": "Cancelar",
+  // "grant-deny-request-copy.email.send": "Send",
+  "grant-deny-request-copy.email.send": "Enviar",
 
-	// "item.edit.delete.confirm": "Delete",
-	"item.edit.delete.confirm": "Borrar",
+  // "grant-deny-request-copy.email.subject": "Subject",
+  "grant-deny-request-copy.email.subject": "Asunto",
 
-	// "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.",
-	"item.edit.delete.description": "¿Estás seguro de que este artículo debería eliminarse por completo? Precaución: en la actualidad, no se dejaría ninguna lápida.",
+  // "grant-deny-request-copy.email.subject.empty": "Please enter a subject",
+  "grant-deny-request-copy.email.subject.empty": "Por favor, introduzca un asunto",
 
-	// "item.edit.delete.error": "An error occurred while deleting the item",
-	"item.edit.delete.error": "Se produjo un error al eliminar el artículo.",
+  // "grant-deny-request-copy.grant": "Send copy",
+  "grant-deny-request-copy.grant": "Enviar copia",
 
-	// "item.edit.delete.header": "Delete item: {{ id }}",
-	"item.edit.delete.header": "Eliminar artículo: {{ id }}",
+  // "grant-deny-request-copy.header": "Document copy request",
+  "grant-deny-request-copy.header": "Solciitud de copia de documento",
 
-	// "item.edit.delete.success": "The item has been deleted",
-	"item.edit.delete.success": "El artículo ha sido eliminado",
+  // "grant-deny-request-copy.home-page": "Take me to the home page",
+  "grant-deny-request-copy.home-page": "Llévame a la página de inicio",
 
-	// "item.edit.head": "Edit Item",
-	"item.edit.head": "Editar artículo",
+  // "grant-deny-request-copy.intro1": "If you are one of the authors of the document <a href='{{ url }}'>{{ name }}</a>, then please use one of the options below to respond to the user's request.",
+  "grant-deny-request-copy.intro1": "Si usted es uno de los autores del documento <a href='{{ url }}'>{{ name }}</a>, use los botones inferiores para responder la solicitud del usuario",
 
-	// "item.edit.breadcrumbs": "Edit Item",
-	"item.edit.breadcrumbs": "Editar artículo",
 
-	// "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
-	"item.edit.tabs.disabled.tooltip": "No tienes autorización para acceder a esta pestaña",
+  // "grant-deny-request-copy.intro2": "After choosing an option, you will be presented with a suggested email reply which you may edit.",
+  "grant-deny-request-copy.intro2": "Tras elegir una opción, le sugeriremos un texto de correo electrónico que usted puede editar.",
 
 
-	// "item.edit.tabs.mapper.head": "Collection Mapper",
-	"item.edit.tabs.mapper.head": "Mapeador de colecciones",
+  // "grant-deny-request-copy.processed": "This request has already been processed. You can use the button below to get back to the home page.",
+  "grant-deny-request-copy.processed": "Esta solicitud fue ya procesada. Puede usar los botones inferiores para regresas a la página de inicio",
 
-	// "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
-	"item.edit.tabs.item-mapper.title": "Edición de artículos - Mapeador de colecciones",
 
-	// "item.edit.item-mapper.buttons.add": "Map item to selected collections",
-	"item.edit.item-mapper.buttons.add": "Asignar artículo a colecciones seleccionadas",
 
-	// "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
-	"item.edit.item-mapper.buttons.remove": "Eliminar la asignación de artículos para las colecciones seleccionadas",
+  // "grant-request-copy.email.message": "Dear {{ recipientName }},\nIn response to your request I have the pleasure to send you in attachment a copy of the file(s) concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am an author.\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>",
+  "grant-request-copy.email.message": "Estimado {{ recipientName }},\nRespondiendo a su solicitud, le envío anexada una copia del fichero correspondiente al documento: \"{{ itemUrl }}\" ({{ itemName }}), del que soy autor.\n\nUn cordial saludo,\n{{ authorName }} <{{ authorEmail }}>",
 
-	// "item.edit.item-mapper.cancel": "Cancel",
-	"item.edit.item-mapper.cancel": "Cancelar",
+  // "grant-request-copy.email.subject": "Request copy of document",
+  "grant-request-copy.email.subject": "Solicitar copia de documento",
 
-	// "item.edit.item-mapper.description": "This is the item mapper tool that allows administrators to map this item to other collections. You can search for collections and map them, or browse the list of collections the item is currently mapped to.",
-	"item.edit.item-mapper.description": "Esta es la herramienta de asignación de artículos que permite a los administradores asignar este artículo a otras colecciones. Puede buscar colecciones y mapearlas, o explorar la lista de colecciones a las que el artículo está mapeado actualmente.",
+  // "grant-request-copy.error": "An error occurred",
+  "grant-request-copy.error": "Ocurrió un error",
 
-	// "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
-	"item.edit.item-mapper.head": "Asignador de artículos: asigna artículos a colecciones",
+  // "grant-request-copy.header": "Grant document copy request",
+  "grant-request-copy.header": "Permitir solicitud de copia de documento",
 
-	// "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
-	"item.edit.item-mapper.item": "Artículo: \"<b>{{ name }}</b>\"",
+  // "grant-request-copy.intro": "This message will be sent to the applicant of the request. The requested document(s) will be attached.",
+  "grant-request-copy.intro": "Este mensaje se enviará al solicitante de la copia. Se le anexará una copia del documento.",
 
-	// "item.edit.item-mapper.no-search": "Please enter a query to search",
-	"item.edit.item-mapper.no-search": "Ingrese una consulta para buscar",
+  // "grant-request-copy.success": "Successfully granted item request",
+  "grant-request-copy.success": "Solicitud de ítem concedida exitosamente",
 
-	// "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of item to {{amount}} collections.",
-	"item.edit.item-mapper.notifications.add.error.content": "Se produjeron errores al mapear el artículo a {{ amount }} colecciones.",
 
-	// "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
-	"item.edit.item-mapper.notifications.add.error.head": "Errores de mapeo",
+  // "health.breadcrumbs": "Health",
+  "health.breadcrumbs": "Chequeos",
 
-	// "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
-	"item.edit.item-mapper.notifications.add.success.content": "Se asignó correctamente el artículo a {{ amount }} colecciones.",
+  // "health-page.heading" : "Health",
+  "health-page.heading" : "Chequeos",
 
-	// "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
-	"item.edit.item-mapper.notifications.add.success.head": "Mapeo completado",
+  // "health-page.info-tab" : "Info",
+  "health-page.info-tab" : "Información",
 
-	// "item.edit.item-mapper.notifications.remove.error.content": "Errors occurred for the removal of the mapping to {{amount}} collections.",
-	"item.edit.item-mapper.notifications.remove.error.content": "Se produjeron errores para la eliminación de la asignación a {{ amount }} colecciones.",
+  // "health-page.status-tab" : "Status",
+  "health-page.status-tab" : "Estado",
 
-	// "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
-	"item.edit.item-mapper.notifications.remove.error.head": "Eliminación de errores de mapeo",
+  // "health-page.error.msg": "The health check service is temporarily unavailable",
+  "health-page.error.msg": "El servicio de comprobación no se encuentra temporalmente disponible",
 
-	// "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
-	"item.edit.item-mapper.notifications.remove.success.content": "Se eliminó correctamente la asignación del artículo a {{ amount }} colecciones.",
+  // "health-page.property.status": "Status code",
+  "health-page.property.status": "Código de estado",
 
-	// "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
-	"item.edit.item-mapper.notifications.remove.success.head": "Eliminación del mapeo completada",
+  // "health-page.section.db.title": "Database",
+  "health-page.section.db.title": "Database",
 
-	// "item.edit.item-mapper.search-form.placeholder": "Search collections...",
-	"item.edit.item-mapper.search-form.placeholder": "Buscar colecciones...",
+  // "health-page.section.geoIp.title": "GeoIp",
+  "health-page.section.geoIp.title": "GeoIp",
 
-	// "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
-	"item.edit.item-mapper.tabs.browse": "Examinar colecciones mapeadas",
+  // "health-page.section.solrAuthorityCore.title": "Sor: authority core",
+  "health-page.section.solrAuthorityCore.title": "Solr: authority core",
 
-	// "item.edit.item-mapper.tabs.map": "Map new collections",
-	"item.edit.item-mapper.tabs.map": "Mapear nuevas colecciones",
+  // "health-page.section.solrOaiCore.title": "Sor: oai core",
+  "health-page.section.solrOaiCore.title": "Solr: oai core",
 
+  // "health-page.section.solrSearchCore.title": "Sor: search core",
+  "health-page.section.solrSearchCore.title": "Solr: search core",
 
+  // "health-page.section.solrStatisticsCore.title": "Sor: statistics core",
+  "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
 
-	// "item.edit.metadata.add-button": "Add",
-	"item.edit.metadata.add-button": "Agregar",
+  // "health-page.section-info.app.title": "Application Backend",
+  "health-page.section-info.app.title": "Backend de la aplicación",
 
-	// "item.edit.metadata.discard-button": "Discard",
-	"item.edit.metadata.discard-button": "Descarte",
+  // "health-page.section-info.java.title": "Java",
+  "health-page.section-info.java.title": "Java",
 
-	// "item.edit.metadata.edit.buttons.edit": "Edit",
-	"item.edit.metadata.edit.buttons.edit": "Editar",
+  // "health-page.status": "Status",
+  "health-page.status": "Estado",
 
-	// "item.edit.metadata.edit.buttons.remove": "Remove",
-	"item.edit.metadata.edit.buttons.remove": "Eliminar",
+  // "health-page.status.ok.info": "Operational",
+  "health-page.status.ok.info": "Operativo",
 
-	// "item.edit.metadata.edit.buttons.undo": "Undo changes",
-	"item.edit.metadata.edit.buttons.undo": "Deshacer cambios",
+  // "health-page.status.error.info": "Problems detected",
+  "health-page.status.error.info": "Problemas detectados",
 
-	// "item.edit.metadata.edit.buttons.unedit": "Stop editing",
-	"item.edit.metadata.edit.buttons.unedit": "Dejar de editar",
+  // "health-page.status.warning.info": "Possible issues detected",
+   "health-page.status.warning.info": "Detectados problemas potenciales",
 
-	// "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
-	"item.edit.metadata.empty": "Actualmente, el artículo no contiene metadatos. Haga clic en Agregar para comenzar a agregar un valor de metadatos.",
+  // "health-page.title": "Health",
+  "health-page.title": "Chequeos",
 
-	// "item.edit.metadata.headers.edit": "Edit",
-	"item.edit.metadata.headers.edit": "Editar",
+  // "health-page.section.no-issues": "No issues detected",
+  "health-page.section.no-issues": "No se detectaron problemas",
 
-	// "item.edit.metadata.headers.field": "Field",
-	"item.edit.metadata.headers.field": "Campo",
 
-	// "item.edit.metadata.headers.language": "Lang",
-	"item.edit.metadata.headers.language": "Lang",
+  // "home.description": "",
+  "home.description": "",
 
-	// "item.edit.metadata.headers.value": "Value",
-	"item.edit.metadata.headers.value": "Valor",
+  // "home.breadcrumbs": "Home",
+  "home.breadcrumbs": "Inicio",
 
-	// "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
-	"item.edit.metadata.metadatafield.invalid": "Elija un campo de metadatos válido",
+  // "home.search-form.placeholder": "Search the repository ...",
+  "home.search-form.placeholder": "Buscar en el repositorio ...",
 
-	// "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-	"item.edit.metadata.notifications.discarded.content": "Tus cambios fueron descartados. ",
+  // "home.title": "Home",
+  "home.title": "Inicio",
 
-	// "item.edit.metadata.notifications.discarded.title": "Changed discarded",
-	"item.edit.metadata.notifications.discarded.title": "Cambiado descartado",
+  // "home.top-level-communities.head": "Communities in DSpace",
+  "home.top-level-communities.head": "Comunidades en DSpace",
 
-	// "item.edit.metadata.notifications.error.title": "An error occurred",
-	"item.edit.metadata.notifications.error.title": "Ocurrió un error",
+  // "home.top-level-communities.help": "Select a community to browse its collections.",
+  "home.top-level-communities.help": "Seleccione una comunidad para explorar sus colecciones.",
 
-	// "item.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
-	"item.edit.metadata.notifications.invalid.content": "Tus cambios no se guardaron. Asegúrese de que todos los campos sean válidos antes de guardar.",
 
-	// "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
-	"item.edit.metadata.notifications.invalid.title": "Metadatos inválidos",
 
-	// "item.edit.metadata.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
-	"item.edit.metadata.notifications.outdated.content": "Otro usuario ha cambiado el artículo en el que está trabajando actualmente. ",
+  // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
+  "info.end-user-agreement.accept": "He leído y acepto el Acuerdo de usuario final.",
 
-	// "item.edit.metadata.notifications.outdated.title": "Changed outdated",
-	"item.edit.metadata.notifications.outdated.title": "Cambiado desactualizado",
+  // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
+  "info.end-user-agreement.accept.error": "Se produjo un error al aceptar el Acuerdo de usuario final.",
 
-	// "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
-	"item.edit.metadata.notifications.saved.content": "Se guardaron sus cambios en los metadatos de este artículo.",
+  // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
+  "info.end-user-agreement.accept.success": "Se actualizó correctamente el Acuerdo de usuario final.",
 
-	// "item.edit.metadata.notifications.saved.title": "Metadata saved",
-	"item.edit.metadata.notifications.saved.title": "Metadatos guardados",
+  // "info.end-user-agreement.breadcrumbs": "End User Agreement",
+  "info.end-user-agreement.breadcrumbs": "Acuerdo de usuario final",
 
-	// "item.edit.metadata.reinstate-button": "Undo",
-	"item.edit.metadata.reinstate-button": "Deshacer",
+  // "info.end-user-agreement.buttons.cancel": "Cancel",
+  "info.end-user-agreement.buttons.cancel": "Cancelar",
 
-	// "item.edit.metadata.save-button": "Save",
-	"item.edit.metadata.save-button": "Guardar",
+  // "info.end-user-agreement.buttons.save": "Save",
+  "info.end-user-agreement.buttons.save": "Guardar",
 
+  // "info.end-user-agreement.head": "End User Agreement",
+  "info.end-user-agreement.head": "Acuerdo de usuario final",
 
+  // "info.end-user-agreement.title": "End User Agreement",
+  "info.end-user-agreement.title": "Acuerdo de usuario final",
 
-	// "item.edit.modify.overview.field": "Field",
-	"item.edit.modify.overview.field": "Campo",
+  // "info.privacy.breadcrumbs": "Privacy Statement",
+  "info.privacy.breadcrumbs": "Declaracion de privacidad",
 
-	// "item.edit.modify.overview.language": "Language",
-	"item.edit.modify.overview.language": "Idioma",
+  // "info.privacy.head": "Privacy Statement",
+  "info.privacy.head": "Declaracion de privacidad",
 
-	// "item.edit.modify.overview.value": "Value",
-	"item.edit.modify.overview.value": "Valor",
+  // "info.privacy.title": "Privacy Statement",
+  "info.privacy.title": "Declaracion de privacidad",
 
+  // "info.feedback.breadcrumbs": "Feedback",
+  "info.feedback.breadcrumbs": "Sugerencias",
 
+  // "info.feedback.head": "Feedback",
+  "info.feedback.head": "Sugerencias",
 
-	// "item.edit.move.cancel": "Back",
-	"item.edit.move.cancel": "atrás",
+  // "info.feedback.title": "Feedback",
+  "info.feedback.title": "Sugerencias",
 
-	// "item.edit.move.save-button": "Save",
-	"item.edit.move.save-button": "Guardar",
+  // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
+  "info.feedback.info": "Gracias por compartir sus sugerencias sobre el repositorio. ¡Tendremos en cuenta sus comentarios!",
 
-	// "item.edit.move.discard-button": "Discard",
-	"item.edit.move.discard-button": "Descarte",
+  // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+  "info.feedback.email_help": "Esta dirección se usará para el seguimiento de su sugerencia.",
 
-	// "item.edit.move.description": "Select the collection you wish to move this item to. To narrow down the list of displayed collections, you can enter a search query in the box.",
-	"item.edit.move.description": "Seleccione la colección a la que desea mover este artículo. Para reducir la lista de colecciones mostradas, puede ingresar una consulta de búsqueda en el cuadro.",
+  // "info.feedback.send": "Send Feedback",
+  "info.feedback.send": "Envíar sugerencia",
 
-	// "item.edit.move.error": "An error occurred when attempting to move the item",
-	"item.edit.move.error": "Se produjo un error al intentar mover el artículo.",
+  // "info.feedback.comments": "Comments",
+  "info.feedback.comments": "Comentarios",
 
-	// "item.edit.move.head": "Move item: {{id}}",
-	"item.edit.move.head": "Mover artículo: {{ id }}",
+  // "info.feedback.email-label": "Your Email",
+  "info.feedback.email-label": "Su correo electrónico",
 
-	// "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
-	"item.edit.move.inheritpolicies.checkbox": "Heredar políticas",
+  // "info.feedback.create.success" : "Feedback Sent Successfully!",
+  "info.feedback.create.success" : "Envío exitoso de sugerencia",
 
-	// "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
-	"item.edit.move.inheritpolicies.description": "Heredar las políticas predeterminadas de la colección de destino",
+  // "info.feedback.error.email.required" : "A valid email address is required",
+  "info.feedback.error.email.required" : "se requiere una dirección válida de correo electrónico",
 
-	// "item.edit.move.move": "Move",
-	"item.edit.move.move": "Moverse",
+  // "info.feedback.error.message.required" : "A comment is required",
+  "info.feedback.error.message.required" : "Se requiere un comentario",
 
-	// "item.edit.move.processing": "Moving...",
-	"item.edit.move.processing": "Moviente...",
+  // "info.feedback.page-label" : "Page",
+  "info.feedback.page-label" : "Página",
 
-	// "item.edit.move.search.placeholder": "Enter a search query to look for collections",
-	"item.edit.move.search.placeholder": "Ingrese una consulta de búsqueda para buscar colecciones",
+  // "info.feedback.page_help" : "Tha page related to your feedback",
+  "info.feedback.page_help" : "La página relacionada con su sugerencia",
 
-	// "item.edit.move.success": "The item has been moved successfully",
-	"item.edit.move.success": "El artículo se ha movido correctamente.",
 
-	// "item.edit.move.title": "Move item",
-	"item.edit.move.title": "Mover artículo",
 
+  // "item.alerts.private": "This item is non-discoverable",
+  "item.alerts.private": "Este artículo es privado",
 
+  // "item.alerts.withdrawn": "This item has been withdrawn",
+  "item.alerts.withdrawn": "Este artículo ha sido retirado",
 
-	// "item.edit.private.cancel": "Cancel",
-	"item.edit.private.cancel": "Cancelar",
 
-	// "item.edit.private.confirm": "Make it Private",
-	"item.edit.private.confirm": "Hacerlo privado",
 
-	// "item.edit.private.description": "Are you sure this item should be made private in the archive?",
-	"item.edit.private.description": "¿Estás seguro de que este artículo debe ser privado en el archivo?",
+  // "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
+  "item.edit.authorizations.heading": "Con este editor puede ver y modificar las políticas de un artículo, además de modificar las políticas de los componentes individuales del artículo: paquetes y archivos. Brevemente, un artículo es un contenedor de paquetes y los paquetes son contenedores de archivos. Los contenedores suelen tener políticas AGREGAR/ELIMINAR/LEER/ESCRIBIR, mientras que los archivos solo tienen políticas LEER/ESCRIBIR.",
 
-	// "item.edit.private.error": "An error occurred while making the item private",
-	"item.edit.private.error": "Se produjo un error al convertir el artículo en privado.",
+  // "item.edit.authorizations.title": "Edit item's Policies",
+  "item.edit.authorizations.title": "Editar las políticas del artículo",
 
-	// "item.edit.private.header": "Make item private: {{ id }}",
-	"item.edit.private.header": "Hacer que el artículo sea privado: {{ id }}",
 
-	// "item.edit.private.success": "The item is now private",
-	"item.edit.private.success": "El artículo ahora es privado",
 
+  // "item.badge.private": "Non-discoverable",
+  "item.badge.private": "Privado",
 
+  // "item.badge.withdrawn": "Withdrawn",
+  "item.badge.withdrawn": "Retirado",
 
-	// "item.edit.public.cancel": "Cancel",
-	"item.edit.public.cancel": "Cancelar",
 
-	// "item.edit.public.confirm": "Make it Public",
-	"item.edit.public.confirm": "Hágalo público",
 
-	// "item.edit.public.description": "Are you sure this item should be made public in the archive?",
-	"item.edit.public.description": "¿Estás seguro de que este artículo debe hacerse público en el archivo?",
+  // "item.bitstreams.upload.bundle": "Bundle",
+  "item.bitstreams.upload.bundle": "Bloque",
 
-	// "item.edit.public.error": "An error occurred while making the item public",
-	"item.edit.public.error": "Se produjo un error al hacer público el artículo.",
+  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle or input new bundle name",
+  "item.bitstreams.upload.bundle.placeholder": "Seleccione un bloque o introduzca un nuevo nombre de bloque",
 
-	// "item.edit.public.header": "Make item public: {{ id }}",
-	"item.edit.public.header": "Hacer público el artículo: {{ id }}",
+  // "item.bitstreams.upload.bundle.new": "Create bundle",
+  "item.bitstreams.upload.bundle.new": "Crear bloque",
 
-	// "item.edit.public.success": "The item is now public",
-	"item.edit.public.success": "El artículo ahora es público",
+  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+  "item.bitstreams.upload.bundles.empty": "Este artículo no contiene ningún bloque para cargar un archivo.",
 
+  // "item.bitstreams.upload.cancel": "Cancel",
+  "item.bitstreams.upload.cancel": "Cancelar",
 
+  // "item.bitstreams.upload.drop-message": "Drop a file to upload",
+  "item.bitstreams.upload.drop-message": "Suelta un archivo para subir",
 
-	// "item.edit.reinstate.cancel": "Cancel",
-	"item.edit.reinstate.cancel": "Cancelar",
+  // "item.bitstreams.upload.item": "Item: ",
+  "item.bitstreams.upload.item": "Artículo:",
 
-	// "item.edit.reinstate.confirm": "Reinstate",
-	"item.edit.reinstate.confirm": "Reintegrar",
+  // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
+  "item.bitstreams.upload.notifications.bundle.created.content": "Nuevo bloque creado con éxito.",
 
-	// "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
-	"item.edit.reinstate.description": "¿Está seguro de que este artículo debe restablecerse en el archivo?",
+  // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
+  "item.bitstreams.upload.notifications.bundle.created.title": "Bloque creado",
 
-	// "item.edit.reinstate.error": "An error occurred while reinstating the item",
-	"item.edit.reinstate.error": "Ocurrió un error al reinstalar el artículo",
+  // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
+  "item.bitstreams.upload.notifications.upload.failed": "Subida fallida. Verifique el contenido antes de volver a intentarlo.",
 
-	// "item.edit.reinstate.header": "Reinstate item: {{ id }}",
-	"item.edit.reinstate.header": "Restablecer artículo: {{ id }}",
+  // "item.bitstreams.upload.title": "Upload bitstream",
+  "item.bitstreams.upload.title": "Subir archivo",
 
-	// "item.edit.reinstate.success": "The item was reinstated successfully",
-	"item.edit.reinstate.success": "El artículo se restableció correctamente",
 
 
+  // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "Subir",
 
-	// "item.edit.relationships.discard-button": "Discard",
-	"item.edit.relationships.discard-button": "Descarte",
+  // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
+  "item.edit.bitstreams.bundle.displaying": "Actualmente se muestran {{ amount }} archivos de {{ total }}.",
 
-	// "item.edit.relationships.edit.buttons.add": "Add",
-	"item.edit.relationships.edit.buttons.add": "Agregar",
+  // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
+  "item.edit.bitstreams.bundle.load.all": "Cargar todo ({{ total }})",
 
-	// "item.edit.relationships.edit.buttons.remove": "Remove",
-	"item.edit.relationships.edit.buttons.remove": "Eliminar",
+  // "item.edit.bitstreams.bundle.load.more": "Load more",
+  "item.edit.bitstreams.bundle.load.more": "Carga más",
 
-	// "item.edit.relationships.edit.buttons.undo": "Undo changes",
-	"item.edit.relationships.edit.buttons.undo": "Deshacer cambios",
+  // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
+  "item.edit.bitstreams.bundle.name": "BLOQUE: {{ name }}",
 
-	// "item.edit.relationships.no-relationships": "No relationships",
-	"item.edit.relationships.no-relationships": "Sin relaciones",
+  // "item.edit.bitstreams.discard-button": "Discard",
+  "item.edit.bitstreams.discard-button": "Descarte",
 
-	// "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-	"item.edit.relationships.notifications.discarded.content": "Tus cambios fueron descartados. ",
+  // "item.edit.bitstreams.edit.buttons.download": "Download",
+  "item.edit.bitstreams.edit.buttons.download": "Descargar",
 
-	// "item.edit.relationships.notifications.discarded.title": "Changes discarded",
-	"item.edit.relationships.notifications.discarded.title": "Cambios descartados",
+  // "item.edit.bitstreams.edit.buttons.drag": "Drag",
+  "item.edit.bitstreams.edit.buttons.drag": "Arrastrar",
 
-	// "item.edit.relationships.notifications.failed.title": "Error editing relationships",
-	"item.edit.relationships.notifications.failed.title": "Error al editar las relaciones",
+  // "item.edit.bitstreams.edit.buttons.edit": "Edit",
+  "item.edit.bitstreams.edit.buttons.edit": "Editar",
 
-	// "item.edit.relationships.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
-	"item.edit.relationships.notifications.outdated.content": "Otro usuario ha cambiado el artículo en el que está trabajando actualmente. ",
+  // "item.edit.bitstreams.edit.buttons.remove": "Remove",
+  "item.edit.bitstreams.edit.buttons.remove": "Eliminar",
 
-	// "item.edit.relationships.notifications.outdated.title": "Changes outdated",
-	"item.edit.relationships.notifications.outdated.title": "Cambios desactualizados",
+  // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
+  "item.edit.bitstreams.edit.buttons.undo": "Deshacer cambios",
 
-	// "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
-	"item.edit.relationships.notifications.saved.content": "Se guardaron sus cambios en las relaciones de este artículo.",
+  // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
+  "item.edit.bitstreams.empty": "Este artículo no contiene ningún archivo. Haga clic en el botón de carga para crear uno.",
 
-	// "item.edit.relationships.notifications.saved.title": "Relationships saved",
-	"item.edit.relationships.notifications.saved.title": "Relaciones guardadas",
+  // "item.edit.bitstreams.headers.actions": "Actions",
+  "item.edit.bitstreams.headers.actions": "Comportamiento",
 
-	// "item.edit.relationships.reinstate-button": "Undo",
-	"item.edit.relationships.reinstate-button": "Deshacer",
+  // "item.edit.bitstreams.headers.bundle": "Bundle",
+  "item.edit.bitstreams.headers.bundle": "Manojo",
 
-	// "item.edit.relationships.save-button": "Save",
-	"item.edit.relationships.save-button": "Guardar",
+  // "item.edit.bitstreams.headers.description": "Description",
+  "item.edit.bitstreams.headers.description": "Descripción",
 
-	// "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
-	"item.edit.relationships.no-entity-type": "Agregue metadatos 'dspace.entity.type' para habilitar las relaciones para este artículo",
+  // "item.edit.bitstreams.headers.format": "Format",
+  "item.edit.bitstreams.headers.format": "Formato",
 
+  // "item.edit.bitstreams.headers.name": "Name",
+  "item.edit.bitstreams.headers.name": "Nombre",
 
-	// "item.edit.return": "Back",
-	"item.edit.return": "atrás",
+  // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.bitstreams.notifications.discarded.content": "Tus cambios fueron descartados. ",
 
+  // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
+  "item.edit.bitstreams.notifications.discarded.title": "Cambios descartados",
 
-	// "item.edit.tabs.bitstreams.head": "Bitstreams",
-	"item.edit.tabs.bitstreams.head": "Archivos",
+  // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
+  "item.edit.bitstreams.notifications.move.failed.title": "Error al mover archivos",
 
-	// "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
-	"item.edit.tabs.bitstreams.title": "Edición de artículos: archivos",
+  // "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this item's bitstreams and bundles have been saved.",
+  "item.edit.bitstreams.notifications.move.saved.content": "Se han guardado los cambios de movimiento en los archivos y paquetes de este artículo.",
 
-	// "item.edit.tabs.curate.head": "Curate",
-	"item.edit.tabs.curate.head": "Cura",
+  // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
+  "item.edit.bitstreams.notifications.move.saved.title": "Mover cambios guardados",
 
-	// "item.edit.tabs.curate.title": "Item Edit - Curate",
-	"item.edit.tabs.curate.title": "Edición de artículo: seleccionar",
+  // "item.edit.bitstreams.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "item.edit.bitstreams.notifications.outdated.content": "Otro usuario ha cambiado el artículo en el que está trabajando actualmente. ",
 
-	// "item.edit.tabs.metadata.head": "Metadata",
-	"item.edit.tabs.metadata.head": "Metadatos",
+  // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
+  "item.edit.bitstreams.notifications.outdated.title": "Cambios desactualizados",
 
-	// "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
-	"item.edit.tabs.metadata.title": "Edición de artículos: metadatos",
+  // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
+  "item.edit.bitstreams.notifications.remove.failed.title": "Error al eliminar archivo",
 
-	// "item.edit.tabs.relationships.head": "Relationships",
-	"item.edit.tabs.relationships.head": "Relaciones",
+  // "item.edit.bitstreams.notifications.remove.saved.content": "Your removal changes to this item's bitstreams have been saved.",
+  "item.edit.bitstreams.notifications.remove.saved.content": "Se han guardado los cambios de eliminación de los archivos de este artículo.",
 
-	// "item.edit.tabs.relationships.title": "Item Edit - Relationships",
-	"item.edit.tabs.relationships.title": "Edición de artículo: relaciones",
+  // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
+  "item.edit.bitstreams.notifications.remove.saved.title": "Se guardaron los cambios de eliminación",
 
-	// "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
-	"item.edit.tabs.status.buttons.authorizations.button": "Autorizaciones...",
+  // "item.edit.bitstreams.reinstate-button": "Undo",
+  "item.edit.bitstreams.reinstate-button": "Deshacer",
 
-	// "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
-	"item.edit.tabs.status.buttons.authorizations.label": "Editar las políticas de autorización del artículo",
+  // "item.edit.bitstreams.save-button": "Save",
+  "item.edit.bitstreams.save-button": "Guardar",
 
-	// "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
-	"item.edit.tabs.status.buttons.delete.button": "Borrar permanentemente",
+  // "item.edit.bitstreams.upload-button": "Upload",
+  "item.edit.bitstreams.upload-button": "Subir",
 
-	// "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
-	"item.edit.tabs.status.buttons.delete.label": "Eliminar completamente el artículo",
 
-	// "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
-	"item.edit.tabs.status.buttons.mappedCollections.button": "Colecciones mapeadas",
 
-	// "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
-	"item.edit.tabs.status.buttons.mappedCollections.label": "Administrar colecciones mapeadas",
+  // "item.edit.delete.cancel": "Cancel",
+  "item.edit.delete.cancel": "Cancelar",
 
-	// "item.edit.tabs.status.buttons.move.button": "Move...",
-	"item.edit.tabs.status.buttons.move.button": "Moverse...",
+  // "item.edit.delete.confirm": "Delete",
+  "item.edit.delete.confirm": "Borrar",
 
-	// "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
-	"item.edit.tabs.status.buttons.move.label": "Mover artículo a otra colección",
+  // "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.",
+  "item.edit.delete.description": "¿Estás seguro de que este artículo debería eliminarse por completo? Precaución: en la actualidad, no se dejaría ninguna lápida.",
 
-	// "item.edit.tabs.status.buttons.private.button": "Make it private...",
-	"item.edit.tabs.status.buttons.private.button": "Hacerlo privado...",
+  // "item.edit.delete.error": "An error occurred while deleting the item",
+  "item.edit.delete.error": "Se produjo un error al eliminar el artículo.",
 
-	// "item.edit.tabs.status.buttons.private.label": "Make item private",
-	"item.edit.tabs.status.buttons.private.label": "Hacer que el artículo sea privado",
+  // "item.edit.delete.header": "Delete item: {{ id }}",
+  "item.edit.delete.header": "Eliminar artículo: {{ id }}",
 
-	// "item.edit.tabs.status.buttons.public.button": "Make it public...",
-	"item.edit.tabs.status.buttons.public.button": "Hacerlo público...",
+  // "item.edit.delete.success": "The item has been deleted",
+  "item.edit.delete.success": "El artículo ha sido eliminado",
 
-	// "item.edit.tabs.status.buttons.public.label": "Make item public",
-	"item.edit.tabs.status.buttons.public.label": "Hacer público el artículo",
+  // "item.edit.head": "Edit Item",
+  "item.edit.head": "Editar artículo",
 
-	// "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
-	"item.edit.tabs.status.buttons.reinstate.button": "Reintegrar...",
+  // "item.edit.breadcrumbs": "Edit Item",
+  "item.edit.breadcrumbs": "Editar artículo",
 
-	// "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
-	"item.edit.tabs.status.buttons.reinstate.label": "Restablecer el artículo en el repositorio",
+  // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
+  "item.edit.tabs.disabled.tooltip": "No tienes autorización para acceder a esta pestaña",
 
-	// "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
-	"item.edit.tabs.status.buttons.unauthorized": "No estás autorizado para realizar esta acción.",
 
-	// "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-	"item.edit.tabs.status.buttons.withdraw.button": "Retirar...",
+  // "item.edit.tabs.mapper.head": "Collection Mapper",
+  "item.edit.tabs.mapper.head": "Mapeador de colecciones",
 
-	// "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
-	"item.edit.tabs.status.buttons.withdraw.label": "Retirar artículo del repositorio",
+  // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
+  "item.edit.tabs.item-mapper.title": "Edición de artículos - Mapeador de colecciones",
 
-	// "item.edit.tabs.status.description": "Welcome to the item management page. From here you can withdraw, reinstate, move or delete the item. You may also update or add new metadata / bitstreams on the other tabs.",
-	"item.edit.tabs.status.description": "Bienvenido a la página de administración de artículos. Desde aquí puede retirar, restablecer, mover o eliminar el artículo. También puede actualizar o agregar nuevos metadatos / archivos en las otras pestañas.",
+  // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
+  "item.edit.item-mapper.buttons.add": "Asignar artículo a colecciones seleccionadas",
 
-	// "item.edit.tabs.status.head": "Status",
-	"item.edit.tabs.status.head": "Estado",
+  // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
+  "item.edit.item-mapper.buttons.remove": "Eliminar la asignación de artículos para las colecciones seleccionadas",
 
-	// "item.edit.tabs.status.labels.handle": "Handle",
-	"item.edit.tabs.status.labels.handle": "Resolver",
+  // "item.edit.item-mapper.cancel": "Cancel",
+  "item.edit.item-mapper.cancel": "Cancelar",
 
-	// "item.edit.tabs.status.labels.id": "Item Internal ID",
-	"item.edit.tabs.status.labels.id": "ID interno del artículo",
+  // "item.edit.item-mapper.description": "This is the item mapper tool that allows administrators to map this item to other collections. You can search for collections and map them, or browse the list of collections the item is currently mapped to.",
+  "item.edit.item-mapper.description": "Esta es la herramienta de asignación de artículos que permite a los administradores asignar este artículo a otras colecciones. Puede buscar colecciones y mapearlas, o explorar la lista de colecciones a las que el artículo está mapeado actualmente.",
 
-	// "item.edit.tabs.status.labels.itemPage": "Item Page",
-	"item.edit.tabs.status.labels.itemPage": "Página del artículo",
+  // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
+  "item.edit.item-mapper.head": "Asignador de artículos: asigna artículos a colecciones",
 
-	// "item.edit.tabs.status.labels.lastModified": "Last Modified",
-	"item.edit.tabs.status.labels.lastModified": "Última modificación",
+  // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
+  "item.edit.item-mapper.item": "Artículo: \"<b>{{ name }}</b>\"",
 
-	// "item.edit.tabs.status.title": "Item Edit -  Status",
-	"item.edit.tabs.status.title": "Edición de artículo: estado",
+  // "item.edit.item-mapper.no-search": "Please enter a query to search",
+  "item.edit.item-mapper.no-search": "Introduzca una consulta para buscar",
 
-	// "item.edit.tabs.versionhistory.head": "Version History",
-	"item.edit.tabs.versionhistory.head": "Historial de versiones",
+  // "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.add.error.content": "Se produjeron errores al mapear el artículo a {{ amount }} colecciones.",
 
-	// "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
-	"item.edit.tabs.versionhistory.title": "Edición de artículos: historial de versiones",
+  // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
+  "item.edit.item-mapper.notifications.add.error.head": "Errores de mapeo",
 
-	// "item.edit.tabs.versionhistory.under-construction": "Editing or adding new versions is not yet possible in this user interface.",
-	"item.edit.tabs.versionhistory.under-construction": "Aún no es posible editar o agregar nuevas versiones en esta interfaz de usuario.",
+  // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.add.success.content": "Se asignó correctamente el artículo a {{ amount }} colecciones.",
 
-	// "item.edit.tabs.view.head": "View Item",
-	"item.edit.tabs.view.head": "Ver artículo",
+  // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
+  "item.edit.item-mapper.notifications.add.success.head": "Mapeo completado",
 
-	// "item.edit.tabs.view.title": "Item Edit -  View",
-	"item.edit.tabs.view.title": "Edición de artículo - Ver",
+  // "item.edit.item-mapper.notifications.remove.error.content": "Errors occurred for the removal of the mapping to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.error.content": "Se produjeron errores para la eliminación de la asignación a {{ amount }} colecciones.",
 
+  // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
+  "item.edit.item-mapper.notifications.remove.error.head": "Eliminación de errores de mapeo",
 
+  // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.success.content": "Se eliminó correctamente la asignación del artículo a {{ amount }} colecciones.",
 
-	// "item.edit.withdraw.cancel": "Cancel",
-	"item.edit.withdraw.cancel": "Cancelar",
+  // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
+  "item.edit.item-mapper.notifications.remove.success.head": "Eliminación del mapeo completada",
 
-	// "item.edit.withdraw.confirm": "Withdraw",
-	"item.edit.withdraw.confirm": "Retirar",
+  // "item.edit.item-mapper.search-form.placeholder": "Search collections...",
+  "item.edit.item-mapper.search-form.placeholder": "Buscar colecciones...",
 
-	// "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
-	"item.edit.withdraw.description": "¿Está seguro de que este artículo debe retirarse del archivo?",
+  // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
+  "item.edit.item-mapper.tabs.browse": "Examinar colecciones mapeadas",
 
-	// "item.edit.withdraw.error": "An error occurred while withdrawing the item",
-	"item.edit.withdraw.error": "Ocurrió un error al retirar el artículo",
+  // "item.edit.item-mapper.tabs.map": "Map new collections",
+  "item.edit.item-mapper.tabs.map": "Mapear nuevas colecciones",
 
-	// "item.edit.withdraw.header": "Withdraw item: {{ id }}",
-	"item.edit.withdraw.header": "Retirar artículo: {{ id }}",
 
-	// "item.edit.withdraw.success": "The item was withdrawn successfully",
-	"item.edit.withdraw.success": "El artículo se retiró con éxito",
 
+  // "item.edit.metadata.add-button": "Add",
+  "item.edit.metadata.add-button": "Agregar",
 
+  // "item.edit.metadata.discard-button": "Discard",
+  "item.edit.metadata.discard-button": "Descarte",
 
-	// "item.listelement.badge": "Item",
-	"item.listelement.badge": "Artículo",
+  // "item.edit.metadata.edit.buttons.edit": "Edit",
+  "item.edit.metadata.edit.buttons.edit": "Editar",
 
-	// "item.page.description": "Description",
-	"item.page.description": "Descripción",
+  // "item.edit.metadata.edit.buttons.remove": "Remove",
+  "item.edit.metadata.edit.buttons.remove": "Eliminar",
 
-	// "item.page.journal-issn": "Journal ISSN",
-	"item.page.journal-issn": "Revista ISSN",
+  // "item.edit.metadata.edit.buttons.undo": "Undo changes",
+  "item.edit.metadata.edit.buttons.undo": "Deshacer cambios",
 
-	// "item.page.journal-title": "Journal Title",
-	"item.page.journal-title": "Título de la revista",
+  // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "item.edit.metadata.edit.buttons.unedit": "Dejar de editar",
 
-	// "item.page.publisher": "Publisher",
-	"item.page.publisher": "Editor",
+  // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "item.edit.metadata.empty": "Actualmente, el artículo no contiene metadatos. Haga clic en Agregar para comenzar a agregar un valor de metadatos.",
 
-	// "item.page.titleprefix": "Item: ",
-	"item.page.titleprefix": "Artículo:",
+  // "item.edit.metadata.headers.edit": "Edit",
+  "item.edit.metadata.headers.edit": "Editar",
 
-	// "item.page.volume-title": "Volume Title",
-	"item.page.volume-title": "Título del volumen",
+  // "item.edit.metadata.headers.field": "Field",
+  "item.edit.metadata.headers.field": "Campo",
 
-	// "item.search.results.head": "Item Search Results",
-	"item.search.results.head": "Resultados de la búsqueda de artículos",
+  // "item.edit.metadata.headers.language": "Lang",
+  "item.edit.metadata.headers.language": "Lang",
 
-	// "item.search.title": "Item Search",
-	"item.search.title": "Búsqueda de artículos",
+  // "item.edit.metadata.headers.value": "Value",
+  "item.edit.metadata.headers.value": "Valor",
 
+  // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "item.edit.metadata.metadatafield.invalid": "Elija un campo de metadatos válido",
 
+  // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.metadata.notifications.discarded.content": "Tus cambios fueron descartados. ",
 
-	// "item.page.abstract": "Abstract",
-	"item.page.abstract": "Abstracto",
+  // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
+  "item.edit.metadata.notifications.discarded.title": "Cambiado descartado",
 
-	// "item.page.author": "Authors",
-	"item.page.author": "Autores",
+  // "item.edit.metadata.notifications.error.title": "An error occurred",
+  "item.edit.metadata.notifications.error.title": "Ocurrió un error",
 
-	// "item.page.citation": "Citation",
-	"item.page.citation": "Citación",
+  // "item.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
+  "item.edit.metadata.notifications.invalid.content": "Tus cambios no se guardaron. Asegúrese de que todos los campos sean válidos antes de guardar.",
 
-	// "item.page.collections": "Collections",
-	"item.page.collections": "Colecciones",
+  // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "item.edit.metadata.notifications.invalid.title": "Metadatos inválidos",
 
-	// "item.page.collections.loading": "Loading...",
-	"item.page.collections.loading": "Cargando...",
+  // "item.edit.metadata.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "item.edit.metadata.notifications.outdated.content": "Otro usuario ha cambiado el artículo en el que está trabajando actualmente. ",
 
-	// "item.page.collections.load-more": "Load more",
-	"item.page.collections.load-more": "Cargar más",
+  // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
+  "item.edit.metadata.notifications.outdated.title": "Cambiado desactualizado",
 
-	// "item.page.date": "Date",
-	"item.page.date": "Fecha",
+  // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
+  "item.edit.metadata.notifications.saved.content": "Se guardaron sus cambios en los metadatos de este artículo.",
 
-	// "item.page.edit": "Edit this item",
-	"item.page.edit": "Editar este artículo",
+  // "item.edit.metadata.notifications.saved.title": "Metadata saved",
+  "item.edit.metadata.notifications.saved.title": "Metadatos guardados",
 
-	// "item.page.files": "Files",
-	"item.page.files": "Archivos",
+  // "item.edit.metadata.reinstate-button": "Undo",
+  "item.edit.metadata.reinstate-button": "Deshacer",
 
-	// "item.page.filesection.description": "Description:",
-	"item.page.filesection.description": "Descripción:",
+  // "item.edit.metadata.save-button": "Save",
+  "item.edit.metadata.save-button": "Guardar",
 
-	// "item.page.filesection.download": "Download",
-	"item.page.filesection.download": "Descargar",
 
-	// "item.page.filesection.format": "Format:",
-	"item.page.filesection.format": "Formato:",
 
-	// "item.page.filesection.name": "Name:",
-	"item.page.filesection.name": "Nombre:",
+  // "item.edit.modify.overview.field": "Field",
+  "item.edit.modify.overview.field": "Campo",
 
-	// "item.page.filesection.size": "Size:",
-	"item.page.filesection.size": "Tamaño:",
+  // "item.edit.modify.overview.language": "Language",
+  "item.edit.modify.overview.language": "Idioma",
 
-	// "item.page.journal.search.title": "Articles in this journal",
-	"item.page.journal.search.title": "Artículos de esta revista",
+  // "item.edit.modify.overview.value": "Value",
+  "item.edit.modify.overview.value": "Valor",
 
-	// "item.page.link.full": "Full item page",
-	"item.page.link.full": "Página completa del artículo",
 
-	// "item.page.link.simple": "Simple item page",
-	"item.page.link.simple": "Página de artículo simple",
 
-	// "item.page.person.search.title": "Articles by this author",
-	"item.page.person.search.title": "Artículos de este autor",
+  // "item.edit.move.cancel": "Back",
+  "item.edit.move.cancel": "Atrás",
 
-	// "item.page.related-items.view-more": "Show {{ amount }} more",
-	"item.page.related-items.view-more": "Mostrar {{ amount }} más",
+  // "item.edit.move.save-button": "Save",
+  "item.edit.move.save-button": "Guardar",
 
-	// "item.page.related-items.view-less": "Hide last {{ amount }}",
-	"item.page.related-items.view-less": "Ocultar la última {{ amount }}",
+  // "item.edit.move.discard-button": "Discard",
+  "item.edit.move.discard-button": "Descarte",
 
-	// "item.page.relationships.isAuthorOfPublication": "Publications",
-	"item.page.relationships.isAuthorOfPublication": "Publicaciones",
+  // "item.edit.move.description": "Select the collection you wish to move this item to. To narrow down the list of displayed collections, you can enter a search query in the box.",
+  "item.edit.move.description": "Seleccione la colección a la que desea mover este artículo. Para reducir la lista de colecciones mostradas, puede introducir una consulta de búsqueda en el cuadro.",
 
-	// "item.page.relationships.isJournalOfPublication": "Publications",
-	"item.page.relationships.isJournalOfPublication": "Publicaciones",
+  // "item.edit.move.error": "An error occurred when attempting to move the item",
+  "item.edit.move.error": "Se produjo un error al intentar mover el artículo.",
 
-	// "item.page.relationships.isOrgUnitOfPerson": "Authors",
-	"item.page.relationships.isOrgUnitOfPerson": "Autores",
+  // "item.edit.move.head": "Move item: {{id}}",
+  "item.edit.move.head": "Mover artículo: {{ id }}",
 
-	// "item.page.relationships.isOrgUnitOfProject": "Research Projects",
-	"item.page.relationships.isOrgUnitOfProject": "Proyectos de investigación",
+  // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
+  "item.edit.move.inheritpolicies.checkbox": "Heredar políticas",
 
-	// "item.page.subject": "Keywords",
-	"item.page.subject": "Palabras clave",
+  // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
+  "item.edit.move.inheritpolicies.description": "Heredar las políticas predeterminadas de la colección de destino",
 
-	// "item.page.uri": "URI",
-	"item.page.uri": "URI",
+  // "item.edit.move.move": "Move",
+  "item.edit.move.move": "Moverse",
 
-	// "item.page.bitstreams.view-more": "Show more",
-	"item.page.bitstreams.view-more": "Mostrar más",
+  // "item.edit.move.processing": "Moving...",
+  "item.edit.move.processing": "Moviente...",
 
-	// "item.page.bitstreams.collapse": "Collapse",
-	"item.page.bitstreams.collapse": "Colapso",
+  // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
+  "item.edit.move.search.placeholder": "Introduzca una consulta de búsqueda para buscar colecciones",
 
-	// "item.page.filesection.original.bundle" : "Original bundle",
-	"item.page.filesection.original.bundle": "Paquete original",
+  // "item.edit.move.success": "The item has been moved successfully",
+  "item.edit.move.success": "El ítem se ha movido correctamente.",
 
-	// "item.page.filesection.license.bundle" : "License bundle",
-	"item.page.filesection.license.bundle": "Paquete de licencias",
+  // "item.edit.move.title": "Move item",
+  "item.edit.move.title": "Mover ítem",
 
-	// "item.page.return": "Back",
-	"item.page.return": "atrás",
 
-	// "item.preview.dc.identifier.uri": "Identifier:",
-	"item.preview.dc.identifier.uri": "Identificador:",
 
-	// "item.preview.dc.contributor.author": "Authors:",
-	"item.preview.dc.contributor.author": "Autores:",
+  // "item.edit.private.cancel": "Cancel",
+  "item.edit.private.cancel": "Cancelar",
 
-	// "item.preview.dc.date.issued": "Published date:",
-	"item.preview.dc.date.issued": "Fecha de Publicación:",
+  // "item.edit.private.confirm": "Make it non-discoverable",
+  "item.edit.private.confirm": "Convertirlo en privado",
 
-	// "item.preview.dc.description.abstract": "Abstract:",
-	"item.preview.dc.description.abstract": "Abstracto:",
+  // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?",
+  "item.edit.private.description": "¿Está seguro de que este ítem debe convertirse en privado?",
 
-	// "item.preview.dc.identifier.other": "Other identifier:",
-	"item.preview.dc.identifier.other": "Otro identificador:",
+  // "item.edit.private.error": "An error occurred while making the item non-discoverable",
+  "item.edit.private.error": "Se produjo un error al convertir el ítem en privado.",
 
-	// "item.preview.dc.language.iso": "Language:",
-	"item.preview.dc.language.iso": "Idioma:",
+  // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
+  "item.edit.private.header": "Convertir el ítem en privado {{ id }}",
 
-	// "item.preview.dc.subject": "Subjects:",
-	"item.preview.dc.subject": "Asignaturas:",
+  // "item.edit.private.success": "The item is now non-discoverable",
+  "item.edit.private.success": "El ítem ahora es privado",
 
-	// "item.preview.dc.title": "Title:",
-	"item.preview.dc.title": "Título:",
 
-	// "item.preview.person.familyName": "Surname:",
-	"item.preview.person.familyName": "Apellido:",
 
-	// "item.preview.person.givenName": "Name:",
-	"item.preview.person.givenName": "Nombre:",
+  // "item.edit.public.cancel": "Cancel",
+  "item.edit.public.cancel": "Cancelar",
 
-	// "item.preview.person.identifier.orcid": "ORCID:",
-	"item.preview.person.identifier.orcid": "ORCID:",
+  // "item.edit.public.confirm": "Make it discoverable",
+  "item.edit.public.confirm": "Convertirlo en público",
 
-	// "item.preview.project.funder.name": "Funder:",
-	"item.preview.project.funder.name": "Financiador:",
+  // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?",
+  "item.edit.public.description": "¿Está seguro de que este ítem debe convertirse en público?",
 
-	// "item.preview.project.funder.identifier": "Funder Identifier:",
-	"item.preview.project.funder.identifier": "Identificador del financiador:",
+  // "item.edit.public.error": "An error occurred while making the item discoverable",
+  "item.edit.public.error": "Se produjo un error al convertir el ítem en público.",
 
-	// "item.preview.oaire.awardNumber": "Funding ID:",
-	"item.preview.oaire.awardNumber": "ID de financiación:",
+  // "item.edit.public.header": "Make item discoverable: {{ id }}",
+  "item.edit.public.header": "Convertir el ítem en público{{ id }}",
 
-	// "item.preview.dc.title.alternative": "Acronym:",
-	"item.preview.dc.title.alternative": "Acrónimo:",
+  // "item.edit.public.success": "The item is now discoverable",
+  "item.edit.public.success": "El ítem ahora es público",
 
-	// "item.preview.dc.coverage.spatial": "Jurisdiction:",
-	"item.preview.dc.coverage.spatial": "Jurisdicción:",
 
-	// "item.preview.oaire.fundingStream": "Funding Stream:",
-	"item.preview.oaire.fundingStream": "Corriente de financiación:",
 
+  // "item.edit.reinstate.cancel": "Cancel",
+  "item.edit.reinstate.cancel": "Cancelar",
 
+  // "item.edit.reinstate.confirm": "Reinstate",
+  "item.edit.reinstate.confirm": "Reintegrar",
 
-	// "item.select.confirm": "Confirm selected",
-	"item.select.confirm": "Confirmar seleccionado",
+  // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
+  "item.edit.reinstate.description": "¿Está seguro de que este ítem debe reintegrarse?",
 
-	// "item.select.empty": "No items to show",
-	"item.select.empty": "No hay artículos para mostrar",
+  // "item.edit.reinstate.error": "An error occurred while reinstating the item",
+  "item.edit.reinstate.error": "Ocurrió un error al reintegrar el ítem",
 
-	// "item.select.table.author": "Author",
-	"item.select.table.author": "Autor",
+  // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
+  "item.edit.reinstate.header": "Reintegrar el ítem: {{ id }}",
 
-	// "item.select.table.collection": "Collection",
-	"item.select.table.collection": "Colección",
+  // "item.edit.reinstate.success": "The item was reinstated successfully",
+  "item.edit.reinstate.success": "El ítem se reintegró correctamente",
 
-	// "item.select.table.title": "Title",
-	"item.select.table.title": "Título",
 
 
-	// "item.version.history.empty": "There are no other versions for this item yet.",
-	"item.version.history.empty": "Aún no hay otras versiones para este artículo.",
+  // "item.edit.relationships.discard-button": "Discard",
+  "item.edit.relationships.discard-button": "Descartar",
 
-	// "item.version.history.head": "Version History",
-	"item.version.history.head": "Historial de versiones",
+  // "item.edit.relationships.edit.buttons.add": "Add",
+  "item.edit.relationships.edit.buttons.add": "Añadir",
 
-	// "item.version.history.return": "Back",
-	"item.version.history.return": "atrás",
+  // "item.edit.relationships.edit.buttons.remove": "Remove",
+  "item.edit.relationships.edit.buttons.remove": "Eliminar",
 
-	// "item.version.history.selected": "Selected version",
-	"item.version.history.selected": "Versión seleccionada",
+  // "item.edit.relationships.edit.buttons.undo": "Undo changes",
+  "item.edit.relationships.edit.buttons.undo": "Deshacer cambios",
 
-	// "item.version.history.table.version": "Version",
-	"item.version.history.table.version": "Versión",
+  // "item.edit.relationships.no-relationships": "No relationships",
+  "item.edit.relationships.no-relationships": "Sin relaciones",
 
-	// "item.version.history.table.item": "Item",
-	"item.version.history.table.item": "Artículo",
+  // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.relationships.notifications.discarded.content": "Sus cambios fueron descartados. Para recuperar sus cambios pulse el botón 'Deshacer' ",
 
-	// "item.version.history.table.editor": "Editor",
-	"item.version.history.table.editor": "Editor",
+  // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
+  "item.edit.relationships.notifications.discarded.title": "Cambios descartados",
 
-	// "item.version.history.table.date": "Date",
-	"item.version.history.table.date": "Fecha",
+  // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
+  "item.edit.relationships.notifications.failed.title": "Error al editar las relaciones",
 
-	// "item.version.history.table.summary": "Summary",
-	"item.version.history.table.summary": "Resumen",
+  // "item.edit.relationships.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "item.edit.relationships.notifications.outdated.content": "Otro usuario ha cambiado el ítem en el que está trabajando actualmente. Sus cambios se descartarán para prevenir conflictos ",
 
+  // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
+  "item.edit.relationships.notifications.outdated.title": "Cambios desactualizados",
 
+  // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
+  "item.edit.relationships.notifications.saved.content": "Se guardaron sus cambios en las relaciones de este ítem.",
 
-	// "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
-	"item.version.notice": "Esta no es la última versión de este artículo. La última versión se puede encontrar <a href='{{ destination }}'> aquí </a>.",
+  // "item.edit.relationships.notifications.saved.title": "Relationships saved",
+  "item.edit.relationships.notifications.saved.title": "Relaciones guardadas",
 
+  // "item.edit.relationships.reinstate-button": "Undo",
+  "item.edit.relationships.reinstate-button": "Deshacer",
 
+  // "item.edit.relationships.save-button": "Save",
+  "item.edit.relationships.save-button": "Guardar",
 
-	// "journal.listelement.badge": "Journal",
-	"journal.listelement.badge": "diario",
+  // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
+  "item.edit.relationships.no-entity-type": "Agregue metadatos 'dspace.entity.type' para habilitar las relaciones para este artículo",
 
-	// "journal.page.description": "Description",
-	"journal.page.description": "Descripción",
 
-	// "journal.page.edit": "Edit this item",
-	"journal.page.edit": "Editar este artículo",
+  // "item.edit.return": "Back",
+  "item.edit.return": "Atrás",
 
-	// "journal.page.editor": "Editor-in-Chief",
-	"journal.page.editor": "Editor en jefe",
 
-	// "journal.page.issn": "ISSN",
-	"journal.page.issn": "ISSN",
+  // "item.edit.tabs.bitstreams.head": "Bitstreams",
+  "item.edit.tabs.bitstreams.head": "Archivos",
 
-	// "journal.page.publisher": "Publisher",
-	"journal.page.publisher": "Editor",
+  // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
+  "item.edit.tabs.bitstreams.title": "Edición de ítems: archivos",
 
-	// "journal.page.titleprefix": "Journal: ",
-	"journal.page.titleprefix": "Diario:",
+  // "item.edit.tabs.curate.head": "Curate",
+  "item.edit.tabs.curate.head": "Curar",
 
-	// "journal.search.results.head": "Journal Search Results",
-	"journal.search.results.head": "Resultados de la búsqueda de revistas",
+  // "item.edit.tabs.curate.title": "Item Edit - Curate",
+  "item.edit.tabs.curate.title": "Edición de ítem: Curar",
 
-	// "journal.search.title": "Journal Search",
-	"journal.search.title": "Búsqueda de revistas",
+  // "item.edit.tabs.metadata.head": "Metadata",
+  "item.edit.tabs.metadata.head": "Metadatos",
 
+  // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
+  "item.edit.tabs.metadata.title": "Edición de ítem: Metadatos",
 
+  // "item.edit.tabs.relationships.head": "Relationships",
+  "item.edit.tabs.relationships.head": "Relaciones",
 
-	// "journalissue.listelement.badge": "Journal Issue",
-	"journalissue.listelement.badge": "Número de la revista",
+  // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
+  "item.edit.tabs.relationships.title": "Edición de ítem: Relaciones",
 
-	// "journalissue.page.description": "Description",
-	"journalissue.page.description": "Descripción",
+  // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
+  "item.edit.tabs.status.buttons.authorizations.button": "Autorizaciones...",
 
-	// "journalissue.page.edit": "Edit this item",
-	"journalissue.page.edit": "Editar este artículo",
+  // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
+  "item.edit.tabs.status.buttons.authorizations.label": "Editar privilegios de autorización del ítem:",
 
-	// "journalissue.page.issuedate": "Issue Date",
-	"journalissue.page.issuedate": "Fecha de asunto",
+  // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
+  "item.edit.tabs.status.buttons.delete.button": "Borrar permanentemente",
 
-	// "journalissue.page.journal-issn": "Journal ISSN",
-	"journalissue.page.journal-issn": "Revista ISSN",
+  // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
+  "item.edit.tabs.status.buttons.delete.label": "Borrar completamente el ítem:",
 
-	// "journalissue.page.journal-title": "Journal Title",
-	"journalissue.page.journal-title": "Título de la revista",
+  // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "Colecciones mapeadas",
 
-	// "journalissue.page.keyword": "Keywords",
-	"journalissue.page.keyword": "Palabras clave",
+  // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.label": "Administrar colecciones mapeadas",
 
-	// "journalissue.page.number": "Number",
-	"journalissue.page.number": "Número",
+  // "item.edit.tabs.status.buttons.move.button": "Move...",
+  "item.edit.tabs.status.buttons.move.button": "Mover...",
 
-	// "journalissue.page.titleprefix": "Journal Issue: ",
-	"journalissue.page.titleprefix": "Número de la revista:",
+  // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
+  "item.edit.tabs.status.buttons.move.label": "Mover ítem a otra colección",
 
+  // "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...",
+  "item.edit.tabs.status.buttons.private.button": "Convertirlo en privado...",
 
+  // "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable",
+  "item.edit.tabs.status.buttons.private.label": "Convertir el ítem en privado",
 
-	// "journalvolume.listelement.badge": "Journal Volume",
-	"journalvolume.listelement.badge": "Volumen de la revista",
+  // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...",
+  "item.edit.tabs.status.buttons.public.button": "Convertirlo en público...",
 
-	// "journalvolume.page.description": "Description",
-	"journalvolume.page.description": "Descripción",
+  // "item.edit.tabs.status.buttons.public.label": "Make item discoverable",
+  "item.edit.tabs.status.buttons.public.label": "Convertir el ítem en público",
 
-	// "journalvolume.page.edit": "Edit this item",
-	"journalvolume.page.edit": "Editar este artículo",
+  // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
+  "item.edit.tabs.status.buttons.reinstate.button": "Reintegrar...",
 
-	// "journalvolume.page.issuedate": "Issue Date",
-	"journalvolume.page.issuedate": "Fecha de asunto",
+  // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
+  "item.edit.tabs.status.buttons.reinstate.label": "Restablecer el ítem en el repositorio",
 
-	// "journalvolume.page.titleprefix": "Journal Volume: ",
-	"journalvolume.page.titleprefix": "Volumen de la revista:",
+  // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
+  "item.edit.tabs.status.buttons.unauthorized": "No estás autorizado para realizar esta acción.",
 
-	// "journalvolume.page.volume": "Volume",
-	"journalvolume.page.volume": "Volumen",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
+  "item.edit.tabs.status.buttons.withdraw.button": "Retirar...",
 
+  // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
+  "item.edit.tabs.status.buttons.withdraw.label": "Retirar ítem del repositorio",
 
+  // "item.edit.tabs.status.description": "Welcome to the item management page. From here you can withdraw, reinstate, move or delete the item. You may also update or add new metadata / bitstreams on the other tabs.",
+  "item.edit.tabs.status.description": "Bienvenido a la página de administración de artículos. Desde aquí puede retirar, restablecer, mover o eliminar el ítem. También puede actualizar o agregar nuevos metadatos / archivos en las otras pestañas.",
 
-	// "loading.bitstream": "Loading bitstream...",
-	"loading.bitstream": "Cargando archivo...",
+  // "item.edit.tabs.status.head": "Status",
+  "item.edit.tabs.status.head": "Estado",
 
-	// "loading.bitstreams": "Loading bitstreams...",
-	"loading.bitstreams": "Cargando archivos...",
+  // "item.edit.tabs.status.labels.handle": "Handle",
+  "item.edit.tabs.status.labels.handle": "Handle",
 
-	// "loading.browse-by": "Loading items...",
-	"loading.browse-by": "Cargando artículos...",
+  // "item.edit.tabs.status.labels.id": "Item Internal ID",
+  "item.edit.tabs.status.labels.id": "ID interno del ítem",
 
-	// "loading.browse-by-page": "Loading page...",
-	"loading.browse-by-page": "Cargando página...",
+  // "item.edit.tabs.status.labels.itemPage": "Item Page",
+  "item.edit.tabs.status.labels.itemPage": "Página del ítem",
 
-	// "loading.collection": "Loading collection...",
-	"loading.collection": "Cargando colección...",
+  // "item.edit.tabs.status.labels.lastModified": "Last Modified",
+  "item.edit.tabs.status.labels.lastModified": "Última modificación",
 
-	// "loading.collections": "Loading collections...",
-	"loading.collections": "Cargando colecciones...",
+  // "item.edit.tabs.status.title": "Item Edit -  Status",
+  "item.edit.tabs.status.title": "Edición de ítem: Estado",
 
-	// "loading.content-source": "Loading content source...",
-	"loading.content-source": "Cargando fuente de contenido...",
+  // "item.edit.tabs.versionhistory.head": "Version History",
+  "item.edit.tabs.versionhistory.head": "Historial de versiones",
 
-	// "loading.community": "Loading community...",
-	"loading.community": "Cargando comunidad...",
+  // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
+  "item.edit.tabs.versionhistory.title": "Edición de ítems: Historial de versiones",
 
-	// "loading.default": "Loading...",
-	"loading.default": "Cargando...",
+  // "item.edit.tabs.versionhistory.under-construction": "Editing or adding new versions is not yet possible in this user interface.",
+  "item.edit.tabs.versionhistory.under-construction": "Aún no es posible editar o agregar nuevas versiones en esta interfaz de usuario.",
 
-	// "loading.item": "Loading item...",
-	"loading.item": "Cargando artículo...",
+  // "item.edit.tabs.view.head": "View Item",
+  "item.edit.tabs.view.head": "Ver ítem",
 
-	// "loading.items": "Loading items...",
-	"loading.items": "Cargando artículos...",
+  // "item.edit.tabs.view.title": "Item Edit -  View",
+  "item.edit.tabs.view.title": "Edición de ítem - Ver",
 
-	// "loading.mydspace-results": "Loading items...",
-	"loading.mydspace-results": "Cargando artículos...",
 
-	// "loading.objects": "Loading...",
-	"loading.objects": "Cargando...",
 
-	// "loading.recent-submissions": "Loading recent submissions...",
-	"loading.recent-submissions": "Cargando envíos recientes...",
+  // "item.edit.withdraw.cancel": "Cancel",
+  "item.edit.withdraw.cancel": "Cancelar",
 
-	// "loading.search-results": "Loading search results...",
-	"loading.search-results": "Cargando resultados de búsqueda...",
+  // "item.edit.withdraw.confirm": "Withdraw",
+  "item.edit.withdraw.confirm": "Retirar",
 
-	// "loading.sub-collections": "Loading sub-collections...",
-	"loading.sub-collections": "Cargando subcolecciones...",
+  // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
+  "item.edit.withdraw.description": "¿Está seguro de que este ítem debe retirarse del archivo?",
 
-	// "loading.sub-communities": "Loading sub-communities...",
-	"loading.sub-communities": "Cargando subcomunidades...",
+  // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
+  "item.edit.withdraw.error": "Ocurrió un error al retirar el ítem",
 
-	// "loading.top-level-communities": "Loading top-level communities...",
-	"loading.top-level-communities": "Cargando comunidades de nivel superior...",
+  // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
+  "item.edit.withdraw.header": "Retirar ítem: {{ id }}",
 
+  // "item.edit.withdraw.success": "The item was withdrawn successfully",
+  "item.edit.withdraw.success": "El ítem se retiró con éxito",
 
+  // "item.orcid.return": "Back",
+  "item.orcid.return": "Atrás",
 
-	// "login.form.email": "Email address",
-	"login.form.email": "Correo electrónico",
 
-	// "login.form.forgot-password": "Have you forgotten your password?",
-	"login.form.forgot-password": "¿Has olvidado tu contraseña?",
+  // "item.listelement.badge": "Item",
+  "item.listelement.badge": "Ítem",
 
-	// "login.form.header": "Please log in to DSpace",
-	"login.form.header": "Inicie sesión en DSpace",
+  // "item.page.description": "Description",
+  "item.page.description": "Descripción",
 
-	// "login.form.new-user": "New user? Click here to register.",
-	"login.form.new-user": "¿Nuevo Usuario? Registrarse",
+  // "item.page.journal-issn": "Journal ISSN",
+  "item.page.journal-issn": "ISSN de la revista",
 
-	// "login.form.or-divider": "or",
-	"login.form.or-divider": "o",
+  // "item.page.journal-title": "Journal Title",
+  "item.page.journal-title": "Título de la revista",
 
-	// "login.form.password": "Password",
-	"login.form.password": "Contraseña",
+  // "item.page.publisher": "Publisher",
+  "item.page.publisher": "Editor",
 
-	// "login.form.shibboleth": "Log in with Shibboleth",
-	"login.form.shibboleth": "Iniciar sesión con Shibboleth",
+  // "item.page.titleprefix": "Item: ",
+  "item.page.titleprefix": "Ítem:",
 
-	// "login.form.submit": "Log in",
-	"login.form.submit": "Iniciar sesión",
+  // "item.page.volume-title": "Volume Title",
+  "item.page.volume-title": "Título del volumen",
 
-	// "login.title": "Login",
-	"login.title": "Acceso",
+  // "item.search.results.head": "Item Search Results",
+  "item.search.results.head": "Resultados de la búsqueda de ítems",
 
-	// "login.breadcrumbs": "Login",
-	"login.breadcrumbs": "Acceso",
+  // "item.search.title": "Item Search",
+  "item.search.title": "Búsqueda de ítems",
 
+  // "item.truncatable-part.show-more": "Show more",
+  "item.truncatable-part.show-more": "Mas..",
 
+  // "item.truncatable-part.show-less": "Collapse",
+  "item.truncatable-part.show-less": "Contraer",
 
-	// "logout.form.header": "Log out from DSpace",
-	"logout.form.header": "Cerrar sesión en DSpace",
 
-	// "logout.form.submit": "Log out",
-	"logout.form.submit": "Cerrar sesión",
 
-	// "logout.title": "Logout",
-	"logout.title": "Cerrar sesión",
+  // "item.page.abstract": "Abstract",
+  "item.page.abstract": "Resumen",
 
+  // "item.page.author": "Authors",
+  "item.page.author": "Autores",
 
+  // "item.page.citation": "Citation",
+  "item.page.citation": "Citación",
 
-	// "menu.header.admin": "Management",
-	"menu.header.admin": "Gestión",
+  // "item.page.collections": "Collections",
+  "item.page.collections": "Colecciones",
 
-	// "menu.header.image.logo": "Repository logo",
-	"menu.header.image.logo": "Logotipo del repositorio",
+  // "item.page.collections.loading": "Loading...",
+  "item.page.collections.loading": "Cargando...",
 
-	// "menu.header.admin.description": "Management menu",
-	"menu.header.admin.description": "Menú de gestión",
+  // "item.page.collections.load-more": "Load more",
+  "item.page.collections.load-more": "Cargar más",
 
+  // "item.page.date": "Date",
+  "item.page.date": "Fecha",
 
+  // "item.page.edit": "Edit this item",
+  "item.page.edit": "Editar este ítem",
 
-	// "menu.section.access_control": "Access Control",
-	"menu.section.access_control": "Control de acceso",
+  // "item.page.files": "Files",
+  "item.page.files": "Archivos",
 
-	// "menu.section.access_control_authorizations": "Authorizations",
-	"menu.section.access_control_authorizations": "Autorizaciones",
+  // "item.page.filesection.description": "Description:",
+  "item.page.filesection.description": "Descripción:",
 
-	// "menu.section.access_control_groups": "Groups",
-	"menu.section.access_control_groups": "Grupos",
+  // "item.page.filesection.download": "Download",
+  "item.page.filesection.download": "Descargar",
 
-	// "menu.section.access_control_people": "People",
-	"menu.section.access_control_people": "Gente",
+  // "item.page.filesection.format": "Format:",
+  "item.page.filesection.format": "Formato:",
 
+  // "item.page.filesection.name": "Name:",
+  "item.page.filesection.name": "Nombre:",
 
+  // "item.page.filesection.size": "Size:",
+  "item.page.filesection.size": "Tamaño:",
 
-	// "menu.section.admin_search": "Admin Search",
-	"menu.section.admin_search": "Búsqueda de administrador",
+  // "item.page.journal.search.title": "Articles in this journal",
+  "item.page.journal.search.title": "Ítems de esta revista",
 
+  // "item.page.link.full": "Full item page",
+  "item.page.link.full": "Página completa del ítem",
 
+  // "item.page.link.simple": "Simple item page",
+  "item.page.link.simple": "Vista sencilla de ítem",
 
-	// "menu.section.browse_community": "This Community",
-	"menu.section.browse_community": "Esta comunidad",
+  // "item.page.orcid.title": "ORCID",
+  "item.page.orcid.title": "ORCID",
 
-	// "menu.section.browse_community_by_author": "By Author",
-	"menu.section.browse_community_by_author": "Por autor",
+  // "item.page.orcid.tooltip": "Open ORCID setting page",
+  "item.page.orcid.tooltip": "Abrir la página de ajustes de ORCID",
 
-	// "menu.section.browse_community_by_issue_date": "By Issue Date",
-	"menu.section.browse_community_by_issue_date": "Por fecha de emisión",
+  // "item.page.person.search.title": "Articles by this author",
+  "item.page.person.search.title": "Ítems de este autor",
 
-	// "menu.section.browse_community_by_title": "By Title",
-	"menu.section.browse_community_by_title": "Por titulo",
+  // "item.page.related-items.view-more": "Show {{ amount }} more",
+  "item.page.related-items.view-more": "Mostrar {{ amount }} más",
 
-	// "menu.section.browse_global": "All of DSpace",
-	"menu.section.browse_global": "Todo DSpace",
+  // "item.page.related-items.view-less": "Hide last {{ amount }}",
+  "item.page.related-items.view-less": "Ocultar loa últimos {{ amount }}",
 
-	// "menu.section.browse_global_by_author": "By Author",
-	"menu.section.browse_global_by_author": "Por autor",
+  // "item.page.relationships.isAuthorOfPublication": "Publications",
+  "item.page.relationships.isAuthorOfPublication": "Publicaciones",
 
-	// "menu.section.browse_global_by_dateissued": "By Issue Date",
-	"menu.section.browse_global_by_dateissued": "Por fecha de emisión",
+  // "item.page.relationships.isJournalOfPublication": "Publications",
+  "item.page.relationships.isJournalOfPublication": "Publicaciones",
 
-	// "menu.section.browse_global_by_subject": "By Subject",
-	"menu.section.browse_global_by_subject": "Por tema",
+  // "item.page.relationships.isOrgUnitOfPerson": "Authors",
+  "item.page.relationships.isOrgUnitOfPerson": "Autores",
 
-	// "menu.section.browse_global_by_title": "By Title",
-	"menu.section.browse_global_by_title": "Por titulo",
+  // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
+  "item.page.relationships.isOrgUnitOfProject": "Proyectos de investigación",
 
-	// "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-	"menu.section.browse_global_communities_and_collections": "Comunidades",
+  // "item.page.subject": "Keywords",
+  "item.page.subject": "Palabras clave",
 
+  // "item.page.uri": "URI",
+  "item.page.uri": "URI",
 
+  // "item.page.bitstreams.view-more": "Show more",
+  "item.page.bitstreams.view-more": "Mostrar más",
 
-	// "menu.section.control_panel": "Control Panel",
-	"menu.section.control_panel": "Panel de control",
+  // "item.page.bitstreams.collapse": "Collapse",
+  "item.page.bitstreams.collapse": "Contraer",
 
-	// "menu.section.curation_task": "Curation Task",
-	"menu.section.curation_task": "Tarea de conservación",
+  // "item.page.filesection.original.bundle" : "Original bundle",
+  "item.page.filesection.original.bundle": "Bloque original",
 
+  // "item.page.filesection.license.bundle" : "License bundle",
+  "item.page.filesection.license.bundle": "Bloque de licencias",
 
+  // "item.page.return": "Back",
+  "item.page.return": "Atrás",
 
-	// "menu.section.edit": "Edit",
-	"menu.section.edit": "Editar",
+  // "item.page.version.create": "Create new version",
+  "item.page.version.create": "Crear una nueva version",
 
-	// "menu.section.edit_collection": "Collection",
-	"menu.section.edit_collection": "Colección",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.page.version.hasDraft": "No se puede crear una nueva versión porque en el historial de versiones hay un envío en curso",
 
-	// "menu.section.edit_community": "Community",
-	"menu.section.edit_community": "Comunidad",
+  // "item.page.claim.button": "Claim",
+  "item.page.claim.button": "Reclamar",
 
-	// "menu.section.edit_item": "Item",
-	"menu.section.edit_item": "Artículo",
+  // "item.page.claim.tooltip": "Claim this item as profile",
+  "item.page.claim.tooltip": "Reclame este item como perfil",
 
+  // "item.preview.dc.identifier.uri": "Identifier:",
+  "item.preview.dc.identifier.uri": "Identificador:",
 
+  // "item.preview.dc.contributor.author": "Authors:",
+  "item.preview.dc.contributor.author": "Autores:",
 
-	// "menu.section.export": "Export",
-	"menu.section.export": "Exportar",
+  // "item.preview.dc.date.issued": "Published date:",
+  "item.preview.dc.date.issued": "Fecha de Publicación:",
 
-	// "menu.section.export_collection": "Collection",
-	"menu.section.export_collection": "Colección",
+  // "item.preview.dc.description.abstract": "Abstract:",
+  "item.preview.dc.description.abstract": "Resumen:",
 
-	// "menu.section.export_community": "Community",
-	"menu.section.export_community": "Comunidad",
+  // "item.preview.dc.identifier.other": "Other identifier:",
+  "item.preview.dc.identifier.other": "Otro identificador:",
 
-	// "menu.section.export_item": "Item",
-	"menu.section.export_item": "Artículo",
+  // "item.preview.dc.language.iso": "Language:",
+  "item.preview.dc.language.iso": "Idioma:",
 
-	// "menu.section.export_metadata": "Metadata",
-	"menu.section.export_metadata": "Metadatos",
+  // "item.preview.dc.subject": "Subjects:",
+  "item.preview.dc.subject": "Materias:",
 
+  // "item.preview.dc.title": "Title:",
+  "item.preview.dc.title": "Título:",
 
+  // "item.preview.dc.type": "Type:",
+  "item.preview.dc.type": "Tipo:",
 
-	// "menu.section.icon.access_control": "Access Control menu section",
-	"menu.section.icon.access_control": "Sección del menú de control de acceso",
+  // "item.preview.oaire.citation.issue" : "Issue",
+  "item.preview.oaire.citation.issue" : "Número",
 
-	// "menu.section.icon.admin_search": "Admin search menu section",
-	"menu.section.icon.admin_search": "Sección del menú de búsqueda de administrador",
+  // "item.preview.oaire.citation.volume" : "Volume",
+  "item.preview.oaire.citation.volume" : "Volumen",
 
-	// "menu.section.icon.control_panel": "Control Panel menu section",
-	"menu.section.icon.control_panel": "Sección del menú del panel de control",
+  // "item.preview.dc.relation.issn" : "ISSN",
+  "item.preview.dc.relation.issn" : "ISSN",
 
-	// "menu.section.icon.curation_task": "Curation Task menu section",
-	"menu.section.icon.curation_task": "Sección del menú de tareas de conservación",
+  // "item.preview.dc.identifier.isbn" : "ISBN",
+  "item.preview.dc.identifier.isbn" : "ISBN",
 
-	// "menu.section.icon.edit": "Edit menu section",
-	"menu.section.icon.edit": "Editar sección del menú",
+  // "item.preview.dc.identifier": "Identifier:",
+  "item.preview.dc.identifier": "Identificador:",
 
-	// "menu.section.icon.export": "Export menu section",
-	"menu.section.icon.export": "Exportar sección de menú",
+  // "item.preview.dc.relation.ispartof" : "Journal or Serie",
+  "item.preview.dc.relation.ispartof" : "Revista o Serie",
 
-	// "menu.section.icon.find": "Find menu section",
-	"menu.section.icon.find": "Buscar sección de menú",
+  // "item.preview.dc.identifier.doi" : "DOI",
+  "item.preview.dc.identifier.doi" : "DOI",
 
-	// "menu.section.icon.import": "Import menu section",
-	"menu.section.icon.import": "Importar sección de menú",
+  // "item.preview.person.familyName": "Surname:",
+  "item.preview.person.familyName": "Apellido:",
 
-	// "menu.section.icon.new": "New menu section",
-	"menu.section.icon.new": "Nueva sección de menú",
+  // "item.preview.person.givenName": "Name:",
+  "item.preview.person.givenName": "Nombre:",
 
-	// "menu.section.icon.pin": "Pin sidebar",
-	"menu.section.icon.pin": "Anclar barra lateral",
+  // "item.preview.person.identifier.orcid": "ORCID:",
+  "item.preview.person.identifier.orcid": "ORCID:",
 
-	// "menu.section.icon.processes": "Processes menu section",
-	"menu.section.icon.processes": "Sección del menú de procesos",
+  // "item.preview.project.funder.name": "Funder:",
+  "item.preview.project.funder.name": "Financiador:",
 
-	// "menu.section.icon.registries": "Registries menu section",
-	"menu.section.icon.registries": "Sección de menú de registros",
+  // "item.preview.project.funder.identifier": "Funder Identifier:",
+  "item.preview.project.funder.identifier": "Identificador del financiador:",
 
-	// "menu.section.icon.statistics_task": "Statistics Task menu section",
-	"menu.section.icon.statistics_task": "Sección del menú Tarea de estadísticas",
+  // "item.preview.oaire.awardNumber": "Funding ID:",
+  "item.preview.oaire.awardNumber": "ID de financiación:",
 
-	// "menu.section.icon.unpin": "Unpin sidebar",
-	"menu.section.icon.unpin": "Desanclar la barra lateral",
+  // "item.preview.dc.title.alternative": "Acronym:",
+  "item.preview.dc.title.alternative": "Acrónimo:",
 
+  // "item.preview.dc.coverage.spatial": "Jurisdiction:",
+  "item.preview.dc.coverage.spatial": "Jurisdicción:",
 
+  // "item.preview.oaire.fundingStream": "Funding Stream:",
+  "item.preview.oaire.fundingStream": "Línea de financiación:",
 
-	// "menu.section.import": "Import",
-	"menu.section.import": "Importar",
 
-	// "menu.section.import_batch": "Batch Import (ZIP)",
-	"menu.section.import_batch": "Importación por lotes (ZIP)",
 
-	// "menu.section.import_metadata": "Metadata",
-	"menu.section.import_metadata": "Metadatos",
+  // "item.select.confirm": "Confirm selected",
+  "item.select.confirm": "Confirmar seleccionado",
 
+  // "item.select.empty": "No items to show",
+  "item.select.empty": "No hay artículos para mostrar",
 
+  // "item.select.table.author": "Author",
+  "item.select.table.author": "Autor",
 
-	// "menu.section.new": "New",
-	"menu.section.new": "Nuevo",
+  // "item.select.table.collection": "Collection",
+  "item.select.table.collection": "Colección",
 
-	// "menu.section.new_collection": "Collection",
-	"menu.section.new_collection": "Colección",
+  // "item.select.table.title": "Title",
+  "item.select.table.title": "Título",
 
-	// "menu.section.new_community": "Community",
-	"menu.section.new_community": "Comunidad",
 
-	// "menu.section.new_item": "Item",
-	"menu.section.new_item": "Artículo",
+  // "item.version.history.empty": "There are no other versions for this item yet.",
+  "item.version.history.empty": "Aún no hay otras versiones para este artículo.",
 
-	// "menu.section.new_item_version": "Item Version",
-	"menu.section.new_item_version": "Versión del artículo",
+  // "item.version.history.head": "Version History",
+  "item.version.history.head": "Historial de versiones",
 
-	// "menu.section.new_process": "Process",
-	"menu.section.new_process": "Proceso",
+  // "item.version.history.return": "Back",
+  "item.version.history.return": "Atrás",
 
+  // "item.version.history.selected": "Selected version",
+  "item.version.history.selected": "Versión seleccionada",
 
+  // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
+  "item.version.history.selected.alert": "Esta viendo la versión {{version}} del ítem.",
 
-	// "menu.section.pin": "Pin sidebar",
-	"menu.section.pin": "Anclar barra lateral",
+  // "item.version.history.table.version": "Version",
+  "item.version.history.table.version": "Versión",
 
-	// "menu.section.unpin": "Unpin sidebar",
-	"menu.section.unpin": "Desanclar la barra lateral",
+  // "item.version.history.table.item": "Item",
+  "item.version.history.table.item": "Artículo",
 
+  // "item.version.history.table.editor": "Editor",
+  "item.version.history.table.editor": "Editor",
 
+  // "item.version.history.table.date": "Date",
+  "item.version.history.table.date": "Fecha",
 
-	// "menu.section.processes": "Processes",
-	"menu.section.processes": "Procesos",
+  // "item.version.history.table.summary": "Summary",
+  "item.version.history.table.summary": "Resumen",
 
+  // "item.version.history.table.workspaceItem": "Workspace item",
+  "item.version.history.table.workspaceItem": "Ítem del espacio de trabajo",
 
+  // "item.version.history.table.workflowItem": "Workflow item",
+  "item.version.history.table.workflowItem": "Ítem del flujo de trabajo",
 
-	// "menu.section.registries": "Registries",
-	"menu.section.registries": "Registros",
+  // "item.version.history.table.actions": "Action",
+  "item.version.history.table.actions": "Acción",
 
-	// "menu.section.registries_format": "Format",
-	"menu.section.registries_format": "Formato",
+  // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
+  "item.version.history.table.action.editWorkspaceItem": "Editar ítem del espacio de trabajo",
 
-	// "menu.section.registries_metadata": "Metadata",
-	"menu.section.registries_metadata": "Metadatos",
+  // "item.version.history.table.action.editSummary": "Edit summary",
+  "item.version.history.table.action.editSummary": "Editar resumen",
 
+  // "item.version.history.table.action.saveSummary": "Save summary edits",
+  "item.version.history.table.action.saveSummary": "Salvar resumen",
 
+  // "item.version.history.table.action.discardSummary": "Discard summary edits",
+  "item.version.history.table.action.discardSummary": "Desechar cambios del resumen",
 
-	// "menu.section.statistics": "Statistics",
-	"menu.section.statistics": "Estadísticas",
+  // "item.version.history.table.action.newVersion": "Create new version from this one",
+  "item.version.history.table.action.newVersion": "Crear nueva versión a partir de ésta",
 
-	// "menu.section.statistics_task": "Statistics Task",
-	"menu.section.statistics_task": "Tarea de estadísticas",
+  // "item.version.history.table.action.deleteVersion": "Delete version",
+  "item.version.history.table.action.deleteVersion": "Borrar versión",
 
+  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.version.history.table.action.hasDraft": "No es posible crear una nueva versión puesto que existe en el historial de versiones un envío pendiente",
 
 
-	// "menu.section.toggle.access_control": "Toggle Access Control section",
-	"menu.section.toggle.access_control": "Alternar sección de control de acceso",
+  // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
+  "item.version.notice": "Esta no es la última versión de este artículo. La última versión se puede encontrar <a href='{{ destination }}'> aquí </a>.",
 
-	// "menu.section.toggle.control_panel": "Toggle Control Panel section",
-	"menu.section.toggle.control_panel": "Alternar la sección del Panel de control",
 
-	// "menu.section.toggle.curation_task": "Toggle Curation Task section",
-	"menu.section.toggle.curation_task": "Alternar la sección Tarea de conservación",
+  // "item.version.create.modal.header": "New version",
+  "item.version.create.modal.header": "Nueva versión",
 
-	// "menu.section.toggle.edit": "Toggle Edit section",
-	"menu.section.toggle.edit": "Alternar sección de edición",
+  // "item.version.create.modal.text": "Create a new version for this item",
+  "item.version.create.modal.text": "Crear una nueva versión de este ítem",
 
-	// "menu.section.toggle.export": "Toggle Export section",
-	"menu.section.toggle.export": "Alternar sección de exportación",
+  // "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
+  "item.version.create.modal.text.startingFrom": "comenzando desde versión {{version}}",
 
-	// "menu.section.toggle.find": "Toggle Find section",
-	"menu.section.toggle.find": "Alternar sección de búsqueda",
+  // "item.version.create.modal.button.confirm": "Create",
+  "item.version.create.modal.button.confirm": "Crear",
 
-	// "menu.section.toggle.import": "Toggle Import section",
-	"menu.section.toggle.import": "Alternar sección de importación",
+  // "item.version.create.modal.button.confirm.tooltip": "Create new version",
+  "item.version.create.modal.button.confirm.tooltip": "Crear  nueva versión",
 
-	// "menu.section.toggle.new": "Toggle New section",
-	"menu.section.toggle.new": "Alternar nueva sección",
+  // "item.version.create.modal.button.cancel": "Cancel",
+  "item.version.create.modal.button.cancel": "Cancelar",
 
-	// "menu.section.toggle.registries": "Toggle Registries section",
-	"menu.section.toggle.registries": "Alternar la sección Registros",
+  // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
+  "item.version.create.modal.button.cancel.tooltip": "No crear una nueva versión",
 
-	// "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
-	"menu.section.toggle.statistics_task": "Alternar la sección Tarea de estadísticas",
+  // "item.version.create.modal.form.summary.label": "Summary",
+  "item.version.create.modal.form.summary.label": "Resumen",
 
+  // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+  "item.version.create.modal.form.summary.placeholder": "Introduzca el resumen de esta nueva versión",
 
-	// "menu.section.workflow": "Administer Workflow",
-	"menu.section.workflow": "Administrar flujo de trabajo",
+  // "item.version.create.modal.submitted.header": "Creating new version...",
+  "item.version.create.modal.submitted.header": "Creando nueva versión...",
 
+  // "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.",
+  "item.version.create.modal.submitted.text": "Se está creando la nueva versión. SI el ítem tiene muchas relaciones, este proceso podría tardar.",
 
-	// "mydspace.breadcrumbs": "MyDSpace",
-	"mydspace.breadcrumbs": "Mi DSpace",
+  // "item.version.create.notification.success" : "New version has been created with version number {{version}}",
+  "item.version.create.notification.success" : "Se ha creado una nueva versión con número {{version}}",
 
-	// "mydspace.description": "",
-	"mydspace.description": "",
+  // "item.version.create.notification.failure" : "New version has not been created",
+  "item.version.create.notification.failure" : "No se ha creado una nueva versión",
 
-	// "mydspace.general.text-here": "here",
-	"mydspace.general.text-here": "aquí",
+  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.version.create.notification.inProgress" : "No es posible crear una nueva versión puesto que existe en el historial de versiones un envío pendiente",
 
-	// "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
-	"mydspace.messages.controller-help": "Seleccione esta opción para enviar un mensaje al remitente del artículo.",
 
-	// "mydspace.messages.description-placeholder": "Insert your message here...",
-	"mydspace.messages.description-placeholder": "Inserta tu mensaje aquí...",
+  // "item.version.delete.modal.header": "Delete version",
+  "item.version.delete.modal.header": "Borrar versión",
 
-	// "mydspace.messages.hide-msg": "Hide message",
-	"mydspace.messages.hide-msg": "Ocultar mensaje",
+  // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
+  "item.version.delete.modal.text": "Quierr borrar la versión {{version}}?",
 
-	// "mydspace.messages.mark-as-read": "Mark as read",
-	"mydspace.messages.mark-as-read": "Marcar como leído",
+  // "item.version.delete.modal.button.confirm": "Delete",
+  "item.version.delete.modal.button.confirm": "Borrar",
 
-	// "mydspace.messages.mark-as-unread": "Mark as unread",
-	"mydspace.messages.mark-as-unread": "marcar como no leído",
+  // "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
+  "item.version.delete.modal.button.confirm.tooltip": "Borrar esta versión",
 
-	// "mydspace.messages.no-content": "No content.",
-	"mydspace.messages.no-content": "Sin contenido.",
+  // "item.version.delete.modal.button.cancel": "Cancel",
+  "item.version.delete.modal.button.cancel": "Cancelar",
 
-	// "mydspace.messages.no-messages": "No messages yet.",
-	"mydspace.messages.no-messages": "Aún no hay mensajes.",
+  // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
+  "item.version.delete.modal.button.cancel.tooltip": "No borrar esta versión",
 
-	// "mydspace.messages.send-btn": "Send",
-	"mydspace.messages.send-btn": "Enviar",
+  // "item.version.delete.notification.success" : "Version number {{version}} has been deleted",
+  "item.version.delete.notification.success" : "Se ha borrado la versión número{{version}}",
 
-	// "mydspace.messages.show-msg": "Show message",
-	"mydspace.messages.show-msg": "Mostrar mensaje",
+  // "item.version.delete.notification.failure" : "Version number {{version}} has not been deleted",
+  "item.version.delete.notification.failure" : "No se ha borrado la versión número{{version}}",
 
-	// "mydspace.messages.subject-placeholder": "Subject...",
-	"mydspace.messages.subject-placeholder": "Tema...",
 
-	// "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
-	"mydspace.messages.submitter-help": "Seleccione esta opción para enviar un mensaje al controlador.",
+  // "item.version.edit.notification.success" : "The summary of version number {{version}} has been changed",
+  "item.version.edit.notification.success" : "Ha cambiado el resumen de la versión número {{version}}",
 
-	// "mydspace.messages.title": "Messages",
-	"mydspace.messages.title": "Mensajes",
+  // "item.version.edit.notification.failure" : "The summary of version number {{version}} has not been changed",
+  "item.version.edit.notification.failure" : "No ha cambiado el resumen de la versión número {{version}}",
 
-	// "mydspace.messages.to": "To",
-	"mydspace.messages.to": "Para",
 
-	// "mydspace.new-submission": "New submission",
-	"mydspace.new-submission": "Nuevo envío",
+  // "journal.listelement.badge": "Journal",
+  "journal.listelement.badge": "Revista",
 
-	// "mydspace.new-submission-external": "Import metadata from external source",
-	"mydspace.new-submission-external": "Importar metadatos de una fuente externa",
+  // "journal.page.description": "Description",
+  "journal.page.description": "Descripción",
 
-	// "mydspace.new-submission-external-short": "Import metadata",
-	"mydspace.new-submission-external-short": "Importar metadatos",
+  // "journal.page.edit": "Edit this item",
+  "journal.page.edit": "Editar este ítem",
 
-	// "mydspace.results.head": "Your submissions",
-	"mydspace.results.head": "Tus presentaciones",
+  // "journal.page.editor": "Editor-in-Chief",
+  "journal.page.editor": "Editor jefe",
 
-	// "mydspace.results.no-abstract": "No Abstract",
-	"mydspace.results.no-abstract": "Sin resumen",
+  // "journal.page.issn": "ISSN",
+  "journal.page.issn": "ISSN",
 
-	// "mydspace.results.no-authors": "No Authors",
-	"mydspace.results.no-authors": "Sin autores",
+  // "journal.page.publisher": "Publisher",
+  "journal.page.publisher": "Editor",
 
-	// "mydspace.results.no-collections": "No Collections",
-	"mydspace.results.no-collections": "No hay colecciones",
+  // "journal.page.titleprefix": "Journal: ",
+  "journal.page.titleprefix": "Revista:",
 
-	// "mydspace.results.no-date": "No Date",
-	"mydspace.results.no-date": "Sin fecha",
+  // "journal.search.results.head": "Journal Search Results",
+  "journal.search.results.head": "Resultados de la búsqueda de revistas",
 
-	// "mydspace.results.no-files": "No Files",
-	"mydspace.results.no-files": "Sin archivos",
+  // "journal-relationships.search.results.head": "Journal Search Results",
+  "journal-relationships.search.results.head": "Resultados de la búsqueda de revistas",
 
-	// "mydspace.results.no-results": "There were no items to show",
-	"mydspace.results.no-results": "No había artículos para mostrar",
+  // "journal.search.title": "Journal Search",
+  "journal.search.title": "Búsqueda de revistas",
 
-	// "mydspace.results.no-title": "No title",
-	"mydspace.results.no-title": "Sin título",
 
-	// "mydspace.results.no-uri": "No Uri",
-	"mydspace.results.no-uri": "No Uri",
 
-	// "mydspace.search-form.placeholder": "Search in mydspace...",
-	"mydspace.search-form.placeholder": "Buscar en Mi DSpace...",
+  // "journalissue.listelement.badge": "Journal Issue",
+  "journalissue.listelement.badge": "Número de la revista",
 
-	// "mydspace.show.workflow": "All tasks",
-	"mydspace.show.workflow": "Todas las tareas",
+  // "journalissue.page.description": "Description",
+  "journalissue.page.description": "Descripción",
 
-	// "mydspace.show.workspace": "Your Submissions",
-	"mydspace.show.workspace": "Tus envíos",
+  // "journalissue.page.edit": "Edit this item",
+  "journalissue.page.edit": "Editar este ítema",
 
-	// "mydspace.status.archived": "Archived",
-	"mydspace.status.archived": "Archivado",
+  // "journalissue.page.issuedate": "Issue Date",
+  "journalissue.page.issuedate": "Fecha de publicación",
 
-	// "mydspace.status.validation": "Validation",
-	"mydspace.status.validation": "Validación",
+  // "journalissue.page.journal-issn": "Journal ISSN",
+  "journalissue.page.journal-issn": "ISSN de la revista",
 
-	// "mydspace.status.waiting-for-controller": "Waiting for controller",
-	"mydspace.status.waiting-for-controller": "Esperando controlador",
+  // "journalissue.page.journal-title": "Journal Title",
+  "journalissue.page.journal-title": "Título de la revista",
 
-	// "mydspace.status.workflow": "Workflow",
-	"mydspace.status.workflow": "Flujo de trabajo",
+  // "journalissue.page.keyword": "Keywords",
+  "journalissue.page.keyword": "Palabras clave",
 
-	// "mydspace.status.workspace": "Workspace",
-	"mydspace.status.workspace": "Espacio de trabajo",
+  // "journalissue.page.number": "Number",
+  "journalissue.page.number": "Número",
 
-	// "mydspace.title": "MyDSpace",
-	"mydspace.title": "Mi DSpace",
+  // "journalissue.page.titleprefix": "Journal Issue: ",
+  "journalissue.page.titleprefix": "Número de la revista:",
 
-	// "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
-	"mydspace.upload.upload-failed": "Error al crear un nuevo espacio de trabajo. Verifique el contenido cargado antes de volver a intentarlo.",
 
-	// "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
-	"mydspace.upload.upload-failed-manyentries": "Archivo no procesable. Se detectaron demasiadas entradas, pero solo se permitió una para el archivo.",
 
-	// "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
-	"mydspace.upload.upload-failed-moreonefile": "Solicitud no procesable. Solo se permite un archivo.",
+  // "journalvolume.listelement.badge": "Journal Volume",
+  "journalvolume.listelement.badge": "Volumen de la revista",
 
-	// "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
-	"mydspace.upload.upload-multiple-successful": "Se crearon {{ qty }} nuevos artículos del espacio de trabajo.",
+  // "journalvolume.page.description": "Description",
+  "journalvolume.page.description": "Descripción",
 
-	// "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
-	"mydspace.upload.upload-successful": "Se creó un nuevo artículo de espacio de trabajo. Haga clic en {{ here }} para editarlo.",
+  // "journalvolume.page.edit": "Edit this item",
+  "journalvolume.page.edit": "Editar este ítem",
 
-	// "mydspace.view-btn": "View",
-	"mydspace.view-btn": "Vista",
+  // "journalvolume.page.issuedate": "Issue Date",
+  "journalvolume.page.issuedate": "Fecha de publicación",
 
+  // "journalvolume.page.titleprefix": "Journal Volume: ",
+  "journalvolume.page.titleprefix": "Volumen de la revista:",
 
+  // "journalvolume.page.volume": "Volume",
+  "journalvolume.page.volume": "Volumen",
 
-	// "nav.browse.header": "All of DSpace",
-	"nav.browse.header": "Todo DSpace",
 
-	// "nav.community-browse.header": "By Community",
-	"nav.community-browse.header": "Por comunidad",
+  // "iiifsearchable.listelement.badge": "Document Media",
+  "iiifsearchable.listelement.badge": "Soporte (media) del documento",
 
-	// "nav.language": "Language switch",
-	"nav.language": "Cambio de idioma",
+  // "iiifsearchable.page.titleprefix": "Document: ",
+  "iiifsearchable.page.titleprefix": "Documento: ",
 
-	// "nav.login": "Log In",
-	"nav.login": "Iniciar sesión",
+  // "iiifsearchable.page.doi": "Permanent Link: ",
+  "iiifsearchable.page.doi": "Enlace permanente: ",
 
-	// "nav.logout": "User profile menu and Log Out",
-	"nav.logout": "Menú de perfil de usuario y cierre de sesión",
+  // "iiifsearchable.page.issue": "Issue: ",
+  "iiifsearchable.page.issue": "Número: ",
 
-	// "nav.main.description": "Main navigation bar",
-	"nav.main.description": "Barra de navegación principal",
+  // "iiifsearchable.page.description": "Description: ",
+  "iiifsearchable.page.description": "Descripción: ",
 
-	// "nav.mydspace": "MyDSpace",
-	"nav.mydspace": "Mi DSpace",
+  // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
+  "iiifviewer.fullscreen.notice": "Para una mejor visualización, use el modo pantalla completa.",
 
-	// "nav.profile": "Profile",
-	"nav.profile": "Perfil",
+  // "iiif.listelement.badge": "Image Media",
+  "iiif.listelement.badge": "Image Media",
 
-	// "nav.search": "Search",
-	"nav.search": "Buscar",
+  // "iiif.page.titleprefix": "Image: ",
+  "iiif.page.titleprefix": "Imagen: ",
 
-	// "nav.statistics.header": "Statistics",
-	"nav.statistics.header": "Estadísticas",
+  // "iiif.page.doi": "Permanent Link: ",
+  "iiif.page.doi": "Enlace permanente: ",
 
-	// "nav.stop-impersonating": "Stop impersonating EPerson",
-	"nav.stop-impersonating": "Deja de hacerse pasar por EPerson",
+  // "iiif.page.issue": "Issue: ",
+  "iiif.page.issue": "Número: ",
 
-	// "nav.toggle" : "Toggle navigation",
-	"nav.toggle": "Alternar navegación",
+  // "iiif.page.description": "Description: ",
+  "iiif.page.description": "Descripción: ",
 
-	// "nav.user.description" : "User profile bar",
-	"nav.user.description": "Barra de perfil de usuario",
 
+  // "loading.bitstream": "Loading bitstream...",
+  "loading.bitstream": "Cargando archivo...",
 
+  // "loading.bitstreams": "Loading bitstreams...",
+  "loading.bitstreams": "Cargando archivos...",
 
-	// "orgunit.listelement.badge": "Organizational Unit",
-	"orgunit.listelement.badge": "Unidad organizacional",
+  // "loading.browse-by": "Loading items...",
+  "loading.browse-by": "Cargando artículos...",
 
-	// "orgunit.page.city": "City",
-	"orgunit.page.city": "Ciudad",
+  // "loading.browse-by-page": "Loading page...",
+  "loading.browse-by-page": "Cargando página...",
 
-	// "orgunit.page.country": "Country",
-	"orgunit.page.country": "País",
+  // "loading.collection": "Loading collection...",
+  "loading.collection": "Cargando colección...",
 
-	// "orgunit.page.dateestablished": "Date established",
-	"orgunit.page.dateestablished": "Fecha Establecida",
+  // "loading.collections": "Loading collections...",
+  "loading.collections": "Cargando colecciones...",
 
-	// "orgunit.page.description": "Description",
-	"orgunit.page.description": "Descripción",
+  // "loading.content-source": "Loading content source...",
+  "loading.content-source": "Cargando fuente de contenido...",
 
-	// "orgunit.page.edit": "Edit this item",
-	"orgunit.page.edit": "Editar este artículo",
+  // "loading.community": "Loading community...",
+  "loading.community": "Cargando comunidad...",
 
-	// "orgunit.page.id": "ID",
-	"orgunit.page.id": "IDENTIFICACIÓN",
+  // "loading.default": "Loading...",
+  "loading.default": "Cargando...",
 
-	// "orgunit.page.titleprefix": "Organizational Unit: ",
-	"orgunit.page.titleprefix": "Unidad organizacional:",
+  // "loading.item": "Loading item...",
+  "loading.item": "Cargando artículo...",
 
+  // "loading.items": "Loading items...",
+  "loading.items": "Cargando artículos...",
 
+  // "loading.mydspace-results": "Loading items...",
+  "loading.mydspace-results": "Cargando artículos...",
 
-	// "pagination.options.description": "Pagination options",
-	"pagination.options.description": "Opciones de paginación",
+  // "loading.objects": "Loading...",
+  "loading.objects": "Cargando...",
 
-	// "pagination.results-per-page": "Results Per Page",
-	"pagination.results-per-page": "Resultados por página",
+  // "loading.recent-submissions": "Loading recent submissions...",
+  "loading.recent-submissions": "Cargando envíos recientes...",
 
-	// "pagination.showing.detail": "{{ range }} of {{ total }}",
-	"pagination.showing.detail": "{{ range }} de {{ total }}",
+  // "loading.search-results": "Loading search results...",
+  "loading.search-results": "Cargando resultados de búsqueda...",
 
-	// "pagination.showing.label": "Now showing ",
-	"pagination.showing.label": "Mostrando",
+  // "loading.sub-collections": "Loading sub-collections...",
+  "loading.sub-collections": "Cargando subcolecciones...",
 
-	// "pagination.sort-direction": "Sort Options",
-	"pagination.sort-direction": "Opciones de clasificación",
+  // "loading.sub-communities": "Loading sub-communities...",
+  "loading.sub-communities": "Cargando subcomunidades...",
 
+  // "loading.top-level-communities": "Loading top-level communities...",
+  "loading.top-level-communities": "Cargando comunidades de nivel superior...",
 
 
-	// "person.listelement.badge": "Person",
-	"person.listelement.badge": "Persona",
 
-	// "person.listelement.no-title": "No name found",
-	"person.listelement.no-title": "No se encontró ningún nombre",
+  // "login.form.email": "Email address",
+  "login.form.email": "Correo electrónico",
 
-	// "person.page.birthdate": "Birth Date",
-	"person.page.birthdate": "Fecha de nacimiento",
+  // "login.form.forgot-password": "Have you forgotten your password?",
+  "login.form.forgot-password": "¿Has olvidado tu contraseña?",
 
-	// "person.page.edit": "Edit this item",
-	"person.page.edit": "Editar este artículo",
+  // "login.form.header": "Please log in to DSpace",
+  "login.form.header": "Inicie sesión en DSpace",
 
-	// "person.page.email": "Email Address",
-	"person.page.email": "Dirección de correo electrónico",
+  // "login.form.new-user": "New user? Click here to register.",
+  "login.form.new-user": "¿Nuevo Usuario? Pulse aquí para registrarse",
 
-	// "person.page.firstname": "First Name",
-	"person.page.firstname": "Primer nombre",
+  // "login.form.or-divider": "or",
+  "login.form.or-divider": "o",
 
-	// "person.page.jobtitle": "Job Title",
-	"person.page.jobtitle": "Título profesional",
+  // "login.form.oidc": "Log in with OIDC",
+  "login.form.oidc": "Iniciar sesión con OIDC",
 
-	// "person.page.lastname": "Last Name",
-	"person.page.lastname": "Apellido",
+  // "login.form.orcid": "Log in with ORCID",
+  "login.form.orcid": "Iniciar sesión con ORCID",
 
-	// "person.page.link.full": "Show all metadata",
-	"person.page.link.full": "Mostrar todos los metadatos",
+  // "login.form.password": "Password",
+  "login.form.password": "Contraseña",
 
-	// "person.page.orcid": "ORCID",
-	"person.page.orcid": "ORCID",
+  // "login.form.shibboleth": "Log in with Shibboleth",
+  "login.form.shibboleth": "Iniciar sesión con Shibboleth",
 
-	// "person.page.staffid": "Staff ID",
-	"person.page.staffid": "Identificación del personal",
+  // "login.form.submit": "Log in",
+  "login.form.submit": "Iniciar sesión",
 
-	// "person.page.titleprefix": "Person: ",
-	"person.page.titleprefix": "Persona:",
+  // "login.title": "Login",
+  "login.title": "Acceso",
 
-	// "person.search.results.head": "Person Search Results",
-	"person.search.results.head": "Resultados de búsqueda de personas",
+  // "login.breadcrumbs": "Login",
+  "login.breadcrumbs": "Acceso",
 
-	// "person.search.title": "Person Search",
-	"person.search.title": "Búsqueda de personas",
 
 
+  // "logout.form.header": "Log out from DSpace",
+  "logout.form.header": "Cerrar sesión en DSpace",
 
-	// "process.new.select-parameters": "Parameters",
-	"process.new.select-parameters": "Parámetros",
+  // "logout.form.submit": "Log out",
+  "logout.form.submit": "Cerrar sesión",
 
-	// "process.new.cancel": "Cancel",
-	"process.new.cancel": "Cancelar",
+  // "logout.title": "Logout",
+  "logout.title": "Cerrar sesión",
 
-	// "process.new.submit": "Save",
-	"process.new.submit": "Guardar",
 
-	// "process.new.select-script": "Script",
-	"process.new.select-script": "Texto",
 
-	// "process.new.select-script.placeholder": "Choose a script...",
-	"process.new.select-script.placeholder": "Elija un guión...",
+  // "menu.header.admin": "Management",
+  "menu.header.admin": "Gestión",
 
-	// "process.new.select-script.required": "Script is required",
-	"process.new.select-script.required": "Se requiere script",
+  // "menu.header.image.logo": "Repository logo",
+  "menu.header.image.logo": "Logotipo del repositorio",
 
-	// "process.new.parameter.file.upload-button": "Select file...",
-	"process.new.parameter.file.upload-button": "Seleccione Archivo...",
+  // "menu.header.admin.description": "Management menu",
+  "menu.header.admin.description": "Menú de gestión",
 
-	// "process.new.parameter.file.required": "Please select a file",
-	"process.new.parameter.file.required": "Por favor seleccione un archivo",
 
-	// "process.new.parameter.string.required": "Parameter value is required",
-	"process.new.parameter.string.required": "Se requiere el valor del parámetro",
 
-	// "process.new.parameter.type.value": "value",
-	"process.new.parameter.type.value": "valor",
+  // "menu.section.access_control": "Access Control",
+  "menu.section.access_control": "Control de acceso",
 
-	// "process.new.parameter.type.file": "file",
-	"process.new.parameter.type.file": "expediente",
+  // "menu.section.access_control_authorizations": "Authorizations",
+  "menu.section.access_control_authorizations": "Autorizaciones",
 
-	// "process.new.parameter.required.missing": "The following parameters are required but still missing:",
-	"process.new.parameter.required.missing": "Los siguientes parámetros son obligatorios pero aún faltan:",
+  // "menu.section.access_control_groups": "Groups",
+  "menu.section.access_control_groups": "Grupos",
 
-	// "process.new.notification.success.title": "Success",
-	"process.new.notification.success.title": "Éxito",
+  // "menu.section.access_control_people": "People",
+  "menu.section.access_control_people": "Gente",
 
-	// "process.new.notification.success.content": "The process was successfully created",
-	"process.new.notification.success.content": "El proceso fue creado con éxito",
 
-	// "process.new.notification.error.title": "Error",
-	"process.new.notification.error.title": "Error",
 
-	// "process.new.notification.error.content": "An error occurred while creating this process",
-	"process.new.notification.error.content": "Se produjo un error al crear este proceso.",
+  // "menu.section.admin_search": "Admin Search",
+  "menu.section.admin_search": "Búsqueda de administrador",
 
-	// "process.new.header": "Create a new process",
-	"process.new.header": "Crea un nuevo proceso",
 
-	// "process.new.title": "Create a new process",
-	"process.new.title": "Crea un nuevo proceso",
 
-	// "process.new.breadcrumbs": "Create a new process",
-	"process.new.breadcrumbs": "Crea un nuevo proceso",
+  // "menu.section.browse_community": "This Community",
+  "menu.section.browse_community": "Esta comunidad",
 
+  // "menu.section.browse_community_by_author": "By Author",
+  "menu.section.browse_community_by_author": "Por autor",
 
+  // "menu.section.browse_community_by_issue_date": "By Issue Date",
+  "menu.section.browse_community_by_issue_date": "Por fecha de emisión",
 
-	// "process.detail.arguments" : "Arguments",
-	"process.detail.arguments": "Argumentos",
+  // "menu.section.browse_community_by_title": "By Title",
+  "menu.section.browse_community_by_title": "Por titulo",
 
-	// "process.detail.arguments.empty" : "This process doesn't contain any arguments",
-	"process.detail.arguments.empty": "Este proceso no contiene ningún argumento",
+  // "menu.section.browse_global": "All of DSpace",
+  "menu.section.browse_global": "Todo DSpace",
 
-	// "process.detail.back" : "Back",
-	"process.detail.back": "Volver",
+  // "menu.section.browse_global_by_author": "By Author",
+  "menu.section.browse_global_by_author": "Por autor",
 
-	// "process.detail.output" : "Process Output",
-	"process.detail.output": "Salida del proceso",
+  // "menu.section.browse_global_by_dateissued": "By Issue Date",
+  "menu.section.browse_global_by_dateissued": "Por fecha de emisión",
 
-	// "process.detail.logs.button": "Retrieve process output",
-	"process.detail.logs.button": "Recuperar la salida del proceso",
+  // "menu.section.browse_global_by_subject": "By Subject",
+  "menu.section.browse_global_by_subject": "Por tema",
 
-	// "process.detail.logs.loading": "Retrieving",
-	"process.detail.logs.loading": "Recuperando",
+  // "menu.section.browse_global_by_title": "By Title",
+  "menu.section.browse_global_by_title": "Por titulo",
 
-	// "process.detail.logs.none": "This process has no output",
-	"process.detail.logs.none": "Este proceso no tiene salida",
+  // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
+  "menu.section.browse_global_communities_and_collections": "Comunidades",
 
-	// "process.detail.output-files" : "Output Files",
-	"process.detail.output-files": "Archivos de salida",
 
-	// "process.detail.output-files.empty" : "This process doesn't contain any output files",
-	"process.detail.output-files.empty": "Este proceso no contiene ningún archivo de salida",
 
-	// "process.detail.script" : "Script",
-	"process.detail.script": "Secuencia de comandos",
+  // "menu.section.control_panel": "Control Panel",
+  "menu.section.control_panel": "Panel de control",
 
-	// "process.detail.title" : "Process: {{ id }} - {{ name }}",
-	"process.detail.title": "Proceso: {{ id }} - {{ name }}",
+  // "menu.section.curation_task": "Curation Task",
+  "menu.section.curation_task": "Tarea de conservación",
 
-	// "process.detail.start-time" : "Start time",
-	"process.detail.start-time": "Hora de inicio",
 
-	// "process.detail.end-time" : "Finish time",
-	"process.detail.end-time": "Hora de finalización",
 
-	// "process.detail.status" : "Status",
-	"process.detail.status": "Estado",
+  // "menu.section.edit": "Edit",
+  "menu.section.edit": "Editar",
 
-	// "process.detail.create" : "Create similar process",
-	"process.detail.create": "Crear un proceso similar",
+  // "menu.section.edit_collection": "Collection",
+  "menu.section.edit_collection": "Colección",
 
+  // "menu.section.edit_community": "Community",
+  "menu.section.edit_community": "Comunidad",
 
+  // "menu.section.edit_item": "Item",
+  "menu.section.edit_item": "Artículo",
 
-	// "process.overview.table.finish" : "Finish time",
-	"process.overview.table.finish": "Hora de finalización",
 
-	// "process.overview.table.id" : "Process ID",
-	"process.overview.table.id": "ID de proceso",
 
-	// "process.overview.table.name" : "Name",
-	"process.overview.table.name": "Nombre",
+  // "menu.section.export": "Export",
+  "menu.section.export": "Exportar",
 
-	// "process.overview.table.start" : "Start time",
-	"process.overview.table.start": "Hora de inicio",
+  // "menu.section.export_collection": "Collection",
+  "menu.section.export_collection": "Colección",
 
-	// "process.overview.table.status" : "Status",
-	"process.overview.table.status": "Estado",
+  // "menu.section.export_community": "Community",
+  "menu.section.export_community": "Comunidad",
 
-	// "process.overview.table.user" : "User",
-	"process.overview.table.user": "Usuario",
+  // "menu.section.export_item": "Item",
+  "menu.section.export_item": "Artículo",
 
-	// "process.overview.title": "Processes Overview",
-	"process.overview.title": "Resumen de procesos",
+  // "menu.section.export_metadata": "Metadata",
+  "menu.section.export_metadata": "Metadatos",
 
-	// "process.overview.breadcrumbs": "Processes Overview",
-	"process.overview.breadcrumbs": "Resumen de procesos",
 
-	// "process.overview.new": "New",
-	"process.overview.new": "Nuevo",
 
+  // "menu.section.icon.access_control": "Access Control menu section",
+  "menu.section.icon.access_control": "Sección del menú de control de acceso",
 
-	// "profile.breadcrumbs": "Update Profile",
-	"profile.breadcrumbs": "Actualización del perfil",
+  // "menu.section.icon.admin_search": "Admin search menu section",
+  "menu.section.icon.admin_search": "Sección del menú de búsqueda de administrador",
 
-	// "profile.card.identify": "Identify",
-	"profile.card.identify": "Identificar",
+  // "menu.section.icon.control_panel": "Control Panel menu section",
+  "menu.section.icon.control_panel": "Sección del menú del Panel de control",
 
-	// "profile.card.security": "Security",
-	"profile.card.security": "Seguridad",
+  // "menu.section.icon.curation_tasks": "Curation Task menu section",
+  "menu.section.icon.curation_tasks": "Sección del menú de Tareas de curación",
 
-	// "profile.form.submit": "Save",
-	"profile.form.submit": "Guardar",
+  // "menu.section.icon.edit": "Edit menu section",
+  "menu.section.icon.edit": "Editar sección del menú",
 
-	// "profile.groups.head": "Authorization groups you belong to",
-	"profile.groups.head": "Grupos de autorización a los que pertenece",
+  // "menu.section.icon.export": "Export menu section",
+  "menu.section.icon.export": "Exportar sección de menú",
 
-	// "profile.head": "Update Profile",
-	"profile.head": "Actualización del perfil",
+  // "menu.section.icon.find": "Find menu section",
+  "menu.section.icon.find": "Buscar sección de menú",
 
-	// "profile.metadata.form.error.firstname.required": "First Name is required",
-	"profile.metadata.form.error.firstname.required": "Se requiere el primer nombre",
+  // "menu.section.icon.health": "Health check menu section",
+  "menu.section.icon.health": "Sección de menú de Chequeos",
 
-	// "profile.metadata.form.error.lastname.required": "Last Name is required",
-	"profile.metadata.form.error.lastname.required": "Se requiere apellido",
+  // "menu.section.icon.import": "Import menu section",
+  "menu.section.icon.import": "Importar sección de menú",
 
-	// "profile.metadata.form.label.email": "Email Address",
-	"profile.metadata.form.label.email": "Dirección de correo electrónico",
+  // "menu.section.icon.new": "New menu section",
+  "menu.section.icon.new": "Nueva sección de menú",
 
-	// "profile.metadata.form.label.firstname": "First Name",
-	"profile.metadata.form.label.firstname": "Primer nombre",
+  // "menu.section.icon.pin": "Pin sidebar",
+  "menu.section.icon.pin": "Anclar barra lateral",
 
-	// "profile.metadata.form.label.language": "Language",
-	"profile.metadata.form.label.language": "Idioma",
+  // "menu.section.icon.processes": "Processes Health",
+  "menu.section.icon.processes": "Sección de menú de Procesosde chequeo",
 
-	// "profile.metadata.form.label.lastname": "Last Name",
-	"profile.metadata.form.label.lastname": "Apellido",
+  // "menu.section.icon.registries": "Registries menu section",
+  "menu.section.icon.registries": "Sección de menu de Registros",
 
-	// "profile.metadata.form.label.phone": "Contact Telephone",
-	"profile.metadata.form.label.phone": "Teléfono de contacto",
+  // "menu.section.icon.statistics_task": "Statistics Task menu section",
+  "menu.section.icon.statistics_task": "Sección del menú de Tarea de estadísticas",
 
-	// "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
-	"profile.metadata.form.notifications.success.content": "Se guardaron sus cambios en el perfil.",
+  // "menu.section.icon.workflow": "Administer workflow menu section",
+  "menu.section.icon.workflow": "Sección del menú de Administración de flujos de trabajo",
 
-	// "profile.metadata.form.notifications.success.title": "Profile saved",
-	"profile.metadata.form.notifications.success.title": "Perfil guardado",
+  // "menu.section.icon.unpin": "Unpin sidebar",
+  "menu.section.icon.unpin": "Desanclar la barra lateral",
 
-	// "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
-	"profile.notifications.warning.no-changes.content": "No se realizaron cambios en el perfil.",
 
-	// "profile.notifications.warning.no-changes.title": "No changes",
-	"profile.notifications.warning.no-changes.title": "Sin cambios",
 
-	// "profile.security.form.error.matching-passwords": "The passwords do not match.",
-	"profile.security.form.error.matching-passwords": "Las contraseñas no coinciden.",
+  // "menu.section.import": "Import",
+  "menu.section.import": "Importar",
 
-	// "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-	"profile.security.form.error.password-length": "La contraseña debe tener al menos 6 caracteres.",
+  // "menu.section.import_batch": "Batch Import (ZIP)",
+  "menu.section.import_batch": "Importación por lotes (ZIP)",
 
-	// "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": "Opcionalmente, puede ingresar una nueva contraseña en el cuadro a continuación y confirmarla escribiéndola nuevamente en el segundo cuadro. Debe tener al menos seis caracteres.",
+  // "menu.section.import_metadata": "Metadata",
+  "menu.section.import_metadata": "Metadatos",
 
-	// "profile.security.form.label.password": "Password",
-	"profile.security.form.label.password": "Contraseña",
 
-	// "profile.security.form.label.passwordrepeat": "Retype to confirm",
-	"profile.security.form.label.passwordrepeat": "Rescriba para confirmar",
 
-	// "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
-	"profile.security.form.notifications.success.content": "Se guardaron sus cambios a la contraseña.",
+  // "menu.section.new": "New",
+  "menu.section.new": "Nuevo",
 
-	// "profile.security.form.notifications.success.title": "Password saved",
-	"profile.security.form.notifications.success.title": "Contraseña guardada",
+  // "menu.section.new_collection": "Collection",
+  "menu.section.new_collection": "Colección",
 
-	// "profile.security.form.notifications.error.title": "Error changing passwords",
-	"profile.security.form.notifications.error.title": "Error al cambiar las contraseñas",
+  // "menu.section.new_community": "Community",
+  "menu.section.new_community": "Comunidad",
 
-	// "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": "La contraseña debe tener al menos 6 caracteres.",
+  // "menu.section.new_item": "Item",
+  "menu.section.new_item": "Artículo",
 
-	// "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
-	"profile.security.form.notifications.error.not-same": "Las contraseñas proporcionadas no son las mismas.",
+  // "menu.section.new_item_version": "Item Version",
+  "menu.section.new_item_version": "Versión del artículo",
 
-	// "profile.title": "Update Profile",
-	"profile.title": "Actualización del perfil",
+  // "menu.section.new_process": "Process",
+  "menu.section.new_process": "Proceso",
 
 
 
-	// "project.listelement.badge": "Research Project",
-	"project.listelement.badge": "Proyecto de investigación",
+  // "menu.section.pin": "Pin sidebar",
+  "menu.section.pin": "Anclar barra lateral",
 
-	// "project.page.contributor": "Contributors",
-	"project.page.contributor": "Colaboradores",
+  // "menu.section.unpin": "Unpin sidebar",
+  "menu.section.unpin": "Desanclar la barra lateral",
 
-	// "project.page.description": "Description",
-	"project.page.description": "Descripción",
 
-	// "project.page.edit": "Edit this item",
-	"project.page.edit": "Editar este artículo",
 
-	// "project.page.expectedcompletion": "Expected Completion",
-	"project.page.expectedcompletion": "Finalización prevista",
+  // "menu.section.processes": "Processes",
+  "menu.section.processes": "Procesos",
 
-	// "project.page.funder": "Funders",
-	"project.page.funder": "Financiadores",
+  // "menu.section.health": "Health",
+  "menu.section.health": "Chequeo",
 
-	// "project.page.id": "ID",
-	"project.page.id": "IDENTIFICACIÓN",
 
-	// "project.page.keyword": "Keywords",
-	"project.page.keyword": "Palabras clave",
 
-	// "project.page.status": "Status",
-	"project.page.status": "Estado",
+  // "menu.section.registries": "Registries",
+  "menu.section.registries": "Registros",
 
-	// "project.page.titleprefix": "Research Project: ",
-	"project.page.titleprefix": "Proyecto de investigación:",
+  // "menu.section.registries_format": "Format",
+  "menu.section.registries_format": "Formato",
 
-	// "project.search.results.head": "Project Search Results",
-	"project.search.results.head": "Resultados de búsqueda de proyectos",
+  // "menu.section.registries_metadata": "Metadata",
+  "menu.section.registries_metadata": "Metadatos",
 
 
 
-	// "publication.listelement.badge": "Publication",
-	"publication.listelement.badge": "Publicación",
+  // "menu.section.statistics": "Statistics",
+  "menu.section.statistics": "Estadísticas",
 
-	// "publication.page.description": "Description",
-	"publication.page.description": "Descripción",
+  // "menu.section.statistics_task": "Statistics Task",
+  "menu.section.statistics_task": "Tarea de estadísticas",
 
-	// "publication.page.edit": "Edit this item",
-	"publication.page.edit": "Editar este artículo",
 
-	// "publication.page.journal-issn": "Journal ISSN",
-	"publication.page.journal-issn": "Revista ISSN",
 
-	// "publication.page.journal-title": "Journal Title",
-	"publication.page.journal-title": "Título de la revista",
+  // "menu.section.toggle.access_control": "Toggle Access Control section",
+  "menu.section.toggle.access_control": "Alternar sección de control de acceso",
 
-	// "publication.page.publisher": "Publisher",
-	"publication.page.publisher": "Editor",
+  // "menu.section.toggle.control_panel": "Toggle Control Panel section",
+  "menu.section.toggle.control_panel": "Alternar la sección del Panel de control",
 
-	// "publication.page.titleprefix": "Publication: ",
-	"publication.page.titleprefix": "Publicación:",
+  // "menu.section.toggle.curation_task": "Toggle Curation Task section",
+  "menu.section.toggle.curation_task": "Alternar la sección Tarea de curación",
 
-	// "publication.page.volume-title": "Volume Title",
-	"publication.page.volume-title": "Título del volumen",
+  // "menu.section.toggle.edit": "Toggle Edit section",
+  "menu.section.toggle.edit": "Alternar sección de Edición",
 
-	// "publication.search.results.head": "Publication Search Results",
-	"publication.search.results.head": "Resultados de la búsqueda de publicaciones",
+  // "menu.section.toggle.export": "Toggle Export section",
+  "menu.section.toggle.export": "Alternar sección de Exportación",
 
-	// "publication.search.title": "Publication Search",
-	"publication.search.title": "Búsqueda de publicaciones",
+  // "menu.section.toggle.find": "Toggle Find section",
+  "menu.section.toggle.find": "Alternar sección de Búsqueda",
 
+  // "menu.section.toggle.import": "Toggle Import section",
+  "menu.section.toggle.import": "Alternar sección de Importación",
 
-	// "media-viewer.next": "Next",
-	"media-viewer.next": "próximo",
+  // "menu.section.toggle.new": "Toggle New section",
+  "menu.section.toggle.new": "Alternar nueva sección",
 
-	// "media-viewer.previous": "Previous",
-	"media-viewer.previous": "Anterior",
+  // "menu.section.toggle.registries": "Toggle Registries section",
+  "menu.section.toggle.registries": "Alternar sección de Registros",
 
-	// "media-viewer.playlist": "Playlist",
-	"media-viewer.playlist": "Lista de reproducción",
+  // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
+  "menu.section.toggle.statistics_task": "Alternar sección de Tarea de estadísticas",
 
 
-	// "register-email.title": "New user registration",
-	"register-email.title": "Registro de nuevo usuario",
+  // "menu.section.workflow": "Administer Workflow",
+  "menu.section.workflow": "Administrar flujo de trabajo",
 
-	// "register-page.create-profile.header": "Create Profile",
-	"register-page.create-profile.header": "Crear perfil",
 
-	// "register-page.create-profile.identification.header": "Identify",
-	"register-page.create-profile.identification.header": "Identificar",
+  // "metadata-export-search.tooltip": "Export search results as CSV",
+  "metadata-export-search.tooltip": "Exportar los resultados de búsqueda a CSV",
+  
+  // "metadata-export-search.submit.success": "The export was started successfully",
+  "metadata-export-search.submit.success": "La exortación ha comenzado satisfactoriamente",
+  
+  // "metadata-export-search.submit.error": "Starting the export has failed",
+  "metadata-export-search.submit.error": "Ha fallado el comienzo de la exportación",
 
-	// "register-page.create-profile.identification.email": "Email Address",
-	"register-page.create-profile.identification.email": "Dirección de correo electrónico",
 
-	// "register-page.create-profile.identification.first-name": "First Name *",
-	"register-page.create-profile.identification.first-name": "Primer nombre *",
+  // "mydspace.breadcrumbs": "MyDSpace",
+  "mydspace.breadcrumbs": "Mi DSpace",
 
-	// "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
-	"register-page.create-profile.identification.first-name.error": "Por favor ingrese un nombre",
+  // "mydspace.description": "",
+  "mydspace.description": "",
 
-	// "register-page.create-profile.identification.last-name": "Last Name *",
-	"register-page.create-profile.identification.last-name": "Apellido *",
+  // "mydspace.general.text-here": "here",
+  "mydspace.general.text-here": "aquí",
 
-	// "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
-	"register-page.create-profile.identification.last-name.error": "Por favor ingrese un apellido",
+  // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
+  "mydspace.messages.controller-help": "Seleccione esta opción para enviar un mensaje al remitente del ítem.",
 
-	// "register-page.create-profile.identification.contact": "Contact Telephone",
-	"register-page.create-profile.identification.contact": "Teléfono de contacto",
+  // "mydspace.messages.description-placeholder": "Insert your message here...",
+  "mydspace.messages.description-placeholder": "Inserta tu mensaje aquí...",
 
-	// "register-page.create-profile.identification.language": "Language",
-	"register-page.create-profile.identification.language": "Idioma",
+  // "mydspace.messages.hide-msg": "Hide message",
+  "mydspace.messages.hide-msg": "Ocultar mensaje",
 
-	// "register-page.create-profile.security.header": "Security",
-	"register-page.create-profile.security.header": "Seguridad",
+  // "mydspace.messages.mark-as-read": "Mark as read",
+  "mydspace.messages.mark-as-read": "Marcar como leído",
 
-	// "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": "Ingrese una contraseña en el cuadro a continuación y confírmela escribiéndola nuevamente en el segundo cuadro. Debe tener al menos seis caracteres.",
+  // "mydspace.messages.mark-as-unread": "Mark as unread",
+  "mydspace.messages.mark-as-unread": "marcar como no leído",
 
-	// "register-page.create-profile.security.label.password": "Password *",
-	"register-page.create-profile.security.label.password": "Contraseña *",
+  // "mydspace.messages.no-content": "No content.",
+  "mydspace.messages.no-content": "Sin contenido.",
 
-	// "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
-	"register-page.create-profile.security.label.passwordrepeat": "Rescriba para confirmar *",
+  // "mydspace.messages.no-messages": "No messages yet.",
+  "mydspace.messages.no-messages": "Aún no hay mensajes.",
 
-	// "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
-	"register-page.create-profile.security.error.empty-password": "Ingrese una contraseña en el cuadro a continuación.",
+  // "mydspace.messages.send-btn": "Send",
+  "mydspace.messages.send-btn": "Enviar",
 
-	// "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
-	"register-page.create-profile.security.error.matching-passwords": "Las contraseñas no coinciden.",
+  // "mydspace.messages.show-msg": "Show message",
+  "mydspace.messages.show-msg": "Mostrar mensaje",
 
-	// "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": "La contraseña debe tener al menos 6 caracteres.",
+  // "mydspace.messages.subject-placeholder": "Subject...",
+  "mydspace.messages.subject-placeholder": "Asunto...",
 
-	// "register-page.create-profile.submit": "Complete Registration",
-	"register-page.create-profile.submit": "Registro completo",
+  // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
+  "mydspace.messages.submitter-help": "Seleccione esta opción para enviar un mensaje al controlador.",
 
-	// "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
-	"register-page.create-profile.submit.error.content": "Se produjo un error al registrar un nuevo usuario.",
+  // "mydspace.messages.title": "Messages",
+  "mydspace.messages.title": "Mensajes",
 
-	// "register-page.create-profile.submit.error.head": "Registration failed",
-	"register-page.create-profile.submit.error.head": "Registro fallido",
+  // "mydspace.messages.to": "To",
+  "mydspace.messages.to": "Para",
 
-	// "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.",
-	"register-page.create-profile.submit.success.content": "El registro fue exitoso. Ha iniciado sesión como el usuario creado.",
+  // "mydspace.new-submission": "New submission",
+  "mydspace.new-submission": "Nuevo envío",
 
-	// "register-page.create-profile.submit.success.head": "Registration completed",
-	"register-page.create-profile.submit.success.head": "Registro completado",
+  // "mydspace.new-submission-external": "Import metadata from external source",
+  "mydspace.new-submission-external": "Importar metadatos de una fuente externa",
 
+  // "mydspace.new-submission-external-short": "Import metadata",
+  "mydspace.new-submission-external-short": "Importar metadatos",
 
-	// "register-page.registration.header": "New user registration",
-	"register-page.registration.header": "Registro de nuevo usuario",
+  // "mydspace.results.head": "Your submissions",
+  "mydspace.results.head": "Tus envíos",
 
-	// "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-	"register-page.registration.info": "Registre una cuenta para suscribirse a colecciones para recibir actualizaciones por correo electrónico y envíe nuevos artículos a DSpace.",
+  // "mydspace.results.no-abstract": "No Abstract",
+  "mydspace.results.no-abstract": "Sin resumen",
 
-	// "register-page.registration.email": "Email Address *",
-	"register-page.registration.email": "Dirección de correo electrónico *",
+  // "mydspace.results.no-authors": "No Authors",
+  "mydspace.results.no-authors": "Sin autores",
 
-	// "register-page.registration.email.error.required": "Please fill in an email address",
-	"register-page.registration.email.error.required": "Por favor ingrese una dirección de correo electrónico",
+  // "mydspace.results.no-collections": "No Collections",
+  "mydspace.results.no-collections": "No hay colecciones",
 
-	// "register-page.registration.email.error.pattern": "Please fill in a valid email address",
-	"register-page.registration.email.error.pattern": "Por favor ingrese una dirección de correo electrónico válida",
+  // "mydspace.results.no-date": "No Date",
+  "mydspace.results.no-date": "Sin fecha",
 
-	// "register-page.registration.email.hint": "This address will be verified and used as your login name.",
-	"register-page.registration.email.hint": "Esta dirección será verificada y utilizada como su nombre de inicio de sesión.",
+  // "mydspace.results.no-files": "No Files",
+  "mydspace.results.no-files": "Sin archivos",
 
-	// "register-page.registration.submit": "Register",
-	"register-page.registration.submit": "Registrarse",
+  // "mydspace.results.no-results": "There were no items to show",
+  "mydspace.results.no-results": "No hay ítems para mostrar",
 
-	// "register-page.registration.success.head": "Verification email sent",
-	"register-page.registration.success.head": "El mensaje de verificación ha sido enviado",
+  // "mydspace.results.no-title": "No title",
+  "mydspace.results.no-title": "Sin título",
 
-	// "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-	"register-page.registration.success.content": "Se envió un correo electrónico a {{ email }} que contiene una URL especial y más instrucciones.",
+  // "mydspace.results.no-uri": "No Uri",
+  "mydspace.results.no-uri": "Sin Uri",
 
-	// "register-page.registration.error.head": "Error when trying to register email",
-	"register-page.registration.error.head": "Error al intentar registrar el correo electrónico",
+  // "mydspace.search-form.placeholder": "Search in mydspace...",
+  "mydspace.search-form.placeholder": "Buscar en Mi DSpace...",
 
-	// "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
-	"register-page.registration.error.content": "Se produjo un error al registrar la siguiente dirección de correo electrónico: {{ email }}",
+  // "mydspace.show.workflow": "Workflow tasks",
+  "mydspace.show.workflow": "Tareas del flujo de trabajo",
 
+  // "mydspace.show.workspace": "Your Submissions",
+  "mydspace.show.workspace": "Sus envíos",
 
+  // "mydspace.status.archived": "Archived",
+  "mydspace.status.archived": "Archivado",
 
-	// "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
-	"relationships.add.error.relationship-type.content": "No se pudo encontrar una coincidencia adecuada para el tipo de relación {{ type }} entre los dos artículos",
+  // "mydspace.status.validation": "Validation",
+  "mydspace.status.validation": "Validación",
 
-	// "relationships.add.error.server.content": "The server returned an error",
-	"relationships.add.error.server.content": "El servidor devolvió un error",
+  // "mydspace.status.waiting-for-controller": "Waiting for controller",
+  "mydspace.status.waiting-for-controller": "Esperando al controlador",
 
-	// "relationships.add.error.title": "Unable to add relationship",
-	"relationships.add.error.title": "No se puede agregar una relación",
+  // "mydspace.status.workflow": "Workflow",
+  "mydspace.status.workflow": "Flujo de trabajo",
 
-	// "relationships.isAuthorOf": "Authors",
-	"relationships.isAuthorOf": "Autores",
+  // "mydspace.status.workspace": "Workspace",
+  "mydspace.status.workspace": "Espacio de trabajo",
 
-	// "relationships.isAuthorOf.Person": "Authors (persons)",
-	"relationships.isAuthorOf.Person": "Autores (personas)",
+  // "mydspace.title": "MyDSpace",
+  "mydspace.title": "Mi DSpace",
 
-	// "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
-	"relationships.isAuthorOf.OrgUnit": "Autores (unidades organizativas)",
+  // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
+  "mydspace.upload.upload-failed": "Error al crear un nuevo espacio de trabajo. Verifique el contenido cargado antes de volver a intentarlo.",
 
-	// "relationships.isIssueOf": "Journal Issues",
-	"relationships.isIssueOf": "Problemas de la revista",
+  // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
+  "mydspace.upload.upload-failed-manyentries": "Archivo no procesable. Se detectaron demasiadas entradas, pero solo se permitió una para el archivo.",
 
-	// "relationships.isJournalIssueOf": "Journal Issue",
-	"relationships.isJournalIssueOf": "Número de la revista",
+  // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
+  "mydspace.upload.upload-failed-moreonefile": "Solicitud no procesable. Solo se permite un archivo.",
 
-	// "relationships.isJournalOf": "Journals",
-	"relationships.isJournalOf": "Revistas",
+  // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
+  "mydspace.upload.upload-multiple-successful": "Se crearon {{ qty }} nuevos ítems del espacio de trabajo.",
 
-	// "relationships.isOrgUnitOf": "Organizational Units",
-	"relationships.isOrgUnitOf": "Unidades organizativas",
+  // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
+  "mydspace.upload.upload-successful": "Se creó un nuevo ítems en el espacio de trabajo. Haga clic en {{ here }} para editarlo.",
 
-	// "relationships.isPersonOf": "Authors",
-	"relationships.isPersonOf": "Autores",
+  // "mydspace.view-btn": "View",
+  "mydspace.view-btn": "Vista",
 
-	// "relationships.isProjectOf": "Research Projects",
-	"relationships.isProjectOf": "Proyectos de investigación",
 
-	// "relationships.isPublicationOf": "Publications",
-	"relationships.isPublicationOf": "Publicaciones",
 
-	// "relationships.isPublicationOfJournalIssue": "Articles",
-	"relationships.isPublicationOfJournalIssue": "Artículos",
+  // "nav.browse.header": "All of DSpace",
+  "nav.browse.header": "Todo DSpace",
 
-	// "relationships.isSingleJournalOf": "Journal",
-	"relationships.isSingleJournalOf": "diario",
+  // "nav.community-browse.header": "By Community",
+  "nav.community-browse.header": "Por comunidad",
 
-	// "relationships.isSingleVolumeOf": "Journal Volume",
-	"relationships.isSingleVolumeOf": "Volumen de la revista",
+  // "nav.language": "Language switch",
+  "nav.language": "Cambio de idioma",
 
-	// "relationships.isVolumeOf": "Journal Volumes",
-	"relationships.isVolumeOf": "Volúmenes de revistas",
+  // "nav.login": "Log In",
+  "nav.login": "Iniciar sesión",
 
-	// "relationships.isContributorOf": "Contributors",
-	"relationships.isContributorOf": "Colaboradores",
+  // "nav.logout": "User profile menu and Log Out",
+  "nav.logout": "Menú de perfil de usuario y cierre de sesión",
 
-	// "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
-	"relationships.isContributorOf.OrgUnit": "Colaborador (Unidad organizativa)",
+  // "nav.main.description": "Main navigation bar",
+  "nav.main.description": "Barra de navegación principal",
 
-	// "relationships.isContributorOf.Person": "Contributor",
-	"relationships.isContributorOf.Person": "Contribuyente",
+  // "nav.mydspace": "MyDSpace",
+  "nav.mydspace": "Mi DSpace",
 
-	// "relationships.isFundingAgencyOf.OrgUnit": "Funder",
-	"relationships.isFundingAgencyOf.OrgUnit": "Financiador",
+  // "nav.profile": "Profile",
+  "nav.profile": "Perfil",
 
+  // "nav.search": "Search",
+  "nav.search": "Buscar",
 
-	// "repository.image.logo": "Repository logo",
-	"repository.image.logo": "Logotipo del repositorio",
+  // "nav.statistics.header": "Statistics",
+  "nav.statistics.header": "Estadísticas",
 
-	// "repository.title.prefix": "DSpace Angular :: ",
-	"repository.title.prefix": "DSpace Angular ::",
+  // "nav.stop-impersonating": "Stop impersonating EPerson",
+  "nav.stop-impersonating": "Dejar de impersonar a EPerson",
 
-	// "repository.title.prefixDSpace": "DSpace Angular ::",
-	"repository.title.prefixDSpace": "DSpace Angular ::",
+  // "nav.toggle" : "Toggle navigation",
+  "nav.toggle": "Alternar navegación",
 
+  // "nav.user.description" : "User profile bar",
+  "nav.user.description": "Barra de perfil de usuario",
 
-	// "resource-policies.add.button": "Add",
-	"resource-policies.add.button": "Agregar",
+  // "none.listelement.badge": "Item",
+  "none.listelement.badge": "Ítem",
 
-	// "resource-policies.add.for.": "Add a new policy",
-	"resource-policies.add.for.": "Agregar una nueva política",
+  // "orgunit.listelement.badge": "Organizational Unit",
+  "orgunit.listelement.badge": "Unidad organizativa",
 
-	// "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
-	"resource-policies.add.for.bitstream": "Agregar una nueva política de Archivo",
+  // "orgunit.page.city": "City",
+  "orgunit.page.city": "Ciudad",
 
-	// "resource-policies.add.for.bundle": "Add a new Bundle policy",
-	"resource-policies.add.for.bundle": "Agregar una nueva política de paquete",
+  // "orgunit.page.country": "Country",
+  "orgunit.page.country": "País",
 
-	// "resource-policies.add.for.item": "Add a new Item policy",
-	"resource-policies.add.for.item": "Agregar una nueva política de artículos",
+  // "orgunit.page.dateestablished": "Date established",
+  "orgunit.page.dateestablished": "Fecha de establecimiento",
 
-	// "resource-policies.add.for.community": "Add a new Community policy",
-	"resource-policies.add.for.community": "Agregar una nueva política comunitaria",
+  // "orgunit.page.description": "Description",
+  "orgunit.page.description": "Descripción",
 
-	// "resource-policies.add.for.collection": "Add a new Collection policy",
-	"resource-policies.add.for.collection": "Agregar una nueva política de colección",
+  // "orgunit.page.edit": "Edit this item",
+  "orgunit.page.edit": "Editar este ítem",
 
-	// "resource-policies.create.page.heading": "Create new resource policy for ",
-	"resource-policies.create.page.heading": "Crear una nueva política de recursos para",
+  // "orgunit.page.id": "ID",
+  "orgunit.page.id": "ID",
 
-	// "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
-	"resource-policies.create.page.failure.content": "Se produjo un error al crear la política de recursos.",
+  // "orgunit.page.titleprefix": "Organizational Unit: ",
+  "orgunit.page.titleprefix": "Unidad organizativa:",
 
-	// "resource-policies.create.page.success.content": "Operation successful",
-	"resource-policies.create.page.success.content": "Operación exitosa",
 
-	// "resource-policies.create.page.title": "Create new resource policy",
-	"resource-policies.create.page.title": "Crear nueva política de recursos",
+  // "pagination.options.description": "Pagination options",
+  "pagination.options.description": "Opciones de paginación",
 
-	// "resource-policies.delete.btn": "Delete selected",
-	"resource-policies.delete.btn": "Eliminar seleccionado",
+  // "pagination.results-per-page": "Results Per Page",
+  "pagination.results-per-page": "Resultados por página",
 
-	// "resource-policies.delete.btn.title": "Delete selected resource policies",
-	"resource-policies.delete.btn.title": "Eliminar las políticas de recursos seleccionadas",
+  // "pagination.showing.detail": "{{ range }} of {{ total }}",
+  "pagination.showing.detail": "{{ range }} de {{ total }}",
 
-	// "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
-	"resource-policies.delete.failure.content": "Se produjo un error al eliminar las políticas de recursos seleccionadas.",
+  // "pagination.showing.label": "Now showing ",
+  "pagination.showing.label": "Mostrando",
 
-	// "resource-policies.delete.success.content": "Operation successful",
-	"resource-policies.delete.success.content": "Operación exitosa",
+  // "pagination.sort-direction": "Sort Options",
+  "pagination.sort-direction": "Opciones de clasificación",
 
-	// "resource-policies.edit.page.heading": "Edit resource policy ",
-	"resource-policies.edit.page.heading": "Editar la política de recursos",
 
-	// "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
-	"resource-policies.edit.page.failure.content": "Se produjo un error al editar la política de recursos.",
 
-	// "resource-policies.edit.page.success.content": "Operation successful",
-	"resource-policies.edit.page.success.content": "Operación exitosa",
+  // "person.listelement.badge": "Person",
+  "person.listelement.badge": "Persona",
 
-	// "resource-policies.edit.page.title": "Edit resource policy",
-	"resource-policies.edit.page.title": "Editar la política de recursos",
+  // "person.listelement.no-title": "No name found",
+  "person.listelement.no-title": "No se encontró ningún nombre",
 
-	// "resource-policies.form.action-type.label": "Select the action type",
-	"resource-policies.form.action-type.label": "Seleccione el tipo de acción",
+  // "person.page.birthdate": "Birth Date",
+  "person.page.birthdate": "Fecha de nacimiento",
 
-	// "resource-policies.form.action-type.required": "You must select the resource policy action.",
-	"resource-policies.form.action-type.required": "Debe seleccionar la acción de la política de recursos.",
+  // "person.page.edit": "Edit this item",
+  "person.page.edit": "Editar este artículo",
 
-	// "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
-	"resource-policies.form.eperson-group-list.label": "La persona o grupo al que se le otorgará el permiso",
+  // "person.page.email": "Email Address",
+  "person.page.email": "Dirección de correo electrónico",
 
-	// "resource-policies.form.eperson-group-list.select.btn": "Select",
-	"resource-policies.form.eperson-group-list.select.btn": "Seleccione",
+  // "person.page.firstname": "First Name",
+  "person.page.firstname": "Primer nombre",
 
-	// "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
-	"resource-policies.form.eperson-group-list.tab.eperson": "Buscar una ePerson",
+  // "person.page.jobtitle": "Job Title",
+  "person.page.jobtitle": "Título profesional",
 
-	// "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
-	"resource-policies.form.eperson-group-list.tab.group": "Buscar un grupo",
+  // "person.page.lastname": "Last Name",
+  "person.page.lastname": "Apellido",
 
-	// "resource-policies.form.eperson-group-list.table.headers.action": "Action",
-	"resource-policies.form.eperson-group-list.table.headers.action": "Acción",
+  // "person.page.name": "Name",
+  "person.page.name": "Nombre",
 
-	// "resource-policies.form.eperson-group-list.table.headers.id": "ID",
-	"resource-policies.form.eperson-group-list.table.headers.id": "IDENTIFICACIÓN",
+  // "person.page.link.full": "Show all metadata",
+  "person.page.link.full": "Mostrar todos los metadatos",
 
-	// "resource-policies.form.eperson-group-list.table.headers.name": "Name",
-	"resource-policies.form.eperson-group-list.table.headers.name": "Nombre",
+  // "person.page.orcid": "ORCID",
+  "person.page.orcid": "ORCID",
 
-	// "resource-policies.form.date.end.label": "End Date",
-	"resource-policies.form.date.end.label": "Fecha final",
+  // "person.page.staffid": "Staff ID",
+  "person.page.staffid": "Identificación del personal",
 
-	// "resource-policies.form.date.start.label": "Start Date",
-	"resource-policies.form.date.start.label": "Fecha de inicio",
+  // "person.page.titleprefix": "Person: ",
+  "person.page.titleprefix": "Persona:",
 
-	// "resource-policies.form.description.label": "Description",
-	"resource-policies.form.description.label": "Descripción",
+  // "person.search.results.head": "Person Search Results",
+  "person.search.results.head": "Resultados de búsqueda de personas",
 
-	// "resource-policies.form.name.label": "Name",
-	"resource-policies.form.name.label": "Nombre",
+  // "person-relationships.search.results.head": "Person Search Results",
+  "person-relationships.search.results.head": "Resultados de búsqueda de personas",
 
-	// "resource-policies.form.policy-type.label": "Select the policy type",
-	"resource-policies.form.policy-type.label": "Seleccione el tipo de póliza",
+  // "person.search.title": "Person Search",
+  "person.search.title": "Búsqueda de personas",
 
-	// "resource-policies.form.policy-type.required": "You must select the resource policy type.",
-	"resource-policies.form.policy-type.required": "Debe seleccionar el tipo de política de recursos.",
 
-	// "resource-policies.table.headers.action": "Action",
-	"resource-policies.table.headers.action": "Acción",
 
-	// "resource-policies.table.headers.date.end": "End Date",
-	"resource-policies.table.headers.date.end": "Fecha final",
+  // "process.new.select-parameters": "Parameters",
+  "process.new.select-parameters": "Parámetros",
 
-	// "resource-policies.table.headers.date.start": "Start Date",
-	"resource-policies.table.headers.date.start": "Fecha de inicio",
+  // "process.new.cancel": "Cancel",
+  "process.new.cancel": "Cancelar",
 
-	// "resource-policies.table.headers.edit": "Edit",
-	"resource-policies.table.headers.edit": "Editar",
+  // "process.new.submit": "Save",
+  "process.new.submit": "Guardar",
 
-	// "resource-policies.table.headers.edit.group": "Edit group",
-	"resource-policies.table.headers.edit.group": "Editar grupo",
+  // "process.new.select-script": "Script",
+  "process.new.select-script": "Texto",
 
-	// "resource-policies.table.headers.edit.policy": "Edit policy",
-	"resource-policies.table.headers.edit.policy": "Editar política",
+  // "process.new.select-script.placeholder": "Choose a script...",
+  "process.new.select-script.placeholder": "Elija un guión...",
 
-	// "resource-policies.table.headers.eperson": "EPerson",
-	"resource-policies.table.headers.eperson": "Epersona",
+  // "process.new.select-script.required": "Script is required",
+  "process.new.select-script.required": "Se requiere script",
 
-	// "resource-policies.table.headers.group": "Group",
-	"resource-policies.table.headers.group": "Grupo",
+  // "process.new.parameter.file.upload-button": "Select file...",
+  "process.new.parameter.file.upload-button": "Seleccione Archivo...",
 
-	// "resource-policies.table.headers.id": "ID",
-	"resource-policies.table.headers.id": "IDENTIFICACIÓN",
+  // "process.new.parameter.file.required": "Please select a file",
+  "process.new.parameter.file.required": "Por favor seleccione un archivo",
 
-	// "resource-policies.table.headers.name": "Name",
-	"resource-policies.table.headers.name": "Nombre",
+  // "process.new.parameter.string.required": "Parameter value is required",
+  "process.new.parameter.string.required": "Se requiere el valor del parámetro",
 
-	// "resource-policies.table.headers.policyType": "type",
-	"resource-policies.table.headers.policyType": "escribe",
+  // "process.new.parameter.type.value": "value",
+  "process.new.parameter.type.value": "valor",
 
-	// "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
-	"resource-policies.table.headers.title.for.bitstream": "Políticas para Archivo",
+  // "process.new.parameter.type.file": "file",
+  "process.new.parameter.type.file": "expediente",
 
-	// "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
-	"resource-policies.table.headers.title.for.bundle": "Políticas para el paquete",
+  // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
+  "process.new.parameter.required.missing": "Los siguientes parámetros son obligatorios pero aún faltan:",
 
-	// "resource-policies.table.headers.title.for.item": "Policies for Item",
-	"resource-policies.table.headers.title.for.item": "Políticas para el artículo",
+  // "process.new.notification.success.title": "Success",
+  "process.new.notification.success.title": "Éxito",
 
-	// "resource-policies.table.headers.title.for.community": "Policies for Community",
-	"resource-policies.table.headers.title.for.community": "Políticas para la comunidad",
+  // "process.new.notification.success.content": "The process was successfully created",
+  "process.new.notification.success.content": "El proceso fue creado con éxito",
 
-	// "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-	"resource-policies.table.headers.title.for.collection": "Políticas de cobranza",
+  // "process.new.notification.error.title": "Error",
+  "process.new.notification.error.title": "Error",
 
+  // "process.new.notification.error.content": "An error occurred while creating this process",
+  "process.new.notification.error.content": "Se produjo un error al crear este proceso.",
 
+  // "process.new.header": "Create a new process",
+  "process.new.header": "Crea un nuevo proceso",
 
-	// "search.description": "",
-	"search.description": "",
+  // "process.new.title": "Create a new process",
+  "process.new.title": "Crea un nuevo proceso",
 
-	// "search.switch-configuration.title": "Show",
-	"search.switch-configuration.title": "Show",
+  // "process.new.breadcrumbs": "Create a new process",
+  "process.new.breadcrumbs": "Crea un nuevo proceso",
 
-	// "search.title": "Search",
-	"search.title": "Buscar",
 
-	// "search.breadcrumbs": "Search",
-	"search.breadcrumbs": "Buscar",
 
-	// "search.search-form.placeholder": "Search the repository ...",
-	"search.search-form.placeholder": "Buscar en el repositorio ...",
+  // "process.detail.arguments" : "Arguments",
+  "process.detail.arguments": "Argumentos",
 
+  // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
+  "process.detail.arguments.empty": "Este proceso no contiene ningún argumento",
 
-	// "search.filters.applied.f.author": "Author",
-	"search.filters.applied.f.author": "Autor",
+  // "process.detail.back" : "Back",
+  "process.detail.back": "Atrás",
 
-	// "search.filters.applied.f.dateIssued.max": "End date",
-	"search.filters.applied.f.dateIssued.max": "Fecha final",
+  // "process.detail.output" : "Process Output",
+  "process.detail.output": "Salida del proceso",
 
-	// "search.filters.applied.f.dateIssued.min": "Start date",
-	"search.filters.applied.f.dateIssued.min": "Fecha de inicio",
+  // "process.detail.logs.button": "Retrieve process output",
+  "process.detail.logs.button": "Recuperar la salida del proceso",
 
-	// "search.filters.applied.f.dateSubmitted": "Date submitted",
-	"search.filters.applied.f.dateSubmitted": "Fecha Enviado",
+  // "process.detail.logs.loading": "Retrieving",
+  "process.detail.logs.loading": "Recuperando",
 
-	// "search.filters.applied.f.discoverable": "Private",
-	"search.filters.applied.f.discoverable": "Privado",
+  // "process.detail.logs.none": "This process has no output",
+  "process.detail.logs.none": "Este proceso no tiene salida",
 
-	// "search.filters.applied.f.entityType": "Item Type",
-	"search.filters.applied.f.entityType": "Tipo de artículo",
+  // "process.detail.output-files" : "Output Files",
+  "process.detail.output-files": "Archivos de salida",
 
-	// "search.filters.applied.f.has_content_in_original_bundle": "Has files",
-	"search.filters.applied.f.has_content_in_original_bundle": "Tiene archivos",
+  // "process.detail.output-files.empty" : "This process doesn't contain any output files",
+  "process.detail.output-files.empty": "Este proceso no contiene ningún archivo de salida",
 
-	// "search.filters.applied.f.itemtype": "Type",
-	"search.filters.applied.f.itemtype": "Escribe",
+  // "process.detail.script" : "Script",
+  "process.detail.script": "Secuencia de comandos",
 
-	// "search.filters.applied.f.namedresourcetype": "Status",
-	"search.filters.applied.f.namedresourcetype": "Estado",
+  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
+  "process.detail.title": "Proceso: {{ id }} - {{ name }}",
 
-	// "search.filters.applied.f.subject": "Subject",
-	"search.filters.applied.f.subject": "Tema",
+  // "process.detail.start-time" : "Start time",
+  "process.detail.start-time": "Hora de inicio",
 
-	// "search.filters.applied.f.submitter": "Submitter",
-	"search.filters.applied.f.submitter": "Remitente",
+  // "process.detail.end-time" : "Finish time",
+  "process.detail.end-time": "Hora de finalización",
 
-	// "search.filters.applied.f.jobTitle": "Job Title",
-	"search.filters.applied.f.jobTitle": "Título profesional",
+  // "process.detail.status" : "Status",
+  "process.detail.status": "Estado",
 
-	// "search.filters.applied.f.birthDate.max": "End birth date",
-	"search.filters.applied.f.birthDate.max": "Fecha final de nacimiento",
+  // "process.detail.create" : "Create similar process",
+  "process.detail.create": "Crear un proceso similar",
 
-	// "search.filters.applied.f.birthDate.min": "Start birth date",
-	"search.filters.applied.f.birthDate.min": "Fecha de inicio de nacimiento",
 
-	// "search.filters.applied.f.withdrawn": "Withdrawn",
-	"search.filters.applied.f.withdrawn": "Retirado",
 
+  // "process.overview.table.finish" : "Finish time (UTC)",
+  "process.overview.table.finish": "Hora de finalización (UTC)",
 
+  // "process.overview.table.id" : "Process ID",
+  "process.overview.table.id": "ID de proceso",
 
-	// "search.filters.filter.author.head": "Author",
-	"search.filters.filter.author.head": "Autor",
+  // "process.overview.table.name" : "Name",
+  "process.overview.table.name": "Nombre",
 
-	// "search.filters.filter.author.placeholder": "Author name",
-	"search.filters.filter.author.placeholder": "Nombre del autor",
+  // "process.overview.table.start" : "Start time (UTC)",
+  "process.overview.table.start": "Hora de inicio (UTC)",
 
-	// "search.filters.filter.author.label": "Search author name",
-	"search.filters.filter.author.label": "Buscar el nombre del autor",
+  // "process.overview.table.status" : "Status",
+  "process.overview.table.status": "Estado",
 
-	// "search.filters.filter.birthDate.head": "Birth Date",
-	"search.filters.filter.birthDate.head": "Fecha de nacimiento",
+  // "process.overview.table.user" : "User",
+  "process.overview.table.user": "Usuario",
 
-	// "search.filters.filter.birthDate.placeholder": "Birth Date",
-	"search.filters.filter.birthDate.placeholder": "Fecha de nacimiento",
+  // "process.overview.title": "Processes Overview",
+  "process.overview.title": "Resumen de procesos",
 
-	// "search.filters.filter.birthDate.label": "Search birth date",
-	"search.filters.filter.birthDate.label": "Buscar fecha de nacimiento",
+  // "process.overview.breadcrumbs": "Processes Overview",
+  "process.overview.breadcrumbs": "Resumen de procesos",
 
-	// "search.filters.filter.collapse": "Collapse filter",
-	"search.filters.filter.collapse": "Colapsar filtro",
+  // "process.overview.new": "New",
+  "process.overview.new": "Nuevo",
 
-	// "search.filters.filter.creativeDatePublished.head": "Date Published",
-	"search.filters.filter.creativeDatePublished.head": "Fecha de publicación",
 
-	// "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
-	"search.filters.filter.creativeDatePublished.placeholder": "Fecha de publicación",
+  // "profile.breadcrumbs": "Update Profile",
+  "profile.breadcrumbs": "Actualización del perfil",
 
-	// "search.filters.filter.creativeDatePublished.label": "Search date published",
-	"search.filters.filter.creativeDatePublished.label": "Fecha de búsqueda publicada",
+  // "profile.card.identify": "Identify",
+  "profile.card.identify": "Identificar",
 
-	// "search.filters.filter.creativeWorkEditor.head": "Editor",
-	"search.filters.filter.creativeWorkEditor.head": "Editor",
+  // "profile.card.security": "Security",
+  "profile.card.security": "Seguridad",
 
-	// "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
-	"search.filters.filter.creativeWorkEditor.placeholder": "Editor",
+  // "profile.form.submit": "Save",
+  "profile.form.submit": "Guardar",
 
-	// "search.filters.filter.creativeWorkEditor.label": "Search editor",
-	"search.filters.filter.creativeWorkEditor.label": "Editor de búsqueda",
+  // "profile.groups.head": "Authorization groups you belong to",
+  "profile.groups.head": "Grupos de autorización a los que pertenece",
 
-	// "search.filters.filter.creativeWorkKeywords.head": "Subject",
-	"search.filters.filter.creativeWorkKeywords.head": "Tema",
+  // "profile.special.groups.head": "Authorization special groups you belong to",
+  "profile.special.groups.head": "Grupos especiales de autorización a los que pertenece",
 
-	// "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
-	"search.filters.filter.creativeWorkKeywords.placeholder": "Tema",
+  // "profile.head": "Update Profile",
+  "profile.head": "Actualización del perfil",
 
-	// "search.filters.filter.creativeWorkKeywords.label": "Search subject",
-	"search.filters.filter.creativeWorkKeywords.label": "Asunto de búsqueda",
+  // "profile.metadata.form.error.firstname.required": "First Name is required",
+  "profile.metadata.form.error.firstname.required": "Se requiere el nombre",
 
-	// "search.filters.filter.creativeWorkPublisher.head": "Publisher",
-	"search.filters.filter.creativeWorkPublisher.head": "Editor",
+  // "profile.metadata.form.error.lastname.required": "Last Name is required",
+  "profile.metadata.form.error.lastname.required": "Se requiere el apellido",
 
-	// "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
-	"search.filters.filter.creativeWorkPublisher.placeholder": "Editor",
+  // "profile.metadata.form.label.email": "Email Address",
+  "profile.metadata.form.label.email": "Dirección de correo electrónico",
 
-	// "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
-	"search.filters.filter.creativeWorkPublisher.label": "Editor de búsqueda",
+  // "profile.metadata.form.label.firstname": "First Name",
+  "profile.metadata.form.label.firstname": "Nombre¡",
 
-	// "search.filters.filter.dateIssued.head": "Date",
-	"search.filters.filter.dateIssued.head": "Fecha",
+  // "profile.metadata.form.label.language": "Language",
+  "profile.metadata.form.label.language": "Idioma",
 
-	// "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
-	"search.filters.filter.dateIssued.max.placeholder": "Fecha máxima",
+  // "profile.metadata.form.label.lastname": "Last Name",
+  "profile.metadata.form.label.lastname": "Apellido",
 
-	// "search.filters.filter.dateIssued.max.label": "End",
-	"search.filters.filter.dateIssued.max.label": "Fin",
+  // "profile.metadata.form.label.phone": "Contact Telephone",
+  "profile.metadata.form.label.phone": "Teléfono de contacto",
 
-	// "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
-	"search.filters.filter.dateIssued.min.placeholder": "Fecha mínima",
+  // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
+  "profile.metadata.form.notifications.success.content": "Se guardaron sus cambios en el perfil.",
 
-	// "search.filters.filter.dateIssued.min.label": "Start",
-	"search.filters.filter.dateIssued.min.label": "Comienzo",
+  // "profile.metadata.form.notifications.success.title": "Profile saved",
+  "profile.metadata.form.notifications.success.title": "Perfil guardado",
 
-	// "search.filters.filter.dateSubmitted.head": "Date submitted",
-	"search.filters.filter.dateSubmitted.head": "Fecha Enviado",
+  // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
+  "profile.notifications.warning.no-changes.content": "No se realizaron cambios en el perfil.",
 
-	// "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
-	"search.filters.filter.dateSubmitted.placeholder": "Fecha Enviado",
+  // "profile.notifications.warning.no-changes.title": "No changes",
+  "profile.notifications.warning.no-changes.title": "Sin cambios",
 
-	// "search.filters.filter.dateSubmitted.label": "Search date submitted",
-	"search.filters.filter.dateSubmitted.label": "Fecha de búsqueda enviada",
+  // "profile.security.form.error.matching-passwords": "The passwords do not match.",
+  "profile.security.form.error.matching-passwords": "Las contraseñas no coinciden.",
 
-	// "search.filters.filter.discoverable.head": "Private",
-	"search.filters.filter.discoverable.head": "Privado",
+  // "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
+  "profile.security.form.error.password-length": "La contraseña debe tener al menos 6 caracteres.",
 
-	// "search.filters.filter.withdrawn.head": "Withdrawn",
-	"search.filters.filter.withdrawn.head": "Retirado",
+  // "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": "Opcionalmente, puede introducir una nueva contraseña en el cuadro a continuación y confirmarla escribiéndola nuevamente en el segundo cuadro. Debe tener al menos seis caracteres.",
 
-	// "search.filters.filter.entityType.head": "Item Type",
-	"search.filters.filter.entityType.head": "Tipo de artículo",
+  // "profile.security.form.label.password": "Password",
+  "profile.security.form.label.password": "Contraseña",
 
-	// "search.filters.filter.entityType.placeholder": "Item Type",
-	"search.filters.filter.entityType.placeholder": "Tipo de artículo",
+  // "profile.security.form.label.passwordrepeat": "Retype to confirm",
+  "profile.security.form.label.passwordrepeat": "Rescriba para confirmar",
 
-	// "search.filters.filter.entityType.label": "Search item type",
-	"search.filters.filter.entityType.label": "Tipo de artículo de búsqueda",
+  // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
+  "profile.security.form.notifications.success.content": "Se guardaron sus cambios a la contraseña.",
 
-	// "search.filters.filter.expand": "Expand filter",
-	"search.filters.filter.expand": "Expandir filtro",
+  // "profile.security.form.notifications.success.title": "Password saved",
+  "profile.security.form.notifications.success.title": "Contraseña guardada",
 
-	// "search.filters.filter.has_content_in_original_bundle.head": "Has files",
-	"search.filters.filter.has_content_in_original_bundle.head": "Tiene archivos",
+  // "profile.security.form.notifications.error.title": "Error changing passwords",
+  "profile.security.form.notifications.error.title": "Error al cambiar las contraseñas",
 
-	// "search.filters.filter.itemtype.head": "Type",
-	"search.filters.filter.itemtype.head": "Escribe",
+  // "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": "La contraseña debe tener al menos 6 caracteres.",
 
-	// "search.filters.filter.itemtype.placeholder": "Type",
-	"search.filters.filter.itemtype.placeholder": "Escribe",
+  // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
+  "profile.security.form.notifications.error.not-same": "Las contraseñas proporcionadas no coinciden.",
 
-	// "search.filters.filter.itemtype.label": "Search type",
-	"search.filters.filter.itemtype.label": "Tipo de búsqueda",
+  // "profile.title": "Update Profile",
+  "profile.title": "Actualización del perfil",
 
-	// "search.filters.filter.jobTitle.head": "Job Title",
-	"search.filters.filter.jobTitle.head": "Título profesional",
+  // "profile.card.researcher": "Researcher Profile",
+  "profile.card.researcher": "Perfil de Investigador",
 
-	// "search.filters.filter.jobTitle.placeholder": "Job Title",
-	"search.filters.filter.jobTitle.placeholder": "Título profesional",
+  // "project.listelement.badge": "Research Project",
+  "project.listelement.badge": "Proyecto de Investigación",
 
-	// "search.filters.filter.jobTitle.label": "Search job title",
-	"search.filters.filter.jobTitle.label": "Buscar puesto de trabajo",
+  // "project.page.contributor": "Contributors",
+  "project.page.contributor": "Colaboradores",
 
-	// "search.filters.filter.knowsLanguage.head": "Known language",
-	"search.filters.filter.knowsLanguage.head": "Idioma conocido",
+  // "project.page.description": "Description",
+  "project.page.description": "Descripción",
 
-	// "search.filters.filter.knowsLanguage.placeholder": "Known language",
-	"search.filters.filter.knowsLanguage.placeholder": "Idioma conocido",
+  // "project.page.edit": "Edit this item",
+  "project.page.edit": "Editar este ítem",
 
-	// "search.filters.filter.knowsLanguage.label": "Search known language",
-	"search.filters.filter.knowsLanguage.label": "Buscar idioma conocido",
+  // "project.page.expectedcompletion": "Expected Completion",
+  "project.page.expectedcompletion": "Finalización prevista",
 
-	// "search.filters.filter.namedresourcetype.head": "Status",
-	"search.filters.filter.namedresourcetype.head": "Estado",
+  // "project.page.funder": "Funders",
+  "project.page.funder": "Financiadores",
 
-	// "search.filters.filter.namedresourcetype.placeholder": "Status",
-	"search.filters.filter.namedresourcetype.placeholder": "Estado",
+  // "project.page.id": "ID",
+  "project.page.id": "ID",
 
-	// "search.filters.filter.namedresourcetype.label": "Search status",
-	"search.filters.filter.namedresourcetype.label": "Estado de búsqueda",
+  // "project.page.keyword": "Keywords",
+  "project.page.keyword": "Palabras clave",
 
-	// "search.filters.filter.objectpeople.head": "People",
-	"search.filters.filter.objectpeople.head": "Gente",
+  // "project.page.status": "Status",
+  "project.page.status": "Estado",
 
-	// "search.filters.filter.objectpeople.placeholder": "People",
-	"search.filters.filter.objectpeople.placeholder": "Gente",
+  // "project.page.titleprefix": "Research Project: ",
+  "project.page.titleprefix": "Proyecto de Investigación:",
 
-	// "search.filters.filter.objectpeople.label": "Search people",
-	"search.filters.filter.objectpeople.label": "Busca gente",
+  // "project.search.results.head": "Project Search Results",
+  "project.search.results.head": "Resultados de búsqueda de proyectos",
 
-	// "search.filters.filter.organizationAddressCountry.head": "Country",
-	"search.filters.filter.organizationAddressCountry.head": "País",
+  // "project-relationships.search.results.head": "Project Search Results",
+  "project-relationships.search.results.head": "Resultados de búsqueda de proyectos",
 
-	// "search.filters.filter.organizationAddressCountry.placeholder": "Country",
-	"search.filters.filter.organizationAddressCountry.placeholder": "País",
 
-	// "search.filters.filter.organizationAddressCountry.label": "Search country",
-	"search.filters.filter.organizationAddressCountry.label": "País de búsqueda",
 
-	// "search.filters.filter.organizationAddressLocality.head": "City",
-	"search.filters.filter.organizationAddressLocality.head": "Ciudad",
+  // "publication.listelement.badge": "Publication",
+  "publication.listelement.badge": "Publicación",
 
-	// "search.filters.filter.organizationAddressLocality.placeholder": "City",
-	"search.filters.filter.organizationAddressLocality.placeholder": "Ciudad",
+  // "publication.page.description": "Description",
+  "publication.page.description": "Descripción",
 
-	// "search.filters.filter.organizationAddressLocality.label": "Search city",
-	"search.filters.filter.organizationAddressLocality.label": "Buscar ciudad",
+  // "publication.page.edit": "Edit this item",
+  "publication.page.edit": "Editar este ítem",
 
-	// "search.filters.filter.organizationFoundingDate.head": "Date Founded",
-	"search.filters.filter.organizationFoundingDate.head": "Fecha de fundación",
+  // "publication.page.journal-issn": "Journal ISSN",
+  "publication.page.journal-issn": "ISSN de la revista",
 
-	// "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
-	"search.filters.filter.organizationFoundingDate.placeholder": "Fecha de fundación",
+  // "publication.page.journal-title": "Journal Title",
+  "publication.page.journal-title": "Título de la revista",
 
-	// "search.filters.filter.organizationFoundingDate.label": "Search date founded",
-	"search.filters.filter.organizationFoundingDate.label": "Fecha de búsqueda fundada",
+  // "publication.page.publisher": "Publisher",
+  "publication.page.publisher": "Editor",
 
-	// "search.filters.filter.scope.head": "Scope",
-	"search.filters.filter.scope.head": "Alcance",
+  // "publication.page.titleprefix": "Publication: ",
+  "publication.page.titleprefix": "Publicación:",
 
-	// "search.filters.filter.scope.placeholder": "Scope filter",
-	"search.filters.filter.scope.placeholder": "Filtro de alcance",
+  // "publication.page.volume-title": "Volume Title",
+  "publication.page.volume-title": "Título del volumen",
 
-	// "search.filters.filter.scope.label": "Search scope filter",
-	"search.filters.filter.scope.label": "Filtro de alcance de búsqueda",
+  // "publication.search.results.head": "Publication Search Results",
+  "publication.search.results.head": "Resultados de la búsqueda de publicaciones",
 
-	// "search.filters.filter.show-less": "Collapse",
-	"search.filters.filter.show-less": "Colapso",
+  // "publication-relationships.search.results.head": "Publication Search Results",
+  "publication-relationships.search.results.head": "Resultados de la búsqueda de publicaciones",
 
-	// "search.filters.filter.show-more": "Show more",
-	"search.filters.filter.show-more": "Mostrar más",
+  // "publication.search.title": "Publication Search",
+  "publication.search.title": "Búsqueda de publicaciones",
 
-	// "search.filters.filter.subject.head": "Subject",
-	"search.filters.filter.subject.head": "Tema",
 
-	// "search.filters.filter.subject.placeholder": "Subject",
-	"search.filters.filter.subject.placeholder": "Tema",
+  // "media-viewer.next": "Next",
+  "media-viewer.next": "Siguiente",
 
-	// "search.filters.filter.subject.label": "Search subject",
-	"search.filters.filter.subject.label": "Asunto de búsqueda",
+  // "media-viewer.previous": "Previous",
+  "media-viewer.previous": "Anterior",
 
-	// "search.filters.filter.submitter.head": "Submitter",
-	"search.filters.filter.submitter.head": "Remitente",
+  // "media-viewer.playlist": "Playlist",
+  "media-viewer.playlist": "Lista de reproducción",
 
-	// "search.filters.filter.submitter.placeholder": "Submitter",
-	"search.filters.filter.submitter.placeholder": "Remitente",
 
-	// "search.filters.filter.submitter.label": "Search submitter",
-	"search.filters.filter.submitter.label": "Remitente de búsqueda",
+  // "register-email.title": "New user registration",
+  "register-email.title": "Registro de nuevo usuario",
 
+  // "register-page.create-profile.header": "Create Profile",
+  "register-page.create-profile.header": "Crear perfil",
 
+  // "register-page.create-profile.identification.header": "Identify",
+  "register-page.create-profile.identification.header": "Identificar",
 
-	// "search.filters.entityType.JournalIssue": "Journal Issue",
-	"search.filters.entityType.JournalIssue": "Número de la revista",
+  // "register-page.create-profile.identification.email": "Email Address",
+  "register-page.create-profile.identification.email": "Dirección de correo electrónico",
 
-	// "search.filters.entityType.JournalVolume": "Journal Volume",
-	"search.filters.entityType.JournalVolume": "Volumen de la revista",
+  // "register-page.create-profile.identification.first-name": "First Name *",
+  "register-page.create-profile.identification.first-name": "Nombre *",
 
-	// "search.filters.entityType.OrgUnit": "Organizational Unit",
-	"search.filters.entityType.OrgUnit": "Unidad organizacional",
+  // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
+  "register-page.create-profile.identification.first-name.error": "Por favor introduzca Nombre",
 
-	// "search.filters.has_content_in_original_bundle.true": "Yes",
-	"search.filters.has_content_in_original_bundle.true": "sí",
+  // "register-page.create-profile.identification.last-name": "Last Name *",
+  "register-page.create-profile.identification.last-name": "Apellido *",
 
-	// "search.filters.has_content_in_original_bundle.false": "No",
-	"search.filters.has_content_in_original_bundle.false": "No",
+  // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
+  "register-page.create-profile.identification.last-name.error": "Por favor introduzca Apellido",
 
-	// "search.filters.discoverable.true": "No",
-	"search.filters.discoverable.true": "No",
+  // "register-page.create-profile.identification.contact": "Contact Telephone",
+  "register-page.create-profile.identification.contact": "Teléfono de contacto",
 
-	// "search.filters.discoverable.false": "Yes",
-	"search.filters.discoverable.false": "sí",
+  // "register-page.create-profile.identification.language": "Language",
+  "register-page.create-profile.identification.language": "Idioma",
 
-	// "search.filters.withdrawn.true": "Yes",
-	"search.filters.withdrawn.true": "sí",
+  // "register-page.create-profile.security.header": "Security",
+  "register-page.create-profile.security.header": "Seguridad",
 
-	// "search.filters.withdrawn.false": "No",
-	"search.filters.withdrawn.false": "No",
+  // "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": "Introduzca una contraseña en el cuadro siguiente y confírmela escribiéndola nuevamente en el segundo cuadro. Debe tener al menos seis caracteres.",
 
+  // "register-page.create-profile.security.label.password": "Password *",
+  "register-page.create-profile.security.label.password": "Contraseña *",
 
-	// "search.filters.head": "Filters",
-	"search.filters.head": "Filtros",
+  // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
+  "register-page.create-profile.security.label.passwordrepeat": "Rescriba para confirmar *",
 
-	// "search.filters.reset": "Reset filters",
-	"search.filters.reset": "Restablecer filtros",
+  // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
+  "register-page.create-profile.security.error.empty-password": "Ingrese una contraseña en el cuadro a continuación.",
 
-	// "search.filters.search.submit": "Submit",
-	"search.filters.search.submit": "Enviar",
+  // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
+  "register-page.create-profile.security.error.matching-passwords": "Las contraseñas no coinciden.",
 
+  // "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": "La contraseña debe tener al menos 6 caracteres.",
 
+  // "register-page.create-profile.submit": "Complete Registration",
+  "register-page.create-profile.submit": "Registro completo",
 
-	// "search.form.search": "Search",
-	"search.form.search": "Buscar",
+  // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
+  "register-page.create-profile.submit.error.content": "Se produjo un error al registrar un nuevo usuario.",
 
-	// "search.form.search_dspace": "All repository",
-	"search.form.search_dspace": "Todo el repositorio",
+  // "register-page.create-profile.submit.error.head": "Registration failed",
+  "register-page.create-profile.submit.error.head": "Registro fallido",
 
+  // "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.",
+  "register-page.create-profile.submit.success.content": "El registro fue exitoso. Ha iniciado sesión como el usuario creado.",
 
+  // "register-page.create-profile.submit.success.head": "Registration completed",
+  "register-page.create-profile.submit.success.head": "Registro completado",
 
-	// "search.results.head": "Search Results",
-	"search.results.head": "Resultados de la búsqueda",
 
-	// "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
-	"search.results.no-results": "Su búsqueda no produjo resultados. ¿Tiene problemas para encontrar lo que busca? Intenta poner",
+  // "register-page.registration.header": "New user registration",
+  "register-page.registration.header": "Registro de nuevo usuario",
 
-	// "search.results.no-results-link": "quotes around it",
-	"search.results.no-results-link": "citas a su alrededor",
+  // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+  "register-page.registration.info": "Registre una cuenta para suscribirse a colecciones y recibir actualizaciones por correo electrónico, así como enviar nuevos ítems a DSpace.",
 
-	// "search.results.empty": "Your search returned no results.",
-	"search.results.empty": "Su búsqueda no produjo resultados.",
+  // "register-page.registration.email": "Email Address *",
+  "register-page.registration.email": "Dirección de correo electrónico *",
 
+  // "register-page.registration.email.error.required": "Please fill in an email address",
+  "register-page.registration.email.error.required": "Por favor, introduzca una dirección de correo electrónico",
 
-	// "default.search.results.head": "Search Results",
-	"default.search.results.head": "Resultados de la búsqueda",
+  // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
+  "register-page.registration.email.error.pattern": "Por favor, introduzca una dirección de correo electrónico válida",
 
+  // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
+  "register-page.registration.email.hint": "Esta dirección será verificada y utilizada como su nombre de inicio de sesión.",
 
-	// "search.sidebar.close": "Back to results",
-	"search.sidebar.close": "Volver a resultados",
+  // "register-page.registration.submit": "Register",
+  "register-page.registration.submit": "Registrarse",
 
-	// "search.sidebar.filters.title": "Filters",
-	"search.sidebar.filters.title": "Filtros",
+  // "register-page.registration.success.head": "Verification email sent",
+  "register-page.registration.success.head": "El mensaje de verificación ha sido enviado",
 
-	// "search.sidebar.open": "Search Tools",
-	"search.sidebar.open": "Herramientas de búsqueda",
+  // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "register-page.registration.success.content": "Se envió un correo electrónico a {{ email }} que contiene una URL especial y más instrucciones.",
 
-	// "search.sidebar.results": "results",
-	"search.sidebar.results": "resultados",
+  // "register-page.registration.error.head": "Error when trying to register email",
+  "register-page.registration.error.head": "Error al intentar registrar el correo electrónico",
 
-	// "search.sidebar.settings.rpp": "Results per page",
-	"search.sidebar.settings.rpp": "resultados por página",
+  // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  "register-page.registration.error.content": "Se produjo un error al registrar la siguiente dirección de correo electrónico: {{ email }}",
 
-	// "search.sidebar.settings.sort-by": "Sort By",
-	"search.sidebar.settings.sort-by": "Ordenar por",
 
-	// "search.sidebar.settings.title": "Settings",
-	"search.sidebar.settings.title": "Ajustes",
 
+  // "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
+  "relationships.add.error.relationship-type.content": "No se pudo encontrar una coincidencia adecuada para el tipo de relación {{ type }} entre los dos artículos",
 
+  // "relationships.add.error.server.content": "The server returned an error",
+  "relationships.add.error.server.content": "El servidor devolvió un error",
 
-	// "search.view-switch.show-detail": "Show detail",
-	"search.view-switch.show-detail": "Mostrar detalle",
+  // "relationships.add.error.title": "Unable to add relationship",
+  "relationships.add.error.title": "No se puede agregar una relación",
 
-	// "search.view-switch.show-grid": "Show as grid",
-	"search.view-switch.show-grid": "Mostrar como cuadrícula",
+  // "relationships.isAuthorOf": "Authors",
+  "relationships.isAuthorOf": "Autores",
 
-	// "search.view-switch.show-list": "Show as list",
-	"search.view-switch.show-list": "Mostrar como lista",
+  // "relationships.isAuthorOf.Person": "Authors (persons)",
+  "relationships.isAuthorOf.Person": "Autores (personas)",
 
+  // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
+  "relationships.isAuthorOf.OrgUnit": "Autores (unidades organizativas)",
 
+  // "relationships.isIssueOf": "Journal Issues",
+  "relationships.isIssueOf": "Problemas de la revista",
 
-	// "sorting.ASC": "Ascending",
-	"sorting.ASC": "Ascendente",
+  // "relationships.isJournalIssueOf": "Journal Issue",
+  "relationships.isJournalIssueOf": "Número de la revista",
 
-	// "sorting.DESC": "Descending",
-	"sorting.DESC": "Descendente",
+  // "relationships.isJournalOf": "Journals",
+  "relationships.isJournalOf": "Revistas",
 
-	// "sorting.dc.title.ASC": "Title Ascending",
-	"sorting.dc.title.ASC": "Título Ascendente",
+  // "relationships.isOrgUnitOf": "Organizational Units",
+  "relationships.isOrgUnitOf": "Unidades organizativas",
 
-	// "sorting.dc.title.DESC": "Title Descending",
-	"sorting.dc.title.DESC": "Título Descendente",
+  // "relationships.isPersonOf": "Authors",
+  "relationships.isPersonOf": "Autores",
 
-	// "sorting.score.ASC": "Least Relevant",
-	"sorting.score.ASC": "Menos relevante",
+  // "relationships.isProjectOf": "Research Projects",
+  "relationships.isProjectOf": "Proyectos de investigación",
 
-	// "sorting.score.DESC": "Most Relevant",
-	"sorting.score.DESC": "Lo más relevante",
+  // "relationships.isPublicationOf": "Publications",
+  "relationships.isPublicationOf": "Publicaciones",
 
-	// "sorting.dc.date.issued.ASC": "Date Issued Ascending",
-	"sorting.dc.date.issued.ASC": "Fecha de emisión Ascendente",
+  // "relationships.isPublicationOfJournalIssue": "Articles",
+  "relationships.isPublicationOfJournalIssue": "Artículos",
 
-	// "sorting.dc.date.issued.DESC": "Date Issued Descending",
-	"sorting.dc.date.issued.DESC": "Fecha de emisión Descendente",
+  // "relationships.isSingleJournalOf": "Journal",
+  "relationships.isSingleJournalOf": "diario",
 
-	// "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
-	"sorting.dc.date.accessioned.ASC": "Fecha de adhesión Ascendente",
+  // "relationships.isSingleVolumeOf": "Journal Volume",
+  "relationships.isSingleVolumeOf": "Volumen de la revista",
 
-	// "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
-	"sorting.dc.date.accessioned.DESC": "Fecha de adhesión Descendente",
+  // "relationships.isVolumeOf": "Journal Volumes",
+  "relationships.isVolumeOf": "Volúmenes de revistas",
 
-	// "sorting.lastModified.ASC": "Last modified Ascending",
-	"sorting.lastModified.ASC": "Última modificación Ascendente",
+  // "relationships.isContributorOf": "Contributors",
+  "relationships.isContributorOf": "Colaboradores",
 
-	// "sorting.lastModified.DESC": "Last modified Descending",
-	"sorting.lastModified.DESC": "Última modificación Descendente",
+  // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
+  "relationships.isContributorOf.OrgUnit": "Colaborador (Unidad organizativa)",
 
+  // "relationships.isContributorOf.Person": "Contributor",
+  "relationships.isContributorOf.Person": "Contribuyente",
 
-	// "statistics.title": "Statistics",
-	"statistics.title": "Estadísticas",
+  // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
+  "relationships.isFundingAgencyOf.OrgUnit": "Financiador",
 
-	// "statistics.header": "Statistics for {{ scope }}",
-	"statistics.header": "Estadísticas de {{ scope }}",
 
-	// "statistics.breadcrumbs": "Statistics",
-	"statistics.breadcrumbs": "Estadísticas",
+  // "repository.image.logo": "Repository logo",
+  "repository.image.logo": "Logotipo del repositorio",
 
-	// "statistics.page.no-data": "No data available",
-	"statistics.page.no-data": "Datos no disponibles",
+  // "repository.title.prefix": "DSpace Angular :: ",
+  "repository.title.prefix": "DSpace Angular ::",
 
-	// "statistics.table.no-data": "No data available",
-	"statistics.table.no-data": "Datos no disponibles",
+  // "repository.title.prefixDSpace": "DSpace Angular ::",
+  "repository.title.prefixDSpace": "DSpace Angular ::",
 
-	// "statistics.table.title.TotalVisits": "Total visits",
-	"statistics.table.title.TotalVisits": "Visitas totales",
 
-	// "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
-	"statistics.table.title.TotalVisitsPerMonth": "Visitas totales por mes",
+  // "resource-policies.add.button": "Add",
+  "resource-policies.add.button": "Agregar",
 
-	// "statistics.table.title.TotalDownloads": "File Visits",
-	"statistics.table.title.TotalDownloads": "Visitas de archivo",
+  // "resource-policies.add.for.": "Add a new policy",
+  "resource-policies.add.for.": "Agregar una nueva política",
 
-	// "statistics.table.title.TopCountries": "Top country views",
-	"statistics.table.title.TopCountries": "Vistas principales del país",
+  // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
+  "resource-policies.add.for.bitstream": "Agregar una nueva política de Archivo",
 
-	// "statistics.table.title.TopCities": "Top city views",
-	"statistics.table.title.TopCities": "Mejores vistas de la ciudad",
+  // "resource-policies.add.for.bundle": "Add a new Bundle policy",
+  "resource-policies.add.for.bundle": "Agregar una nueva política de bloque",
 
-	// "statistics.table.header.views": "Views",
-	"statistics.table.header.views": "Puntos de vista",
+  // "resource-policies.add.for.item": "Add a new Item policy",
+  "resource-policies.add.for.item": "Agregar una nueva política de artículos",
 
+  // "resource-policies.add.for.community": "Add a new Community policy",
+  "resource-policies.add.for.community": "Agregar una nueva política comunitaria",
 
+  // "resource-policies.add.for.collection": "Add a new Collection policy",
+  "resource-policies.add.for.collection": "Agregar una nueva política de colección",
 
-	// "submission.edit.breadcrumbs": "Edit Submission",
-	"submission.edit.breadcrumbs": "Editar envío",
+  // "resource-policies.create.page.heading": "Create new resource policy for ",
+  "resource-policies.create.page.heading": "Crear una nueva política de recursos para",
 
-	// "submission.edit.title": "Edit Submission",
-	"submission.edit.title": "Editar envío",
+  // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
+  "resource-policies.create.page.failure.content": "Se produjo un error al crear la política de recursos.",
 
-	// "submission.general.cancel": "Cancel",
-	"submission.general.cancel": "Cancelar",
+  // "resource-policies.create.page.success.content": "Operation successful",
+  "resource-policies.create.page.success.content": "Operación exitosa",
 
-	// "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
-	"submission.general.cannot_submit": "No tiene el privilegio de realizar un nuevo envío.",
+  // "resource-policies.create.page.title": "Create new resource policy",
+  "resource-policies.create.page.title": "Crear nueva política de recursos",
 
-	// "submission.general.deposit": "Deposit",
-	"submission.general.deposit": "Depositar",
+  // "resource-policies.delete.btn": "Delete selected",
+  "resource-policies.delete.btn": "Eliminar seleccionado",
 
-	// "submission.general.discard.confirm.cancel": "Cancel",
-	"submission.general.discard.confirm.cancel": "Cancelar",
+  // "resource-policies.delete.btn.title": "Delete selected resource policies",
+  "resource-policies.delete.btn.title": "Eliminar las políticas de recursos seleccionadas",
 
-	// "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
-	"submission.general.discard.confirm.info": "Esta operación no se puede deshacer. ",
+  // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
+  "resource-policies.delete.failure.content": "Se produjo un error al eliminar las políticas de recursos seleccionadas.",
 
-	// "submission.general.discard.confirm.submit": "Yes, I'm sure",
-	"submission.general.discard.confirm.submit": "Sí estoy seguro",
+  // "resource-policies.delete.success.content": "Operation successful",
+  "resource-policies.delete.success.content": "Operación exitosa",
 
-	// "submission.general.discard.confirm.title": "Discard submission",
-	"submission.general.discard.confirm.title": "Descartar envío",
+  // "resource-policies.edit.page.heading": "Edit resource policy ",
+  "resource-policies.edit.page.heading": "Editar la política de recursos",
 
-	// "submission.general.discard.submit": "Discard",
-	"submission.general.discard.submit": "Descarte",
+  // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
+  "resource-policies.edit.page.failure.content": "Se produjo un error al editar la política de recursos.",
 
-	// "submission.general.info.saved": "Saved",
-	"submission.general.info.saved": "Salvado",
+  // "resource-policies.edit.page.target-failure.content": "An error occurred while editing the target (ePerson or group) of the resource policy.",
+  "resource-policies.edit.page.target-failure.content": "Se produjo un error al editar el destinatario (ePersona o grupo) de la política de recursos.",
 
-	// "submission.general.info.pending-changes": "Unsaved changes",
-	"submission.general.info.pending-changes": "Cambios no guardados",
+  // "resource-policies.edit.page.other-failure.content": "An error occurred while editing the resource policy. The target (ePerson or group) has been successfully updated.",
+  "resource-policies.edit.page.other-failure.content": "Se produjo un error al editar la política de recursos. El destinatario (Grupo o ePersona) ha sido actualizado con éxito ",
 
-	// "submission.general.save": "Save",
-	"submission.general.save": "Guardar",
+  // "resource-policies.edit.page.success.content": "Operation successful",
+  "resource-policies.edit.page.success.content": "Operación exitosa",
 
-	// "submission.general.save-later": "Save for later",
-	"submission.general.save-later": "Guardar para más adelante",
+  // "resource-policies.edit.page.title": "Edit resource policy",
+  "resource-policies.edit.page.title": "Editar la política de recursos",
 
+  // "resource-policies.form.action-type.label": "Select the action type",
+  "resource-policies.form.action-type.label": "Seleccione el tipo de acción",
 
-	// "submission.import-external.page.title": "Import metadata from an external source",
-	"submission.import-external.page.title": "Importar metadatos de una fuente externa",
+  // "resource-policies.form.action-type.required": "You must select the resource policy action.",
+  "resource-policies.form.action-type.required": "Debe seleccionar la acción de la política de recursos.",
 
-	// "submission.import-external.title": "Import metadata from an external source",
-	"submission.import-external.title": "Importar metadatos de una fuente externa",
+  // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
+  "resource-policies.form.eperson-group-list.label": "La ePersona o grupo al que se le otorgará el permiso",
 
-	// "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.",
-	"submission.import-external.page.hint": "Ingrese una consulta arriba para buscar artículos de la web para importarlos a DSpace.",
+  // "resource-policies.form.eperson-group-list.select.btn": "Select",
+  "resource-policies.form.eperson-group-list.select.btn": "Seleccione",
 
-	// "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
-	"submission.import-external.back-to-my-dspace": "Volver a Mi DSpace",
+  // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
+  "resource-policies.form.eperson-group-list.tab.eperson": "Buscar una ePersona",
 
-	// "submission.import-external.search.placeholder": "Search the external source",
-	"submission.import-external.search.placeholder": "Buscar la fuente externa",
+  // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
+  "resource-policies.form.eperson-group-list.tab.group": "Buscar un grupo",
 
-	// "submission.import-external.search.button": "Search",
-	"submission.import-external.search.button": "Buscar",
+  // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
+  "resource-policies.form.eperson-group-list.table.headers.action": "Acción",
 
-	// "submission.import-external.search.button.hint": "Write some words to search",
-	"submission.import-external.search.button.hint": "Escribe algunas palabras para buscar",
+  // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
+  "resource-policies.form.eperson-group-list.table.headers.id": "ID",
 
-	// "submission.import-external.search.source.hint": "Pick an external source",
-	"submission.import-external.search.source.hint": "Elija una fuente externa",
+  // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
+  "resource-policies.form.eperson-group-list.table.headers.name": "Nombre",
 
-	// "submission.import-external.source.arxiv": "arXiv",
-	"submission.import-external.source.arxiv": "arXiv",
+  // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
+  "resource-policies.form.eperson-group-list.modal.header": "No puede cambiarse el tipo",
 
-	// "submission.import-external.source.loading": "Loading ...",
-	"submission.import-external.source.loading": "Cargando ...",
+  // "resource-policies.form.eperson-group-list.modal.text1.toGroup": "It is not possible to replace an ePerson with a group.",
+  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "No es posible cambiar una ePersona por un grupo.",
 
-	// "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-	"submission.import-external.source.sherpaJournal": "Revistas SHERPA",
+  // "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "It is not possible to replace a group with an ePerson.",
+  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "No es posible cambiar un grupo por una ePersona.",
 
-	// "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
-	"submission.import-external.source.sherpaJournalIssn": "Revistas SHERPA por ISSN",
+  // "resource-policies.form.eperson-group-list.modal.text2": "Delete the current resource policy and create a new one with the desired type.",
+  "resource-policies.form.eperson-group-list.modal.text2": "Borre la  política de recursos actual y cree una nueva con el tipo deseado.",
 
-	// "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-	"submission.import-external.source.sherpaPublisher": "Editores SHERPA",
+  // "resource-policies.form.eperson-group-list.modal.close": "Ok",
+  "resource-policies.form.eperson-group-list.modal.close": "Ok",
 
-	// "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
-	"submission.import-external.source.openAIREFunding": "Financiamiento de la API de OpenAIRE",
+  // "resource-policies.form.date.end.label": "End Date",
+  "resource-policies.form.date.end.label": "Fecha de finalización",
 
-	// "submission.import-external.source.orcid": "ORCID",
-	"submission.import-external.source.orcid": "ORCID",
+  // "resource-policies.form.date.start.label": "Start Date",
+  "resource-policies.form.date.start.label": "Fecha de inicio",
 
-	// "submission.import-external.source.pubmed": "Pubmed",
-	"submission.import-external.source.pubmed": "Pubmed",
+  // "resource-policies.form.description.label": "Description",
+  "resource-policies.form.description.label": "Descripción",
 
-	// "submission.import-external.source.lcname": "Library of Congress Names",
-	"submission.import-external.source.lcname": "Nombres de la Biblioteca del Congreso",
+  // "resource-policies.form.name.label": "Name",
+  "resource-policies.form.name.label": "Nombre",
 
-	// "submission.import-external.preview.title": "Item Preview",
-	"submission.import-external.preview.title": "Vista previa del artículo",
+  // "resource-policies.form.policy-type.label": "Select the policy type",
+  "resource-policies.form.policy-type.label": "Seleccione el tipo de política",
 
-	// "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.",
-	"submission.import-external.preview.subtitle": "Los siguientes metadatos se importaron de una fuente externa. Se completará previamente cuando inicie el envío.",
+  // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
+  "resource-policies.form.policy-type.required": "Debe seleccionar el tipo de política de recursos.",
 
-	// "submission.import-external.preview.button.import": "Start submission",
-	"submission.import-external.preview.button.import": "Iniciar envío",
+  // "resource-policies.table.headers.action": "Action",
+  "resource-policies.table.headers.action": "Acción",
 
-	// "submission.import-external.preview.error.import.title": "Submission error",
-	"submission.import-external.preview.error.import.title": "Error de envío",
+  // "resource-policies.table.headers.date.end": "End Date",
+  "resource-policies.table.headers.date.end": "Fecha final",
 
-	// "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
-	"submission.import-external.preview.error.import.body": "Se produce un error durante el proceso de importación de la entrada de fuente externa.",
+  // "resource-policies.table.headers.date.start": "Start Date",
+  "resource-policies.table.headers.date.start": "Fecha de inicio",
 
-	// "submission.sections.describe.relationship-lookup.close": "Close",
-	"submission.sections.describe.relationship-lookup.close": "Cerrar",
+  // "resource-policies.table.headers.edit": "Edit",
+  "resource-policies.table.headers.edit": "Editar",
 
-	// "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
-	"submission.sections.describe.relationship-lookup.external-source.added": "Entrada local agregada con éxito a la selección",
+  // "resource-policies.table.headers.edit.group": "Edit group",
+  "resource-policies.table.headers.edit.group": "Editar grupo",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author",
-	"submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Importar autor remoto",
+  // "resource-policies.table.headers.edit.policy": "Edit policy",
+  "resource-policies.table.headers.edit.policy": "Editar política",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal",
-	"submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Importar diario remoto",
+  // "resource-policies.table.headers.eperson": "EPerson",
+  "resource-policies.table.headers.eperson": "EPersona",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue",
-	"submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Importar problema de diario remoto",
+  // "resource-policies.table.headers.group": "Group",
+  "resource-policies.table.headers.group": "Grupo",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
-	"submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Importar volumen de diario remoto",
+  // "resource-policies.table.headers.id": "ID",
+  "resource-policies.table.headers.id": "ID",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
-	"submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Proyecto",
+  // "resource-policies.table.headers.name": "Name",
+  "resource-policies.table.headers.name": "Nombre",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "New Entity Added!",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "¡Nueva entidad agregada!",
+  // "resource-policies.table.headers.policyType": "type",
+  "resource-policies.table.headers.policyType": "Tipo",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Proyecto",
+  // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
+  "resource-policies.table.headers.title.for.bitstream": "Políticas para Archivos",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Funding OpenAIRE API",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Financiamiento de la API de OpenAIRE",
+  // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
+  "resource-policies.table.headers.title.for.bundle": "Políticas para el bloque",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Importar autor remoto",
+  // "resource-policies.table.headers.title.for.item": "Policies for Item",
+  "resource-policies.table.headers.title.for.item": "Políticas para el ítem",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Autor local agregado exitosamente a la selección",
+  // "resource-policies.table.headers.title.for.community": "Policies for Community",
+  "resource-policies.table.headers.title.for.community": "Políticas para la comunidad",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Successfully imported and added external author to the selection",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Autor externo importado y agregado exitosamente a la selección",
+  // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
+  "resource-policies.table.headers.title.for.collection": "Políticas para la colección",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Autoridad",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Importar como una nueva entrada de autoridad local",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancelar",
+  // "search.description": "",
+  "search.description": "",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Select a collection to import new entries to",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Seleccione una colección para importar nuevas entradas",
+  // "search.switch-configuration.title": "Show",
+  "search.switch-configuration.title": "Mostrar",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entidades",
+  // "search.title": "Search",
+  "search.title": "Buscar",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Importar como una nueva entidad local",
+  // "search.breadcrumbs": "Search",
+  "search.breadcrumbs": "Buscar",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importar desde LC Name",
+  // "search.search-form.placeholder": "Search the repository ...",
+  "search.search-form.placeholder": "Buscar en el repositorio ...",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importando desde ORCID",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importar desde Sherpa Journal",
+  // "search.filters.applied.f.author": "Author",
+  "search.filters.applied.f.author": "Autor",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importar desde Sherpa Publisher",
+  // "search.filters.applied.f.dateIssued.max": "End date",
+  "search.filters.applied.f.dateIssued.max": "Fecha de finalización",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importar desde PubMed",
+  // "search.filters.applied.f.dateIssued.min": "Start date",
+  "search.filters.applied.f.dateIssued.min": "Fecha de inicio",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importando desde arXiv",
+  // "search.filters.applied.f.dateSubmitted": "Date submitted",
+  "search.filters.applied.f.dateSubmitted": "Fecha de envío",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Importar",
+  // "search.filters.applied.f.discoverable": "Non-discoverable",
+  "search.filters.applied.f.discoverable": "Privado",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Importar diario remoto",
+  // "search.filters.applied.f.entityType": "Item Type",
+  "search.filters.applied.f.entityType": "Tipo de ítem",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Successfully added local journal to the selection",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Revista local agregada con éxito a la selección",
+  // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
+  "search.filters.applied.f.has_content_in_original_bundle": "Tiene archivos",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Successfully imported and added external journal to the selection",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Revista externa importada y agregada con éxito a la selección",
+  // "search.filters.applied.f.itemtype": "Type",
+  "search.filters.applied.f.itemtype": "Tipo",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Importar problema de diario remoto",
+  // "search.filters.applied.f.namedresourcetype": "Status",
+  "search.filters.applied.f.namedresourcetype": "Estado",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Se agregó con éxito la edición de la revista local a la selección.",
+  // "search.filters.applied.f.subject": "Subject",
+  "search.filters.applied.f.subject": "Tema",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Se importó con éxito y se agregó una edición de diario externo a la selección.",
+  // "search.filters.applied.f.submitter": "Submitter",
+  "search.filters.applied.f.submitter": "Remitente",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Importar volumen de diario remoto",
+  // "search.filters.applied.f.jobTitle": "Job Title",
+  "search.filters.applied.f.jobTitle": "Título profesional",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Successfully added local journal volume to the selection",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Se agregó con éxito el volumen de la revista local a la selección.",
+  // "search.filters.applied.f.birthDate.max": "End birth date",
+  "search.filters.applied.f.birthDate.max": "Fecha de nacimiento, final ",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Successfully imported and added external journal volume to the selection",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Se importó y agregó con éxito un volumen de diario externo a la selección",
+  // "search.filters.applied.f.birthDate.min": "Start birth date",
+  "search.filters.applied.f.birthDate.min": "Fecha de nacimiento, inicial",
 
-	// "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Seleccione una coincidencia local:",
+  // "search.filters.applied.f.withdrawn": "Withdrawn",
+  "search.filters.applied.f.withdrawn": "Retirado",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
-	"submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deseleccionar todo",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
-	"submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deseleccionar página",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
-	"submission.sections.describe.relationship-lookup.search-tab.loading": "Cargando...",
+  // "search.filters.filter.author.head": "Author",
+  "search.filters.filter.author.head": "Autor",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
-	"submission.sections.describe.relationship-lookup.search-tab.placeholder": "Consulta de busqueda",
+  // "search.filters.filter.author.placeholder": "Author name",
+  "search.filters.filter.author.placeholder": "Nombre de autor",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-	"submission.sections.describe.relationship-lookup.search-tab.search": "Ir",
+  // "search.filters.filter.author.label": "Search author name",
+  "search.filters.filter.author.label": "Buscar por nombre de autor",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
-	"submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Buscar...",
+  // "search.filters.filter.birthDate.head": "Birth Date",
+  "search.filters.filter.birthDate.head": "Fecha de nacimiento",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
-	"submission.sections.describe.relationship-lookup.search-tab.select-all": "Seleccionar todo",
+  // "search.filters.filter.birthDate.placeholder": "Birth Date",
+  "search.filters.filter.birthDate.placeholder": "Fecha de nacimiento",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
-	"submission.sections.describe.relationship-lookup.search-tab.select-page": "Seleccionar página",
+  // "search.filters.filter.birthDate.label": "Search birth date",
+  "search.filters.filter.birthDate.label": "Buscar fecha de nacimiento",
 
-	// "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
-	"submission.sections.describe.relationship-lookup.selected": "Artículos {{ size }} seleccionados",
+  // "search.filters.filter.collapse": "Collapse filter",
+  "search.filters.filter.collapse": "Contraer filtro",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Autores locales ({{ count }})",
+  // "search.filters.filter.creativeDatePublished.head": "Date Published",
+  "search.filters.filter.creativeDatePublished.head": "Fecha de publicación",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Revistas locales ({{ count }})",
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Proyectos locales ({{ count }})",
+  // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
+  "search.filters.filter.creativeDatePublished.placeholder": "Fecha de publicación",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Publicaciones locales ({{ count }})",
+  // "search.filters.filter.creativeDatePublished.label": "Search date published",
+  "search.filters.filter.creativeDatePublished.label": "Buscar por fecha de publicación",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Autores locales ({{ count }})",
+  // "search.filters.filter.creativeWorkEditor.head": "Editor",
+  "search.filters.filter.creativeWorkEditor.head": "Editor",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Unidades organizativas locales ({{ count }})",
+  // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
+  "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Paquetes de datos locales ({{ count }})",
+  // "search.filters.filter.creativeWorkEditor.label": "Search editor",
+  "search.filters.filter.creativeWorkEditor.label": "Búsqueda de Editor",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Archivos de datos locales ({{ count }})",
+  // "search.filters.filter.creativeWorkKeywords.head": "Subject",
+  "search.filters.filter.creativeWorkKeywords.head": "Materias",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Revistas locales ({{ count }})",
+  // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "Materias",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Problemas de revistas locales ({{ count }})",
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Problemas de revistas locales ({{ count }})",
+  // "search.filters.filter.creativeWorkKeywords.label": "Search subject",
+  "search.filters.filter.creativeWorkKeywords.label": "Búsqueda de Materias",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Volúmenes de revistas locales ({{ count }})",
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Volúmenes de revistas locales ({{ count }})",
+  // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.head": "Editor",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
+  // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Editor",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Editores Sherpa ({{ count }})",
+  // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
+  "search.filters.filter.creativeWorkPublisher.label": "Búsqueda de Editor",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
+  // "search.filters.filter.dateIssued.head": "Date",
+  "search.filters.filter.dateIssued.head": "Fecha",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "Nombres LC ({{ count }})",
+  // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
+  "search.filters.filter.dateIssued.max.placeholder": "Fecha máxima",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
+  // "search.filters.filter.dateIssued.max.label": "End",
+  "search.filters.filter.dateIssued.max.label": "Fin",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
+  // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
+  "search.filters.filter.dateIssued.min.placeholder": "Fecha mínima",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Búsqueda de agencias de financiación",
+  // "search.filters.filter.dateIssued.min.label": "Start",
+  "search.filters.filter.dateIssued.min.label": "Comienzo",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Búsqueda de financiación",
+  // "search.filters.filter.dateSubmitted.head": "Date submitted",
+  "search.filters.filter.dateSubmitted.head": "Fecha de envío",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Búsqueda de unidades organizativas",
+  // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
+  "search.filters.filter.dateSubmitted.placeholder": "Fecha de envío",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Financiamiento de la API de OpenAIRE",
+  // "search.filters.filter.dateSubmitted.label": "Search date submitted",
+  "search.filters.filter.dateSubmitted.label": "Búsqueda de Fecha de envío",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Proyectos",
+  // "search.filters.filter.discoverable.head": "Non-discoverable",
+  "search.filters.filter.discoverable.head": "Privado",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Financiador del Proyecto",
+  // "search.filters.filter.withdrawn.head": "Withdrawn",
+  "search.filters.filter.withdrawn.head": "Retirado",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Financiamiento de la API de OpenAIRE",
+  // "search.filters.filter.entityType.head": "Item Type",
+  "search.filters.filter.entityType.head": "Tipo de ítem",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Proyecto",
+  // "search.filters.filter.entityType.placeholder": "Item Type",
+  "search.filters.filter.entityType.placeholder": "Tipo de ítem",
 
-	// "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
-	"submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Proyectos",
+  // "search.filters.filter.entityType.label": "Search item type",
+  "search.filters.filter.entityType.label": "Búsqueda de tipo de ítem",
 
-	// "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
-	"submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Financiador del Proyecto",
+  // "search.filters.filter.expand": "Expand filter",
+  "search.filters.filter.expand": "Expandir filtro",
 
+  // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
+  "search.filters.filter.has_content_in_original_bundle.head": "Tiene archivos",
 
+  // "search.filters.filter.itemtype.head": "Type",
+  "search.filters.filter.itemtype.head": "Tipo",
 
+  // "search.filters.filter.itemtype.placeholder": "Type",
+  "search.filters.filter.itemtype.placeholder": "Tipo",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
-	"submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Buscar...",
+  // "search.filters.filter.itemtype.label": "Search type",
+  "search.filters.filter.itemtype.label": "Búsqueda de Tipo",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
-	"submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Selección actual ({{ count }})",
+  // "search.filters.filter.jobTitle.head": "Job Title",
+  "search.filters.filter.jobTitle.head": "Puesto de trabajo",
 
-	// "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
-	"submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Problemas de la revista",
-	// "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
-	"submission.sections.describe.relationship-lookup.title.JournalIssue": "Problemas de la revista",
+  // "search.filters.filter.jobTitle.placeholder": "Job Title",
+  "search.filters.filter.jobTitle.placeholder": "Puesto de trabajo",
 
-	// "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
-	"submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Volúmenes de revistas",
-	// "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-	"submission.sections.describe.relationship-lookup.title.JournalVolume": "Volúmenes de revistas",
+  // "search.filters.filter.jobTitle.label": "Search job title",
+  "search.filters.filter.jobTitle.label": "Buscar por puesto de trabajo",
 
-	// "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
-	"submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Revistas",
+  // "search.filters.filter.knowsLanguage.head": "Known language",
+  "search.filters.filter.knowsLanguage.head": "Idioma conocido",
 
-	// "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
-	"submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Autores",
+  // "search.filters.filter.knowsLanguage.placeholder": "Known language",
+  "search.filters.filter.knowsLanguage.placeholder": "Idioma conocido",
 
-	// "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
-	"submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Agencia fundadora",
-	// "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-	"submission.sections.describe.relationship-lookup.title.Project": "Proyectos",
+  // "search.filters.filter.knowsLanguage.label": "Search known language",
+  "search.filters.filter.knowsLanguage.label": "Buscar por idioma conocido",
 
-	// "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
-	"submission.sections.describe.relationship-lookup.title.Publication": "Publicaciones",
+  // "search.filters.filter.namedresourcetype.head": "Status",
+  "search.filters.filter.namedresourcetype.head": "Estado",
 
-	// "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-	"submission.sections.describe.relationship-lookup.title.Person": "Autores",
+  // "search.filters.filter.namedresourcetype.placeholder": "Status",
+  "search.filters.filter.namedresourcetype.placeholder": "Estado",
 
-	// "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
-	"submission.sections.describe.relationship-lookup.title.OrgUnit": "Unidades organizativas",
+  // "search.filters.filter.namedresourcetype.label": "Search status",
+  "search.filters.filter.namedresourcetype.label": "Búsqueda por Estado",
 
-	// "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-	"submission.sections.describe.relationship-lookup.title.DataPackage": "Paquetes de datos",
+  // "search.filters.filter.objectpeople.head": "People",
+  "search.filters.filter.objectpeople.head": "Personas",
 
-	// "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
-	"submission.sections.describe.relationship-lookup.title.DataFile": "Archivos de información",
+  // "search.filters.filter.objectpeople.placeholder": "People",
+  "search.filters.filter.objectpeople.placeholder": "Personas",
 
-	// "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
-	"submission.sections.describe.relationship-lookup.title.Funding Agency": "Agencia fundadora",
+  // "search.filters.filter.objectpeople.label": "Search people",
+  "search.filters.filter.objectpeople.label": "Búsqueda de Personas",
 
-	// "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-	"submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Fondos",
+  // "search.filters.filter.organizationAddressCountry.head": "Country",
+  "search.filters.filter.organizationAddressCountry.head": "País",
 
-	// "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
-	"submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Unidad organizativa matriz",
+  // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
+  "search.filters.filter.organizationAddressCountry.placeholder": "País",
 
-	// "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
-	"submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Alternar menú desplegable",
+  // "search.filters.filter.organizationAddressCountry.label": "Search country",
+  "search.filters.filter.organizationAddressCountry.label": "Búsqueda de País",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
-	"submission.sections.describe.relationship-lookup.selection-tab.settings": "Ajustes",
+  // "search.filters.filter.organizationAddressLocality.head": "City",
+  "search.filters.filter.organizationAddressLocality.head": "Ciudad",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
-	"submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Su selección está actualmente vacía.",
+  // "search.filters.filter.organizationAddressLocality.placeholder": "City",
+  "search.filters.filter.organizationAddressLocality.placeholder": "Ciudad",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Autores seleccionados",
+  // "search.filters.filter.organizationAddressLocality.label": "Search city",
+  "search.filters.filter.organizationAddressLocality.label": "Búsqueda deciudad",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Revistas seleccionadas",
+  // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.head": "Fecha de fundación",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Volumen de la revista seleccionada",
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Proyectos seleccionados",
+  // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.placeholder": "Fecha de fundación",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Publicaciones Seleccionadas",
+  // "search.filters.filter.organizationFoundingDate.label": "Search date founded",
+  "search.filters.filter.organizationFoundingDate.label": "Búsqueda por Fecha de fundación",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Autores seleccionados",
+  // "search.filters.filter.scope.head": "Scope",
+  "search.filters.filter.scope.head": "Alcance",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Unidades organizativas seleccionadas",
+  // "search.filters.filter.scope.placeholder": "Scope filter",
+  "search.filters.filter.scope.placeholder": "Filtro de alcance",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Paquetes de datos seleccionados",
+  // "search.filters.filter.scope.label": "Search scope filter",
+  "search.filters.filter.scope.label": "Filtro de alcance de búsqueda",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Archivos de datos seleccionados",
+  // "search.filters.filter.show-less": "Collapse",
+  "search.filters.filter.show-less": "Contraer",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Revistas seleccionadas",
+  // "search.filters.filter.show-more": "Show more",
+  "search.filters.filter.show-more": "Mostrar más",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Problema seleccionado",
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Volumen de la revista seleccionada",
+  // "search.filters.filter.subject.head": "Subject",
+  "search.filters.filter.subject.head": "Materias",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Agencia de financiación seleccionada",
+  // "search.filters.filter.subject.placeholder": "Subject",
+  "search.filters.filter.subject.placeholder": "Materias",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Financiamiento seleccionado",
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Problema seleccionado",
+  // "search.filters.filter.subject.label": "Search subject",
+  "search.filters.filter.subject.label": "Búsqueda de materias",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Unidad organizativa seleccionada",
+  // "search.filters.filter.submitter.head": "Submitter",
+  "search.filters.filter.submitter.head": "Remitente",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Resultados de la búsqueda",
+  // "search.filters.filter.submitter.placeholder": "Submitter",
+  "search.filters.filter.submitter.placeholder": "Remitente",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Resultados de la búsqueda",
+  // "search.filters.filter.submitter.label": "Search submitter",
+  "search.filters.filter.submitter.label": "Remitente de búsqueda",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Resultados de la búsqueda",
+  // "search.filters.entityType.JournalIssue": "Journal Issue",
+  "search.filters.entityType.JournalIssue": "Número de la revista",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Resultados de la búsqueda",
+  // "search.filters.entityType.JournalVolume": "Journal Volume",
+  "search.filters.entityType.JournalVolume": "Volumen de la revista",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Resultados de la búsqueda",
+  // "search.filters.entityType.OrgUnit": "Organizational Unit",
+  "search.filters.entityType.OrgUnit": "Unidad organizativa",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Resultados de la búsqueda",
+  // "search.filters.has_content_in_original_bundle.true": "Yes",
+  "search.filters.has_content_in_original_bundle.true": "Sí",
 
-	// "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Resultados de la búsqueda",
+  // "search.filters.has_content_in_original_bundle.false": "No",
+  "search.filters.has_content_in_original_bundle.false": "No",
 
-	// "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don\'t you can still use it for this submission.",
-	"submission.sections.describe.relationship-lookup.name-variant.notification.content": "¿Le gustaría guardar \"{{ value }}\" como una variante de nombre para esta persona para que usted y otros puedan reutilizarlo para envíos futuros? Si no lo hace, aún puede usarlo para este envío.",
+  // "search.filters.discoverable.true": "No",
+  "search.filters.discoverable.true": "No",
 
-	// "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
-	"submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Guardar una nueva variante de nombre",
+  // "search.filters.discoverable.false": "Yes",
+  "search.filters.discoverable.false": "Sí",
 
-	// "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
-	"submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Usar solo para este envío",
+  // "search.filters.withdrawn.true": "Yes",
+  "search.filters.withdrawn.true": "Sí",
 
-	// "submission.sections.ccLicense.type": "License Type",
-	"submission.sections.ccLicense.type": "Tipo de licencia",
+  // "search.filters.withdrawn.false": "No",
+  "search.filters.withdrawn.false": "No",
 
-	// "submission.sections.ccLicense.select": "Select a license type…",
-	"submission.sections.ccLicense.select": "Seleccione un tipo de licencia...",
 
-	// "submission.sections.ccLicense.change": "Change your license type…",
-	"submission.sections.ccLicense.change": "Cambie su tipo de licencia...",
+  // "search.filters.head": "Filters",
+  "search.filters.head": "Filtros",
 
-	// "submission.sections.ccLicense.none": "No licenses available",
-	"submission.sections.ccLicense.none": "No hay licencias disponibles",
+  // "search.filters.reset": "Reset filters",
+  "search.filters.reset": "Restablecer filtros",
 
-	// "submission.sections.ccLicense.option.select": "Select an option…",
-	"submission.sections.ccLicense.option.select": "Seleccione una opción…",
+  // "search.filters.search.submit": "Submit",
+  "search.filters.search.submit": "Enviar",
 
-	// "submission.sections.ccLicense.link": "You’ve selected the following license:",
-	"submission.sections.ccLicense.link": "Ha seleccionado la siguiente licencia:",
 
-	// "submission.sections.ccLicense.confirmation": "I grant the license above",
-	"submission.sections.ccLicense.confirmation": "Otorgo la licencia de arriba",
 
-	// "submission.sections.general.add-more": "Add more",
-	"submission.sections.general.add-more": "Añadir más",
+  // "search.form.search": "Search",
+  "search.form.search": "Buscar",
 
-	// "submission.sections.general.collection": "Collection",
-	"submission.sections.general.collection": "Colección",
+  // "search.form.search_dspace": "All repository",
+  "search.form.search_dspace": "Todo el repositorio",
 
-	// "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
-	"submission.sections.general.deposit_error_notice": "Hubo un problema al enviar el artículo. Vuelve a intentarlo más tarde.",
+  // "search.form.scope.all": "All of DSpace",
+  "search.form.scope.all": "Todo DSpace",
 
-	// "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
-	"submission.sections.general.deposit_success_notice": "Presentación depositada con éxito.",
+  // "search.results.head": "Search Results",
+  "search.results.head": "Resultados de la búsqueda",
 
-	// "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
-	"submission.sections.general.discard_error_notice": "Hubo un problema al descartar el artículo. Vuelve a intentarlo más tarde.",
+  // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
+  "search.results.no-results": "Su búsqueda no produjo resultados. ¿Tiene problemas para encontrar lo que busca? Intente poner",
 
-	// "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
-	"submission.sections.general.discard_success_notice": "Envío descartado con éxito.",
+  // "search.results.no-results-link": "quotes around it",
+  "search.results.no-results-link": "citas a su alrededor",
 
-	// "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
-	"submission.sections.general.metadata-extracted": "Se extrajeron y agregaron nuevos metadatos a la sección <strong> {{ sectionId }} </strong>.",
+  // "search.results.empty": "Your search returned no results.",
+  "search.results.empty": "Su búsqueda no produjo resultados.",
 
-	// "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
-	"submission.sections.general.metadata-extracted-new-section": "Se ha añadido una nueva sección <strong> {{ sectionId }} </strong> al envío.",
+  // "search.results.view-result": "View",
+  "search.results.view-result": "Ver",
 
-	// "submission.sections.general.no-collection": "No collection found",
-	"submission.sections.general.no-collection": "No se encontró ninguna colección",
 
-	// "submission.sections.general.no-sections": "No options available",
-	"submission.sections.general.no-sections": "No hay opciones disponibles",
+  // "default.search.results.head": "Search Results",
+  "default.search.results.head": "Resultados de la búsqueda",
 
-	// "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
-	"submission.sections.general.save_error_notice": "Hubo un problema al guardar el artículo. Vuelve a intentarlo más tarde.",
+  // "default-relationships.search.results.head": "Search Results",
+  "default-relationships.search.results.head": "Resultados de la búsqueda",
 
-	// "submission.sections.general.save_success_notice": "Submission saved successfully.",
-	"submission.sections.general.save_success_notice": "Envío guardado con éxito.",
 
-	// "submission.sections.general.search-collection": "Search for a collection",
-	"submission.sections.general.search-collection": "Buscar una colección",
+  // "search.sidebar.close": "Back to results",
+  "search.sidebar.close": "Volver a resultados",
 
-	// "submission.sections.general.sections_not_valid": "There are incomplete sections.",
-	"submission.sections.general.sections_not_valid": "Hay secciones incompletas.",
+  // "search.sidebar.filters.title": "Filters",
+  "search.sidebar.filters.title": "Filtros",
 
+  // "search.sidebar.open": "Search Tools",
+  "search.sidebar.open": "Herramientas de búsqueda",
 
+  // "search.sidebar.results": "results",
+  "search.sidebar.results": "resultados",
 
-	// "submission.sections.submit.progressbar.CClicense": "Creative commons license",
-	"submission.sections.submit.progressbar.CClicense": "Licencia Creative Commons",
+  // "search.sidebar.settings.rpp": "Results per page",
+  "search.sidebar.settings.rpp": "resultados por página",
 
-	// "submission.sections.submit.progressbar.describe.recycle": "Recycle",
-	"submission.sections.submit.progressbar.describe.recycle": "Reciclar",
+  // "search.sidebar.settings.sort-by": "Sort By",
+  "search.sidebar.settings.sort-by": "Ordenar por",
 
-	// "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
-	"submission.sections.submit.progressbar.describe.stepcustom": "Describir",
+  // "search.sidebar.settings.title": "Settings",
+  "search.sidebar.settings.title": "Ajustes",
 
-	// "submission.sections.submit.progressbar.describe.stepone": "Describe",
-	"submission.sections.submit.progressbar.describe.stepone": "Describir",
 
-	// "submission.sections.submit.progressbar.describe.steptwo": "Describe",
-	"submission.sections.submit.progressbar.describe.steptwo": "Describir",
 
-	// "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
-	"submission.sections.submit.progressbar.detect-duplicate": "Posibles duplicados",
+  // "search.view-switch.show-detail": "Show detail",
+  "search.view-switch.show-detail": "Mostrar detalle",
 
-	// "submission.sections.submit.progressbar.license": "Deposit license",
-	"submission.sections.submit.progressbar.license": "Licencia de depósito",
+  // "search.view-switch.show-grid": "Show as grid",
+  "search.view-switch.show-grid": "Mostrar como cuadrícula",
 
-	// "submission.sections.submit.progressbar.upload": "Upload files",
-	"submission.sections.submit.progressbar.upload": "Subir archivos",
+  // "search.view-switch.show-list": "Show as list",
+  "search.view-switch.show-list": "Mostrar como lista",
 
 
 
-	// "submission.sections.status.errors.title": "Errors",
-	"submission.sections.status.errors.title": "Errores",
+  // "sorting.ASC": "Ascending",
+  "sorting.ASC": "Ascendente",
 
-	// "submission.sections.status.valid.title": "Valid",
-	"submission.sections.status.valid.title": "Válido",
+  // "sorting.DESC": "Descending",
+  "sorting.DESC": "Descendente",
 
-	// "submission.sections.status.warnings.title": "Warnings",
-	"submission.sections.status.warnings.title": "Advertencias",
+  // "sorting.dc.title.ASC": "Title Ascending",
+  "sorting.dc.title.ASC": "Título Ascendente",
 
-	// "submission.sections.toggle.open": "Open section",
-	"submission.sections.toggle.open": "Sección abierta",
+  // "sorting.dc.title.DESC": "Title Descending",
+  "sorting.dc.title.DESC": "Título Descendente",
 
-	// "submission.sections.toggle.close": "Close section",
-	"submission.sections.toggle.close": "Cerrar sección",
+  // "sorting.score.ASC": "Least Relevant",
+  "sorting.score.ASC": "Menos relevante",
 
-	// "submission.sections.upload.delete.confirm.cancel": "Cancel",
-	"submission.sections.upload.delete.confirm.cancel": "Cancelar",
+  // "sorting.score.DESC": "Most Relevant",
+  "sorting.score.DESC": "Lo más relevante",
 
-	// "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
-	"submission.sections.upload.delete.confirm.info": "Esta operación no se puede deshacer. ",
+  // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
+  "sorting.dc.date.issued.ASC": "Fecha de emisión Ascendente",
 
-	// "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
-	"submission.sections.upload.delete.confirm.submit": "Sí estoy seguro",
+  // "sorting.dc.date.issued.DESC": "Date Issued Descending",
+  "sorting.dc.date.issued.DESC": "Fecha de emisión Descendente",
 
-	// "submission.sections.upload.delete.confirm.title": "Delete bitstream",
-	"submission.sections.upload.delete.confirm.title": "Eliminar archivo",
+  // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
+  "sorting.dc.date.accessioned.ASC": "Fecha de adhesión Ascendente",
 
-	// "submission.sections.upload.delete.submit": "Delete",
-	"submission.sections.upload.delete.submit": "Borrar",
+  // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
+  "sorting.dc.date.accessioned.DESC": "Fecha de adhesión Descendente",
 
-	// "submission.sections.upload.download.title": "Download bitstream",
-	"submission.sections.upload.download.title": "Descarga archivo",
+  // "sorting.lastModified.ASC": "Last modified Ascending",
+  "sorting.lastModified.ASC": "Última modificación Ascendente",
 
-	// "submission.sections.upload.drop-message": "Drop files to attach them to the item",
-	"submission.sections.upload.drop-message": "Suelta archivos para adjuntarlos al artículo",
+  // "sorting.lastModified.DESC": "Last modified Descending",
+  "sorting.lastModified.DESC": "Última modificación Descendente",
 
-	// "submission.sections.upload.edit.title": "Edit bitstream",
-	"submission.sections.upload.edit.title": "Editar archivo",
 
-	// "submission.sections.upload.form.access-condition-label": "Access condition type",
-	"submission.sections.upload.form.access-condition-label": "Tipo de condición de acceso",
+  // "statistics.title": "Statistics",
+  "statistics.title": "Estadísticas",
 
-	// "submission.sections.upload.form.date-required": "Date is required.",
-	"submission.sections.upload.form.date-required": "Se requiere fecha.",
+  // "statistics.header": "Statistics for {{ scope }}",
+  "statistics.header": "Estadísticas de {{ scope }}",
 
-	// "submission.sections.upload.form.from-label": "Grant access from",
-	"submission.sections.upload.form.from-label": "Otorgar acceso desde",
+  // "statistics.breadcrumbs": "Statistics",
+  "statistics.breadcrumbs": "Estadísticas",
 
-	// "submission.sections.upload.form.from-placeholder": "From",
-	"submission.sections.upload.form.from-placeholder": "De",
+  // "statistics.page.no-data": "No data available",
+  "statistics.page.no-data": "Datos no disponibles",
 
-	// "submission.sections.upload.form.group-label": "Group",
-	"submission.sections.upload.form.group-label": "Grupo",
+  // "statistics.table.no-data": "No data available",
+  "statistics.table.no-data": "Datos no disponibles",
 
-	// "submission.sections.upload.form.group-required": "Group is required.",
-	"submission.sections.upload.form.group-required": "Se requiere grupo.",
+  // "statistics.table.title.TotalVisits": "Total visits",
+  "statistics.table.title.TotalVisits": "Visitas totales",
 
-	// "submission.sections.upload.form.until-label": "Grant access until",
-	"submission.sections.upload.form.until-label": "Conceder acceso hasta",
+  // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
+  "statistics.table.title.TotalVisitsPerMonth": "Visitas totales por mes",
 
-	// "submission.sections.upload.form.until-placeholder": "Until",
-	"submission.sections.upload.form.until-placeholder": "Hasta que",
+  // "statistics.table.title.TotalDownloads": "File Visits",
+  "statistics.table.title.TotalDownloads": "Visitas de archivo",
 
-	// "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
-	"submission.sections.upload.header.policy.default.nolist": "Se podrá acceder a los archivos cargados en la colección {{ collectionName }} de acuerdo con los siguientes grupos:",
+  // "statistics.table.title.TopCountries": "Top country views",
+  "statistics.table.title.TopCountries": "Vistas principales por país",
 
-	// "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
-	"submission.sections.upload.header.policy.default.withlist": "Tenga en cuenta que los archivos cargados en la colección {{ collectionName }} serán accesibles, además de lo que se decida explícitamente para el archivo único, con los siguientes grupos:",
+  // "statistics.table.title.TopCities": "Top city views",
+  "statistics.table.title.TopCities": "Visitas principales por ciudad",
 
-	// "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files just dragging & dropping them everywhere in the page</strong>",
-	"submission.sections.upload.info": "Aquí encontrará todos los archivos que se encuentran actualmente en el artículo. ",
+  // "statistics.table.header.views": "Views",
+  "statistics.table.header.views": "Visitas",
 
-	// "submission.sections.upload.no-entry": "No",
-	"submission.sections.upload.no-entry": "No",
 
-	// "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
-	"submission.sections.upload.no-file-uploaded": "Aún no se ha subido ningún archivo.",
 
-	// "submission.sections.upload.save-metadata": "Save metadata",
-	"submission.sections.upload.save-metadata": "Guardar metadatos",
+  // "submission.edit.breadcrumbs": "Edit Submission",
+  "submission.edit.breadcrumbs": "Editar envío",
 
-	// "submission.sections.upload.undo": "Cancel",
-	"submission.sections.upload.undo": "Cancelar",
+  // "submission.edit.title": "Edit Submission",
+  "submission.edit.title": "Editar envío",
 
-	// "submission.sections.upload.upload-failed": "Upload failed",
-	"submission.sections.upload.upload-failed": "Subida fallida",
+  // "submission.general.cancel": "Cancel",
+  "submission.general.cancel": "Cancelar",
 
-	// "submission.sections.upload.upload-successful": "Upload successful",
-	"submission.sections.upload.upload-successful": "Subida exitosa",
+  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
+  "submission.general.cannot_submit": "No tiene los permisos para realizar un nuevo envío.",
+
+  // "submission.general.deposit": "Deposit",
+  "submission.general.deposit": "Depositar",
+
+  // "submission.general.discard.confirm.cancel": "Cancel",
+  "submission.general.discard.confirm.cancel": "Cancelar",
+
+  // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.general.discard.confirm.info": "Esta operación no se puede deshacer. ¿Está seguro? ",
+
+  // "submission.general.discard.confirm.submit": "Yes, I'm sure",
+  "submission.general.discard.confirm.submit": "Sí estoy seguro",
+
+  // "submission.general.discard.confirm.title": "Discard submission",
+  "submission.general.discard.confirm.title": "Descartar envío",
+
+  // "submission.general.discard.submit": "Discard",
+  "submission.general.discard.submit": "Descarte",
+
+  // "submission.general.info.saved": "Saved",
+  "submission.general.info.saved": "Guardado",
+
+  // "submission.general.info.pending-changes": "Unsaved changes",
+  "submission.general.info.pending-changes": "Cambios no guardados",
+
+  // "submission.general.save": "Save",
+  "submission.general.save": "Guardar",
+
+  // "submission.general.save-later": "Save for later",
+  "submission.general.save-later": "Guardar para más adelante",
+
+
+  // "submission.import-external.page.title": "Import metadata from an external source",
+  "submission.import-external.page.title": "Importar metadatos desde una fuente externa",
+
+  // "submission.import-external.title": "Import metadata from an external source",
+  "submission.import-external.title": "Importar metadatos desde una fuente externa",
+
+  // "submission.import-external.title.Journal": "Import a journal from an external source",
+  "submission.import-external.title.Journal": "Importar una revista desde una fuente externa",
+
+  // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
+  "submission.import-external.title.JournalIssue": "Importar un número de revista desde una fuente externa",
+
+  // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
+  "submission.import-external.title.JournalVolume": "Importar un volumen de revista desde una fuente externa",
+
+  // "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
+  "submission.import-external.title.OrgUnit": "Importar editor desde una fuente externa",
+
+  // "submission.import-external.title.Person": "Import a person from an external source",
+  "submission.import-external.title.Person": "Importar personas desde una fuente externa",
+
+  // "submission.import-external.title.Project": "Import a project from an external source",
+  "submission.import-external.title.Project": "Importar proyectos desde una fuente externa",
+
+  // "submission.import-external.title.Publication": "Import a publication from an external source",
+  "submission.import-external.title.Publication": "Importar una publicación desde una fuente externa",
+
+  // "submission.import-external.title.none": "Import metadata from an external source",
+  "submission.import-external.title.none": "Importar metadatos desde una fuente externa",
+
+  // "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.",
+  "submission.import-external.page.hint": "Introduzca una consulta arriba para buscar í de la web para importarlos a DSpace.",
+
+  // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
+  "submission.import-external.back-to-my-dspace": "Volver a Mi DSpace",
+
+  // "submission.import-external.search.placeholder": "Search the external source",
+  "submission.import-external.search.placeholder": "Buscar fuente externa",
+
+  // "submission.import-external.search.button": "Search",
+  "submission.import-external.search.button": "Buscar",
+
+  // "submission.import-external.search.button.hint": "Write some words to search",
+  "submission.import-external.search.button.hint": "Escriba algunas palabras para buscar",
+
+  // "submission.import-external.search.source.hint": "Pick an external source",
+  "submission.import-external.search.source.hint": "Elija una fuente externa",
+
+  // "submission.import-external.source.arxiv": "arXiv",
+  "submission.import-external.source.arxiv": "arXiv",
+
+  // "submission.import-external.source.ads": "NASA/ADS",
+  "submission.import-external.source.ads": "NASA/ADS",
+
+  // "submission.import-external.source.cinii": "CiNii",
+  "submission.import-external.source.cinii": "CiNii",
+
+  // "submission.import-external.source.crossref": "CrossRef",
+  "submission.import-external.source.crossref": "CrossRef",
+
+  // "submission.import-external.source.scielo": "SciELO",
+  "submission.import-external.source.scielo": "SciELO",
+
+  // "submission.import-external.source.scopus": "Scopus",
+  "submission.import-external.source.scopus": "Scopus",
+
+  // "submission.import-external.source.vufind": "VuFind",
+  "submission.import-external.source.vufind": "VuFind",
+
+  // "submission.import-external.source.wos": "Web Of Science",
+  "submission.import-external.source.wos": "Web Of Science",
+
+  // "submission.import-external.source.orcidWorks": "ORCID",
+  "submission.import-external.source.orcidWorks": "ORCID",
+
+  // "submission.import-external.source.epo": "European Patent Office (EPO)",
+  "submission.import-external.source.epo": "Oficina Europea de Patentes (OEP)",
+
+  // "submission.import-external.source.loading": "Loading ...",
+  "submission.import-external.source.loading": "Cargando ...",
+
+  // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
+  "submission.import-external.source.sherpaJournal": "Revistas SHERPA",
+
+  // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
+  "submission.import-external.source.sherpaJournalIssn": "Revistas SHERPA por ISSN",
+
+  // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+  "submission.import-external.source.sherpaPublisher": "Editores SHERPA",
+
+  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
+  "submission.import-external.source.openAIREFunding": "API de Financiamiento de OpenAIRE",
+
+  // "submission.import-external.source.orcid": "ORCID",
+  "submission.import-external.source.orcid": "ORCID",
+
+  // "submission.import-external.source.pubmed": "Pubmed",
+  "submission.import-external.source.pubmed": "Pubmed",
+
+  // "submission.import-external.source.pubmedeu": "Pubmed Europe",
+  "submission.import-external.source.pubmedeu": "Pubmed Europe",
+
+  // "submission.import-external.source.lcname": "Library of Congress Names",
+  "submission.import-external.source.lcname": "Nombres de la Biblioteca del Congreso",
+
+  // "submission.import-external.preview.title": "Item Preview",
+  "submission.import-external.preview.title": "Vista previa del artículo",
+
+  // "submission.import-external.preview.title.Publication": "Publication Preview",
+  "submission.import-external.preview.title.Publication": "Previsualización de Publicación",
+
+  // "submission.import-external.preview.title.none": "Item Preview",
+  "submission.import-external.preview.title.none": "Previsualización de Ítem",
+
+  // "submission.import-external.preview.title.Journal": "Journal Preview",
+  "submission.import-external.preview.title.Journal": "Previsualización de Revista",
+
+  // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
+  "submission.import-external.preview.title.OrgUnit": "Previsualización de Unidad organizativa ",
+
+  // "submission.import-external.preview.title.Person": "Person Preview",
+  "submission.import-external.preview.title.Person": "Previsualización de Persona",
+
+  // "submission.import-external.preview.title.Project": "Project Preview",
+  "submission.import-external.preview.title.Project": "Previsualización de Proyecto",
+
+  // "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.",
+  "submission.import-external.preview.subtitle": "Los siguientes metadatos se importaron de una fuente externa. Se completará previamente cuando inicie el envío.",
+
+  // "submission.import-external.preview.button.import": "Start submission",
+  "submission.import-external.preview.button.import": "Iniciar envío",
+
+  // "submission.import-external.preview.error.import.title": "Submission error",
+  "submission.import-external.preview.error.import.title": "Error de envío",
+
+  // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
+  "submission.import-external.preview.error.import.body": "Se produce un error durante el proceso de importación de la entrada de fuente externa.",
+
+  // "submission.sections.describe.relationship-lookup.close": "Close",
+  "submission.sections.describe.relationship-lookup.close": "Cerrar",
+
+  // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.added": "Entrada local agregada con éxito a la selección",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Importación remota de autor",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Importación remota de revista",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Importación remota de número de revista",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Importación remota de volumen de revista",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Proyecto",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Import remote item",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Importación remota de ítem ",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Import remote event",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Importación remota de evento",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Import remote product",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Importación remota de producto",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Import remote equipment",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Importación remota de equipamiento",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Import remote organizational unit",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Importación remota de unidad organizativa",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Import remote fund",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Importación remota de financiación",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Import remote person",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Importación remota de persona",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Import remote patent",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Importación remota de patente",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Import remote project",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Importación remota de proyecto",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Import remote publication",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Importación remota de publication",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "New Entity Added!",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "¡Nueva entidad agregada!",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Proyecto",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "API OpenAIRE de Financiamiento",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Importación remota de autor",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Autor local agregado exitosamente a la selección",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Successfully imported and added external author to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Autor externo importado y agregado exitosamente a la selección",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Autoridad",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Importar como una nueva entrada de autoridad local",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancelar",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Select a collection to import new entries to",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Seleccione una colección para importar nuevas entradas",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entidades",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Importar como una nueva entidad local",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importar desde LCName",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importando desde ORCID",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importar desde Sherpa Journal",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importar desde Sherpa Publisher",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importar desde PubMed",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importando desde arXiv",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Importar",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Importación remota de Revista",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Successfully added local journal to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Revista local agregada con éxito a la selección",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Successfully imported and added external journal to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Revista externa importada y agregada con éxito a la selección",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Importación remota de numero de revista ",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Se agregó localmenteun número de revista a la selección.",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Se importó con éxito y se agregó externamente un número de revista a la selección.",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Importación remota de volumen de revista ",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Successfully added local journal volume to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Se agregó con éxito el volumen de la revista local a la selección.",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Successfully imported and added external journal volume to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Se importó y agregó con éxito un volumen de revista externo a la selección",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Seleccione una coincidencia local:",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deseleccionar todo",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deseleccionar página",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "Cargando...",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Consulta de búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Ir",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Buscar...",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Seleccionar todo",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Seleccionar página",
+
+  // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
+  "submission.sections.describe.relationship-lookup.selected": "Ítems {{ size }} seleccionados",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Autores locales ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Revistas locales ({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Proyectos locales ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Publicaciones locales ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Autores locales ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Unidades organizativas locales ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Paquetes de datos locales ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Archivos de datos locales ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Revistas locales ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Números de revista locales ({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Números de revista locales  ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Volúmenes de revista locales ({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Volúmenes de revista locales ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Revistas Sherpa  ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Editores Sherpa ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "Nombres LC ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Búsqueda de agencias de financiación",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Búsqueda de financiación",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Búsqueda de unidades organizativas",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "API OpenAire de Financiamiento",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Proyectos",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Financiador del Proyecto",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "API OpenAIRE de Financiamiento",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Proyecto",
+
+  // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Proyectos",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Financiador del Proyecto",
+
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Buscar...",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Selección actual ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Numeros de la revista",
+  
+  // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Numeros de la revista",
+
+  // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Volúmenes de la revista",
+  
+  // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Volúmenes de la revista",
+
+  // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Revistas",
+
+  // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Autores",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Agencia financiadora",
+  
+  // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
+  "submission.sections.describe.relationship-lookup.title.Project": "Proyectos",
+
+  // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
+  "submission.sections.describe.relationship-lookup.title.Publication": "Publicaciones",
+
+  // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
+  "submission.sections.describe.relationship-lookup.title.Person": "Autores",
+
+  // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Unidades organizativas",
+
+  // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Paquetes de datos",
+
+  // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "Archivos de información",
+
+  // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Agencia financiadora",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Financiación",
+
+  // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Unidad organizativa matriz",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Alternar menú desplegable",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Ajustes",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Su selección está actualmente vacía.",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Autores seleccionados",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Revistas seleccionadas",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Volumen de revista seleccionada",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Proyectos seleccionados",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Publicaciones Seleccionadas",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Autores seleccionados",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Unidades organizativas seleccionadas",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Paquetes de datos seleccionados",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Archivos de datos seleccionados",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Revistas seleccionadas",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Número de revista seleccionados",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Volúmenes de revista seleccionados  ",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Agencias de financiación seleccionadas",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Financiamientos seleccionados",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Número seleccionado",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Unidad organizativa seleccionada",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don\'t you can still use it for this submission.",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "¿Le gustaría guardar \"{{ value }}\" como una variante de nombre para esta persona para que usted y otros puedan reutilizarlo para envíos futuros? Si no lo hace, aún puede usarlo para este envío.",
+
+  // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Guardar una nueva variante de nombre",
+
+  // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Usar solo para este envío",
+
+  // "submission.sections.ccLicense.type": "License Type",
+  "submission.sections.ccLicense.type": "Tipo de licencia",
+
+  // "submission.sections.ccLicense.select": "Select a license type…",
+  "submission.sections.ccLicense.select": "Seleccione un tipo de licencia...",
+
+  // "submission.sections.ccLicense.change": "Change your license type…",
+  "submission.sections.ccLicense.change": "Cambie su tipo de licencia...",
+
+  // "submission.sections.ccLicense.none": "No licenses available",
+  "submission.sections.ccLicense.none": "No hay licencias disponibles",
+
+  // "submission.sections.ccLicense.option.select": "Select an option…",
+  "submission.sections.ccLicense.option.select": "Seleccione una opción…",
+
+  // "submission.sections.ccLicense.link": "You’ve selected the following license:",
+  "submission.sections.ccLicense.link": "Ha seleccionado la siguiente licencia:",
+
+  // "submission.sections.ccLicense.confirmation": "I grant the license above",
+  "submission.sections.ccLicense.confirmation": "Otorgo la licencia de arriba",
+
+  // "submission.sections.general.add-more": "Add more",
+  "submission.sections.general.add-more": "Añadir más",
+
+  // "submission.sections.general.cannot_deposit": "Deposit cannot be completed due to errors in the form.<br>Please fill out all required fields to complete the deposit.",
+  "submission.sections.general.cannot_deposit": "No se puede finalizar el depósito por errores en el formulario.<br>Por favor, complete todos los campos requeridos para finalizar el envío.",
+
+  // "submission.sections.general.collection": "Collection",
+  "submission.sections.general.collection": "Colección",
+
+  // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
+  "submission.sections.general.deposit_error_notice": "Hubo un problema al enviar el ítem. Vuelva a intentarlo más tarde.",
+
+  // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
+  "submission.sections.general.deposit_success_notice": "Envío depositado con éxito.",
+
+  // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
+  "submission.sections.general.discard_error_notice": "Hubo un problema al descartar el ítem. Vuelva a intentarlo más tarde.",
+
+  // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
+  "submission.sections.general.discard_success_notice": "Envío descartado con éxito.",
+
+  // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
+  "submission.sections.general.metadata-extracted": "Se extrajeron y agregaron nuevos metadatos a la sección <strong> {{ sectionId }} </strong>.",
+
+  // "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
+  "submission.sections.general.metadata-extracted-new-section": "Se ha añadido una nueva sección <strong> {{ sectionId }} </strong> al envío.",
+
+  // "submission.sections.general.no-collection": "No collection found",
+  "submission.sections.general.no-collection": "No se encontró ninguna colección",
+
+  // "submission.sections.general.no-sections": "No options available",
+  "submission.sections.general.no-sections": "No hay opciones disponibles",
+
+  // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
+  "submission.sections.general.save_error_notice": "Hubo un problema al guardar el ítem. Vuelva a intentarlo más tarde.",
+
+  // "submission.sections.general.save_success_notice": "Submission saved successfully.",
+  "submission.sections.general.save_success_notice": "Envío guardado con éxito.",
+
+  // "submission.sections.general.search-collection": "Search for a collection",
+  "submission.sections.general.search-collection": "Buscar una colección",
+
+  // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
+  "submission.sections.general.sections_not_valid": "Hay secciones incompletas.",
+
+
+  // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
+  "submission.sections.submit.progressbar.accessCondition": "Condiciones de acceso al ítem",
+
+  // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
+  "submission.sections.submit.progressbar.CClicense": "Licencia Creative Commons",
+
+  // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
+  "submission.sections.submit.progressbar.describe.recycle": "Reciclar",
+
+  // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
+  "submission.sections.submit.progressbar.describe.stepcustom": "Describir",
+
+  // "submission.sections.submit.progressbar.describe.stepone": "Describe",
+  "submission.sections.submit.progressbar.describe.stepone": "Describir",
+
+  // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
+  "submission.sections.submit.progressbar.describe.steptwo": "Describir",
+
+  // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
+  "submission.sections.submit.progressbar.detect-duplicate": "Posibles duplicados",
+
+  // "submission.sections.submit.progressbar.license": "Deposit license",
+  "submission.sections.submit.progressbar.license": "Licencia de depósito",
+
+  // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
+  "submission.sections.submit.progressbar.sherpapolicy": "Políticas Sherpa",
+
+  // "submission.sections.submit.progressbar.upload": "Upload files",
+  "submission.sections.submit.progressbar.upload": "Subir archivos",
+
+  // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
+  "submission.sections.submit.progressbar.sherpaPolicies": "Información sobre políticas editoriales de acceso abierto",
+
+
+  // "submission.sections.sherpa-policy.title-empty": "No publisher policy information available. If your work has an associated ISSN, please enter it above to see any related publisher open access policies.",
+  "submission.sections.sherpa-policy.title-empty": "No se encuentra disponible la información sobre política editorial. Si tiene un ISSN asociado, introdúzcalo arriba para ver información sobre políticas editoriales de acceso abierto.",
+
+  // "submission.sections.status.errors.title": "Errors",
+  "submission.sections.status.errors.title": "Errores",
+
+  // "submission.sections.status.valid.title": "Valid",
+  "submission.sections.status.valid.title": "Válido",
+
+  // "submission.sections.status.warnings.title": "Warnings",
+  "submission.sections.status.warnings.title": "Advertencias",
+
+  // "submission.sections.status.errors.aria": "has errors",
+  "submission.sections.status.errors.aria": "con errores",
+
+  // "submission.sections.status.valid.aria": "is valid",
+  "submission.sections.status.valid.aria": "es válido",
+
+  // "submission.sections.status.warnings.aria": "has warnings",
+  "submission.sections.status.warnings.aria": "con avisos",
+
+  // "submission.sections.status.info.title": "Additional Information",
+  "submission.sections.status.info.title": "Información adicional",
+
+  // "submission.sections.status.info.aria": "Additional Information",
+  "submission.sections.status.info.aria": "Información adicional",
+
+  // "submission.sections.toggle.open": "Open section",
+  "submission.sections.toggle.open": "Sección abierta",
+
+  // "submission.sections.toggle.close": "Close section",
+  "submission.sections.toggle.close": "Cerrar sección",
+
+  // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
+  "submission.sections.toggle.aria.open": "Expandir {{sectionHeader}} sección",
+
+  // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
+  "submission.sections.toggle.aria.close": "Contraer {{sectionHeader}} sección",
+
+  // "submission.sections.upload.delete.confirm.cancel": "Cancel",
+  "submission.sections.upload.delete.confirm.cancel": "Cancelar",
+
+  // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.sections.upload.delete.confirm.info": "Esta operación no se puede deshacer. ¿Está seguro? ",
+
+  // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
+  "submission.sections.upload.delete.confirm.submit": "Sí, estoy seguro",
+
+  // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
+  "submission.sections.upload.delete.confirm.title": "Eliminar archivo",
+
+  // "submission.sections.upload.delete.submit": "Delete",
+  "submission.sections.upload.delete.submit": "Borrar",
+
+  // "submission.sections.upload.download.title": "Download bitstream",
+  "submission.sections.upload.download.title": "Descargar archivo",
+
+  // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
+  "submission.sections.upload.drop-message": "Suelte archivos para adjuntarlos al ítem",
+
+  // "submission.sections.upload.edit.title": "Edit bitstream",
+  "submission.sections.upload.edit.title": "Editar archivo",
+
+  // "submission.sections.upload.form.access-condition-label": "Access condition type",
+  "submission.sections.upload.form.access-condition-label": "Tipo de condición de acceso",
+
+  // "submission.sections.upload.form.access-condition-hint": "Select an access condition to apply on the bitstream once the item is deposited",
+  "submission.sections.upload.form.access-condition-hint": "Seleccione la condición de acceso que se aplicará a los ficheros una vez se deposite el ítem",
+
+  // "submission.sections.upload.form.date-required": "Date is required.",
+  "submission.sections.upload.form.date-required": "Se requiere la fecha.",
+
+  // "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.upload.form.date-required-from": "Para aplicar el acceso se requiere una fecha de inicio.",
+
+  // "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.upload.form.date-required-until": "Para aplicar el acceso se requiere una fecha de finalización.",
+
+  // "submission.sections.upload.form.from-label": "Grant access from",
+  "submission.sections.upload.form.from-label": "Permitir acceso desde",
+
+  // "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.upload.form.from-hint": "Seleccione la fecha a partir de la cúal será aplicada la condición de acceso",
+
+  // "submission.sections.upload.form.from-placeholder": "From",
+  "submission.sections.upload.form.from-placeholder": "Desde",
+
+  // "submission.sections.upload.form.group-label": "Group",
+  "submission.sections.upload.form.group-label": "Grupo",
+
+  // "submission.sections.upload.form.group-required": "Group is required.",
+  "submission.sections.upload.form.group-required": "Se requiere grupo.",
+
+  // "submission.sections.upload.form.until-label": "Grant access until",
+  "submission.sections.upload.form.until-label": "Conceder acceso hasta",
+
+  // "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.upload.form.until-hint": "Seleccione la fecha hasta la cuál será aplicada la condición de acceso",
+
+  // "submission.sections.upload.form.until-placeholder": "Until",
+  "submission.sections.upload.form.until-placeholder": "Hasta",
+
+  // "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
+  "submission.sections.upload.header.policy.default.nolist": "Se podrá acceder a los archivos cargados en la colección {{ collectionName }} de acuerdo con los siguientes grupos:",
+
+  // "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
+  "submission.sections.upload.header.policy.default.withlist": "Tenga en cuenta que los archivos cargados en la colección {{ collectionName }} serán accesibles, además de lo que se decida explícitamente para el fichero, con los siguientes grupos:",
+
+  // "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files just dragging & dropping them everywhere in the page</strong>"
+  "submission.sections.upload.info": "Aquí encontrará todos los archivos que se encuentran actualmente en el ítem.  Puede actualizar los metadatos del fichero y las condiciones de acceso e <strong> incluir ficheros adicionales simplemente arrastrando-y-soltando en cualquier instante en la página</strong>",
+
+  // "submission.sections.upload.no-entry": "No",
+  "submission.sections.upload.no-entry": "No",
+
+  // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
+  "submission.sections.upload.no-file-uploaded": "Aún no se ha subido ningún archivo.",
+
+  // "submission.sections.upload.save-metadata": "Save metadata",
+  "submission.sections.upload.save-metadata": "Guardar metadatos",
+
+  // "submission.sections.upload.undo": "Cancel",
+  "submission.sections.upload.undo": "Cancelar",
+
+  // "submission.sections.upload.upload-failed": "Upload failed",
+  "submission.sections.upload.upload-failed": "Subida fallida",
+
+  // "submission.sections.upload.upload-successful": "Upload successful",
+  "submission.sections.upload.upload-successful": "Subida exitosa",
+
+  // "submission.sections.accesses.form.discoverable-description": "When checked, this item will be discoverable in search/browse.   When unchecked, the item will only be available via a direct link and will never appear in search/browse.",
+  "submission.sections.accesses.form.discoverable-description": "Si lo marca, el ítem será detectable en el buscador/navegador. Si lo desmarca, el ítems solo estará disponible mediante el enlace directo, y no aparecerá en el buscador/navegador.",
+ 
+ // "submission.sections.accesses.form.discoverable-label": "Discoverable",
+  "submission.sections.accesses.form.discoverable-label": "Detectable",
+
+  // "submission.sections.accesses.form.access-condition-label": "Access condition type",
+  "submission.sections.accesses.form.access-condition-label": "Tipo de condición de acceso",
+
+  // "submission.sections.accesses.form.access-condition-hint": "Select an access condition to apply on the item once it is deposited",
+  "submission.sections.accesses.form.access-condition-hint": "Seleccione la condición de acceso que se aplicará al ítem una vez depositado",
+
+  // "submission.sections.accesses.form.date-required": "Date is required.",
+  "submission.sections.accesses.form.date-required": "Se requiere una fecha.",
+
+  // "submission.sections.accesses.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.accesses.form.date-required-from": "Para aplicar el acceso se requiere una fecha de inicio.",
+
+  // "submission.sections.accesses.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.accesses.form.date-required-until": "Para aplicar el acceso se requiere una fecha de finalización.",
+
+  // "submission.sections.accesses.form.from-label": "Grant access from",
+  "submission.sections.accesses.form.from-label": "Permitir acceso desde",
+
+  // "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.accesses.form.from-hint": "Seleccione la fecha a partir de la cúal será aplicada la condición de acceso",
+
+  // "submission.sections.accesses.form.from-placeholder": "From",
+  "submission.sections.accesses.form.from-placeholder": "Desde",
+
+  // "submission.sections.accesses.form.group-label": "Group",
+  "submission.sections.accesses.form.group-label": "Grupo",
+
+  // "submission.sections.accesses.form.group-required": "Group is required.",
+  "submission.sections.accesses.form.group-required": "Se requiere un grupo.",
+
+  // "submission.sections.accesses.form.until-label": "Grant access until",
+  "submission.sections.accesses.form.until-label": "Permitir acceso hasta",
+
+  // "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.accesses.form.until-hint": "Seleccione la fecha hasta la cuál será aplicada la condición de acceso",
+
+  // "submission.sections.accesses.form.until-placeholder": "Until",
+  "submission.sections.accesses.form.until-placeholder": "Hasta",
 
   // "submission.sections.license.granted-label": "I confirm the license above",
   "submission.sections.license.granted-label": "Confirmo la licencia",
@@ -5323,256 +6270,722 @@
   // "submission.sections.license.notgranted":  "You must accept the license",
   "submission.sections.license.notgranted":  "Debe aceptar la licencia",
 
-	// "submission.submit.breadcrumbs": "New submission",
-	"submission.submit.breadcrumbs": "Nuevo envío",
 
-	// "submission.submit.title": "New submission",
-	"submission.submit.title": "Nuevo envío",
+  // "submission.sections.sherpa.publication.information": "Publication information",
+  "submission.sections.sherpa.publication.information": "Información de la Publicac",
 
+  // "submission.sections.sherpa.publication.information.title": "Title",
+  "submission.sections.sherpa.publication.information.title": "Título",
 
+  // "submission.sections.sherpa.publication.information.issns": "ISSNs",
+  "submission.sections.sherpa.publication.information.issns": "ISSNs",
 
-	// "submission.workflow.generic.delete": "Delete",
-	"submission.workflow.generic.delete": "Borrar",
+  // "submission.sections.sherpa.publication.information.url": "URL",
+  "submission.sections.sherpa.publication.information.url": "URL",
 
-	// "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
-	"submission.workflow.generic.delete-help": "Si desea descartar este artículo, seleccione \"Eliminar\". Luego se le pedirá que lo confirme.",
+  // "submission.sections.sherpa.publication.information.publishers": "Publisher",
+  "submission.sections.sherpa.publication.information.publishers": "Editor",
 
-	// "submission.workflow.generic.edit": "Edit",
-	"submission.workflow.generic.edit": "Editar",
+  // "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
+  "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
 
-	// "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
-	"submission.workflow.generic.edit-help": "Seleccione esta opción para cambiar los metadatos del artículo.",
+  // "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
+  "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
 
-	// "submission.workflow.generic.view": "View",
-	"submission.workflow.generic.view": "Vista",
+  // "submission.sections.sherpa.publisher.policy": "Publisher Policy",
+  "submission.sections.sherpa.publisher.policy": "Política editorial",
 
-	// "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
-	"submission.workflow.generic.view-help": "Seleccione esta opción para ver los metadatos del artículo.",
+  // "submission.sections.sherpa.publisher.policy.description": "The below information was found via Sherpa Romeo.   Based on the policies of your publisher, it provides advice regarding whether an embargo may be necessary and/or which files you are allowed to upload.  If you have questions, please contact your site administrator via the feedback form in the footer.",
+  "submission.sections.sherpa.publisher.policy.description": "Lq siguiente informacióm se encontró via Sherpa Romeo. En base a esas políticas, se proporcionan consejos sobre las necesidad de un embargo y de aquellos ficheros que puede utilizar.  Si tiene dudas, por favor, contacte con el administrador del repositorio mediante el formulario de sugerencias.",
 
+  // "submission.sections.sherpa.publisher.policy.openaccess": "Open Access pathways permitted by this journal's policy are listed below by article version. Click on a pathway for a more detailed view",
+  "submission.sections.sherpa.publisher.policy.openaccess": "Los caminos hacia el Acceso Abierto que esta revista permite se relacionan, por versión de artículo, abajo. Pulse en un camino para una visión mas detallada",
 
+  // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
+  "submission.sections.sherpa.publisher.policy.more.information": "Para mas información, por favor, siga los siguientes enlaces:",
 
-	// "submission.workflow.tasks.claimed.approve": "Approve",
-	"submission.workflow.tasks.claimed.approve": "Aprobar",
+  // "submission.sections.sherpa.publisher.policy.version": "Version",
+  "submission.sections.sherpa.publisher.policy.version": "Versión",
 
-	// "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the item and it is suitable for inclusion in the collection, select \"Approve\".",
-	"submission.workflow.tasks.claimed.approve_help": "Si ha revisado el artículo y es adecuado para su inclusión en la colección, seleccione \"Aprobar \".",
+  // "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
+  "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
 
-	// "submission.workflow.tasks.claimed.edit": "Edit",
-	"submission.workflow.tasks.claimed.edit": "Editar",
+  // "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo",
+  "submission.sections.sherpa.publisher.policy.noembargo": "Sin Embargo",
 
-	// "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
-	"submission.workflow.tasks.claimed.edit_help": "Seleccione esta opción para cambiar los metadatos del artículo.",
+  // "submission.sections.sherpa.publisher.policy.nolocation": "None",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Ninguno",
 
-	// "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
-	"submission.workflow.tasks.claimed.reject.reason.info": "Ingrese su motivo para rechazar el envío en el cuadro a continuación, indicando si el remitente puede solucionar un problema y volver a enviarlo.",
+  // "submission.sections.sherpa.publisher.policy.license": "License",
+  "submission.sections.sherpa.publisher.policy.license": "Licencia",
 
-	// "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
-	"submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe el motivo del rechazo.",
+  // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisitos",
 
-	// "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
-	"submission.workflow.tasks.claimed.reject.reason.submit": "Rechazar artículo",
+  // "submission.sections.sherpa.publisher.policy.location": "Location",
+  "submission.sections.sherpa.publisher.policy.location": "Lugar",
 
-	// "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
-	"submission.workflow.tasks.claimed.reject.reason.title": "Razón",
+  // "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
+  "submission.sections.sherpa.publisher.policy.conditions": "Condiciones",
 
-	// "submission.workflow.tasks.claimed.reject.submit": "Reject",
-	"submission.workflow.tasks.claimed.reject.submit": "Rechazar",
+  // "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
+  "submission.sections.sherpa.publisher.policy.refresh": "Refrescar",
 
-	// "submission.workflow.tasks.claimed.reject_help": "If you have reviewed the item and found it is <strong>not</strong> suitable for inclusion in the collection, select \"Reject\".  You will then be asked to enter a message indicating why the item is unsuitable, and whether the submitter should change something and resubmit.",
-	"submission.workflow.tasks.claimed.reject_help": "Si ha revisado el artículo y ha encontrado que <strong> no </strong> es adecuado para su inclusión en la colección, seleccione \"Rechazar\". Luego, se le pedirá que ingrese un mensaje que indique por qué el artículo no es adecuado y si el remitente debe cambiar algo y volver a enviarlo.",
+  // "submission.sections.sherpa.record.information": "Record Information",
+  "submission.sections.sherpa.record.information": "Informacion del registro",
 
-	// "submission.workflow.tasks.claimed.return": "Return to pool",
-	"submission.workflow.tasks.claimed.return": "Volver a la piscina",
+  // "submission.sections.sherpa.record.information.id": "ID",
+  "submission.sections.sherpa.record.information.id": "ID",
 
-	// "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
-	"submission.workflow.tasks.claimed.return_help": "Devuelva la tarea al grupo para que otro usuario pueda realizarla.",
+  // "submission.sections.sherpa.record.information.date.created": "Date Created",
+  "submission.sections.sherpa.record.information.date.created": "Fecha de creación",
 
+  // "submission.sections.sherpa.record.information.date.modified": "Last Modified",
+  "submission.sections.sherpa.record.information.date.modified": "Última modificación",
 
+  // "submission.sections.sherpa.record.information.uri": "URI",
+  "submission.sections.sherpa.record.information.uri": "URI",
 
-	// "submission.workflow.tasks.generic.error": "Error occurred during operation...",
-	"submission.workflow.tasks.generic.error": "Ocurrió un error durante la operación...",
+  // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
+  "submission.sections.sherpa.error.message": "Hubo un error recuperando la información de Sherpa",
 
-	// "submission.workflow.tasks.generic.processing": "Processing...",
-	"submission.workflow.tasks.generic.processing": "Procesando...",
 
-	// "submission.workflow.tasks.generic.submitter": "Submitter",
-	"submission.workflow.tasks.generic.submitter": "Remitente",
 
-	// "submission.workflow.tasks.generic.success": "Operation successful",
-	"submission.workflow.tasks.generic.success": "Operación exitosa",
+  // "submission.submit.breadcrumbs": "New submission",
+  "submission.submit.breadcrumbs": "Nuevo envío",
 
+  // "submission.submit.title": "New submission",
+  "submission.submit.title": "Nuevo envío",
 
 
-	// "submission.workflow.tasks.pool.claim": "Claim",
-	"submission.workflow.tasks.pool.claim": "Afirmar",
 
-	// "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
-	"submission.workflow.tasks.pool.claim_help": "Asigne esta tarea a usted mismo.",
+  // "submission.workflow.generic.delete": "Delete",
+  "submission.workflow.generic.delete": "Borrar",
 
-	// "submission.workflow.tasks.pool.hide-detail": "Hide detail",
-	"submission.workflow.tasks.pool.hide-detail": "Ocultar detalle",
+  // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
+  "submission.workflow.generic.delete-help": "Si desea descartar este artículo, seleccione \"Eliminar\". Luego se le pedirá que lo confirme.",
 
-	// "submission.workflow.tasks.pool.show-detail": "Show detail",
-	"submission.workflow.tasks.pool.show-detail": "Mostrar detalle",
+  // "submission.workflow.generic.edit": "Edit",
+  "submission.workflow.generic.edit": "Editar",
 
+  // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
+  "submission.workflow.generic.edit-help": "Seleccione esta opción para cambiar los metadatos del artículo.",
 
+  // "submission.workflow.generic.view": "View",
+  "submission.workflow.generic.view": "Vista",
 
-	// "thumbnail.default.alt": "Thumbnail Image",
-	"thumbnail.default.alt": "Imagen en miniatura",
+  // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workflow.generic.view-help": "Seleccione esta opción para ver los metadatos del artículo.",
 
-	// "thumbnail.default.placeholder": "No Thumbnail Available",
-	"thumbnail.default.placeholder": "No hay miniatura disponible",
+  // "submission.workflow.tasks.claimed.approve": "Approve",
+  "submission.workflow.tasks.claimed.approve": "Aprobar",
 
-	// "thumbnail.project.alt": "Project Logo",
-	"thumbnail.project.alt": "Logotipo del proyecto",
+  // "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the item and it is suitable for inclusion in the collection, select \"Approve\".",
+  "submission.workflow.tasks.claimed.approve_help": "Si ha revisado el artículo y es adecuado para su inclusión en la colección, seleccione \"Aprobar \".",
 
-	// "thumbnail.project.placeholder": "Project Placeholder Image",
-	"thumbnail.project.placeholder": "Imagen de marcador de posición del proyecto",
+  // "submission.workflow.tasks.claimed.edit": "Edit",
+  "submission.workflow.tasks.claimed.edit": "Editar",
 
-	// "thumbnail.orgunit.alt": "OrgUnit Logo",
-	"thumbnail.orgunit.alt": "Logotipo de OrgUnit",
+  // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
+  "submission.workflow.tasks.claimed.edit_help": "Seleccione esta opción para cambiar los metadatos del artículo.",
 
-	// "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
-	"thumbnail.orgunit.placeholder": "Imagen de marcador de posición de unidad organizativa",
+  // "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
+  "submission.workflow.tasks.claimed.reject.reason.info": "Introduzca su motivo para rechazar el envío en el cuadro a continuación, indicando si el remitente puede solucionar un problema y volver a enviarlo.",
 
-	// "thumbnail.person.alt": "Profile Picture",
-	"thumbnail.person.alt": "Foto de perfil",
+  // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
+  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describa el motivo del rechazo.",
 
-	// "thumbnail.person.placeholder": "No Profile Picture Available",
-	"thumbnail.person.placeholder": "No hay imagen de perfil disponible",
+  // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
+  "submission.workflow.tasks.claimed.reject.reason.submit": "Rechazar el ítem",
 
+  // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
+  "submission.workflow.tasks.claimed.reject.reason.title": "Razón",
 
+  // "submission.workflow.tasks.claimed.reject.submit": "Reject",
+  "submission.workflow.tasks.claimed.reject.submit": "Rechazar",
 
-	// "title": "DSpace",
-	"title": "DSpace",
+  // "submission.workflow.tasks.claimed.reject_help": "If you have reviewed the item and found it is <strong>not</strong> suitable for inclusion in the collection, select \"Reject\".  You will then be asked to enter a message indicating why the item is unsuitable, and whether the submitter should change something and resubmit.",
+  "submission.workflow.tasks.claimed.reject_help": "Si ha revisado el ítem y ha encontrado que <strong> no </strong> es adecuado para su inclusión en la colección, seleccione \"Rechazar\". Luego, se le pedirá que introduzca un mensaje que indique por qué el artículo no es adecuado y si el remitente debe cambiar algo y volver a enviarlo.",
 
+  // "submission.workflow.tasks.claimed.return": "Return to pool",
+  "submission.workflow.tasks.claimed.return": "Volver al pool",
 
+  // "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
+  "submission.workflow.tasks.claimed.return_help": "Devuelva la tarea al pool para que otro usuario pueda realizarla.",
 
-	// "vocabulary-treeview.header": "Hierarchical tree view",
-	"vocabulary-treeview.header": "Vista de árbol jerárquico",
 
-	// "vocabulary-treeview.load-more": "Load more",
-	"vocabulary-treeview.load-more": "Carga más",
 
-	// "vocabulary-treeview.search.form.reset": "Reset",
-	"vocabulary-treeview.search.form.reset": "Reiniciar",
+  // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
+  "submission.workflow.tasks.generic.error": "Ocurrió un error durante la operación...",
 
-	// "vocabulary-treeview.search.form.search": "Search",
-	"vocabulary-treeview.search.form.search": "Buscar",
+  // "submission.workflow.tasks.generic.processing": "Processing...",
+  "submission.workflow.tasks.generic.processing": "Procesando...",
 
-	// "vocabulary-treeview.search.no-result": "There were no items to show",
-	"vocabulary-treeview.search.no-result": "No había artículos para mostrar",
+  // "submission.workflow.tasks.generic.submitter": "Submitter",
+  "submission.workflow.tasks.generic.submitter": "Remitente",
 
-	// "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
-	"vocabulary-treeview.tree.description.nsi": "El índice científico noruego",
+  // "submission.workflow.tasks.generic.success": "Operation successful",
+  "submission.workflow.tasks.generic.success": "Operación exitosa",
 
-	// "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
-	"vocabulary-treeview.tree.description.srsc": "Categorías de temas de investigación",
 
 
+  // "submission.workflow.tasks.pool.claim": "Claim",
+  "submission.workflow.tasks.pool.claim": "Afirmar",
 
-	// "uploader.browse": "browse",
-	"uploader.browse": "examinar",
+  // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
+  "submission.workflow.tasks.pool.claim_help": "Asigne esta tarea a usted mismo.",
 
-	// "uploader.drag-message": "Drag & Drop your files here",
-	"uploader.drag-message": "Arrastrar",
+  // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
+  "submission.workflow.tasks.pool.hide-detail": "Ocultar detalle",
 
-	// "uploader.delete.btn-title": "Delete",
-	"uploader.delete.btn-title": "Borrar",
+  // "submission.workflow.tasks.pool.show-detail": "Show detail",
+  "submission.workflow.tasks.pool.show-detail": "Mostrar detalle",
 
-	// "uploader.or": ", or ",
-	"uploader.or": ", o ",
 
-	// "uploader.processing": "Processing",
-	"uploader.processing": "Procesando",
+  // "submission.workspace.generic.view": "View",
+  "submission.workspace.generic.view": "Ver",
 
-	// "uploader.queue-length": "Queue length",
-	"uploader.queue-length": "Longitud de la cola",
+  // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workspace.generic.view-help": "Seleccione esta opción para ver los metadatos del ítem.",
 
-	// "virtual-metadata.delete-item.info": "Select the types for which you want to save the virtual metadata as real metadata",
-	"virtual-metadata.delete-item.info": "Seleccione los tipos para los que desea guardar los metadatos virtuales como metadatos reales",
 
-	// "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
-	"virtual-metadata.delete-item.modal-head": "Los metadatos virtuales de esta relación",
+  // "thumbnail.default.alt": "Thumbnail Image",
+  "thumbnail.default.alt": "Miniatura",
 
-	// "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
-	"virtual-metadata.delete-relationship.modal-head": "Seleccione los artículos para los que desea guardar los metadatos virtuales como metadatos reales",
+  // "thumbnail.default.placeholder": "No Thumbnail Available",
+  "thumbnail.default.placeholder": "No hay miniatura disponible",
 
+  // "thumbnail.project.alt": "Project Logo",
+  "thumbnail.project.alt": "Logotipo del proyecto",
 
+  // "thumbnail.project.placeholder": "Project Placeholder Image",
+  "thumbnail.project.placeholder": "Imagen del proyecto en el marcador de posición ",
 
-	// "workflowAdmin.search.results.head": "Administer Workflow",
-	"workflowAdmin.search.results.head": "Administrar flujo de trabajo",
+  // "thumbnail.orgunit.alt": "OrgUnit Logo",
+  "thumbnail.orgunit.alt": "Logotipo de Unidad Organizativa",
 
+  // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+ "thumbnail.orgunit.placeholder": "Imagen de Unidad Organizativa en el marcador de posición ",
 
+  // "thumbnail.person.alt": "Profile Picture",
+  "thumbnail.person.alt": "Foto de perfil",
 
-	// "workflow-item.edit.breadcrumbs": "Edit workflowitem",
-	"workflow-item.edit.breadcrumbs": "Editar artículo de flujo de trabajo",
+  // "thumbnail.person.placeholder": "No Profile Picture Available",
+  "thumbnail.person.placeholder": "No hay imagen de perfil disponible",
 
-	// "workflow-item.edit.title": "Edit workflowitem",
-	"workflow-item.edit.title": "Editar artículo de flujo de trabajo",
 
-	// "workflow-item.delete.notification.success.title": "Deleted",
-	"workflow-item.delete.notification.success.title": "Eliminado",
 
-	// "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
-	"workflow-item.delete.notification.success.content": "Este artículo de flujo de trabajo se eliminó correctamente",
+  // "title": "DSpace",
+  "title": "DSpace",
 
-	// "workflow-item.delete.notification.error.title": "Something went wrong",
-	"workflow-item.delete.notification.error.title": "Algo salió mal",
 
-	// "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
-	"workflow-item.delete.notification.error.content": "No se pudo eliminar el artículo del flujo de trabajo",
 
-	// "workflow-item.delete.title": "Delete workflow item",
-	"workflow-item.delete.title": "Eliminar artículo de flujo de trabajo",
+  // "vocabulary-treeview.header": "Hierarchical tree view",
+  "vocabulary-treeview.header": "Vista de árbol jerárquico",
 
-	// "workflow-item.delete.header": "Delete workflow item",
-	"workflow-item.delete.header": "Eliminar artículo de flujo de trabajo",
+  // "vocabulary-treeview.load-more": "Load more",
+  "vocabulary-treeview.load-more": "Cargar más",
 
-	// "workflow-item.delete.button.cancel": "Cancel",
-	"workflow-item.delete.button.cancel": "Cancelar",
+  // "vocabulary-treeview.search.form.reset": "Reset",
+  "vocabulary-treeview.search.form.reset": "Reiniciar",
 
-	// "workflow-item.delete.button.confirm": "Delete",
-	"workflow-item.delete.button.confirm": "Borrar",
+  // "vocabulary-treeview.search.form.search": "Search",
+  "vocabulary-treeview.search.form.search": "Buscar",
 
+  // "vocabulary-treeview.search.no-result": "There were no items to show",
+  "vocabulary-treeview.search.no-result": "No había ítems para mostrar",
 
-	// "workflow-item.send-back.notification.success.title": "Sent back to submitter",
-	"workflow-item.send-back.notification.success.title": "Enviado al remitente",
+  // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+  "vocabulary-treeview.tree.description.nsi": "El Norwegian Science Index",
 
-	// "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
-	"workflow-item.send-back.notification.success.content": "Este artículo de flujo de trabajo se envió correctamente al remitente.",
+  // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
+  "vocabulary-treeview.tree.description.srsc": "Categorías de temas de investigación",
 
-	// "workflow-item.send-back.notification.error.title": "Something went wrong",
-	"workflow-item.send-back.notification.error.title": "Algo salió mal",
 
-	// "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter",
-	"workflow-item.send-back.notification.error.content": "El artículo del flujo de trabajo no se pudo devolver al remitente.",
 
-	// "workflow-item.send-back.title": "Send workflow item back to submitter",
-	"workflow-item.send-back.title": "Enviar el artículo del flujo de trabajo al remitente",
+  // "uploader.browse": "browse",
+  "uploader.browse": "examinar",
 
-	// "workflow-item.send-back.header": "Send workflow item back to submitter",
-	"workflow-item.send-back.header": "Enviar el artículo del flujo de trabajo al remitente",
+  // "uploader.drag-message": "Drag & Drop your files here",
+  "uploader.drag-message": "Arrastrar y soltar sus ficheros aquí",
 
-	// "workflow-item.send-back.button.cancel": "Cancel",
-	"workflow-item.send-back.button.cancel": "Cancelar",
+  // "uploader.delete.btn-title": "Delete",
+  "uploader.delete.btn-title": "Borrar",
 
-	// "workflow-item.send-back.button.confirm": "Send back",
-	"workflow-item.send-back.button.confirm": "Enviar de vuelta",
+  // "uploader.or": ", or ",
+  "uploader.or": ", o ",
 
-	// "workflow-item.view.breadcrumbs": "Workflow View",
-	"workflow-item.view.breadcrumbs": "Vista de flujo de trabajo",
+  // "uploader.processing": "Processing",
+  "uploader.processing": "Procesando",
 
+  // "uploader.queue-length": "Queue length",
+  "uploader.queue-length": "Longitud de la cola",
 
-	// "idle-modal.header": "Session will expire soon",
-	"idle-modal.header": "La sesión caducará pronto",
+  // "virtual-metadata.delete-item.info": "Select the types for which you want to save the virtual metadata as real metadata",
+  "virtual-metadata.delete-item.info": "Seleccione los tipos para los que desea guardar los metadatos virtuales como metadatos reales",
 
-	// "idle-modal.info": "For security reasons, user sessions expire after {{ timeToExpire }} minutes of inactivity. Your session will expire soon. Would you like to extend it or log out?",
-	"idle-modal.info": "Por razones de seguridad, las sesiones de usuario caducan después de {{ timeToExpire }} minutos de inactividad. Tu sesión caducará pronto. ¿Le gustaría extenderla o cerrar la sesión?",
+  // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
+  "virtual-metadata.delete-item.modal-head": "Los metadatos virtuales de esta relación",
 
-	// "idle-modal.log-out": "Log out",
-	"idle-modal.log-out": "Cerrar sesión",
+  // "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
+  "virtual-metadata.delete-relationship.modal-head": "Seleccione los ítems para los que desea guardar los metadatos virtuales como metadatos reales",
 
-	// "idle-modal.extend-session": "Extend session"
-	"idle-modal.extend-session": "Extender sesión",
-}
+
+
+  // "workspace.search.results.head": "Your submissions",
+  "workspace.search.results.head": "Sus envíos",
+
+  // "workflowAdmin.search.results.head": "Administer Workflow",
+  "workflowAdmin.search.results.head": "Administrar flujo de trabajo",
+
+  // "workflow.search.results.head": "Workflow tasks",
+  "workflow.search.results.head": "Tareas del flujo de trabajo",
+
+
+
+  // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
+  "workflow-item.edit.breadcrumbs": "Editar ítem del flujo de trabajo",
+
+  // "workflow-item.edit.title": "Edit workflowitem",
+  "workflow-item.edit.title": "Editar ítem del flujo de trabajo",
+
+  // "workflow-item.delete.notification.success.title": "Deleted",
+  "workflow-item.delete.notification.success.title": "Eliminado",
+
+  // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
+  "workflow-item.delete.notification.success.content": "Este ítem del flujo de trabajo se eliminó correctamente",
+
+  // "workflow-item.delete.notification.error.title": "Something went wrong",
+  "workflow-item.delete.notification.error.title": "Algo salió mal",
+
+  // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
+  "workflow-item.delete.notification.error.content": "No se pudo eliminar el ítem del flujo de trabajo",
+
+  // "workflow-item.delete.title": "Delete workflow item",
+  "workflow-item.delete.title": "Eliminar ítem del flujo de trabajo",
+
+  // "workflow-item.delete.header": "Delete workflow item",
+  "workflow-item.delete.header": "Eliminar ítem del flujo de trabajo",
+
+  // "workflow-item.delete.button.cancel": "Cancel",
+  "workflow-item.delete.button.cancel": "Cancelar",
+
+  // "workflow-item.delete.button.confirm": "Delete",
+  "workflow-item.delete.button.confirm": "Borrar",
+
+
+  // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
+  "workflow-item.send-back.notification.success.title": "Devolver al remitente",
+
+  // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
+  "workflow-item.send-back.notification.success.content": "Este ítem del flujo de trabajo se devolvió correctamente al remitente.",
+
+  // "workflow-item.send-back.notification.error.title": "Something went wrong",
+  "workflow-item.send-back.notification.error.title": "Algo salió mal",
+
+  // "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter",
+  "workflow-item.send-back.notification.error.content": "El ítem del flujo de trabajo no se pudo devolver al remitente.",
+
+  // "workflow-item.send-back.title": "Send workflow item back to submitter",
+  "workflow-item.send-back.title": "Enviar el ítem del flujo de trabajo al remitente",
+
+  // "workflow-item.send-back.header": "Send workflow item back to submitter",
+  "workflow-item.send-back.header": "Enviar el ítem del flujo de trabajo al remitente",
+
+  // "workflow-item.send-back.button.cancel": "Cancel",
+  "workflow-item.send-back.button.cancel": "Cancelar",
+
+  // "workflow-item.send-back.button.confirm": "Send back",
+  "workflow-item.send-back.button.confirm": "Devolver",
+
+  // "workflow-item.view.breadcrumbs": "Workflow View",
+  "workflow-item.view.breadcrumbs": "Vista del flujo de trabajo",
+
+  // "workspace-item.view.breadcrumbs": "Workspace View",
+  "workspace-item.view.breadcrumbs": "Vista del flujo de trabajo",
+
+  // "workspace-item.view.title": "Workspace View",
+  "workspace-item.view.title": "Vista del flujo de trabajo",
+
+  // "idle-modal.header": "Session will expire soon",
+  "idle-modal.header": "La sesión caducará pronto",
+
+  // "idle-modal.info": "For security reasons, user sessions expire after {{ timeToExpire }} minutes of inactivity. Your session will expire soon. Would you like to extend it or log out?",
+  "idle-modal.info": "Por razones de seguridad, las sesiones de usuario caducan después de {{ timeToExpire }} minutos de inactividad. Su sesión caducará pronto. ¿Le gustaría prolongarla o cerrar la sesión?",
+
+  // "idle-modal.log-out": "Log out",
+  "idle-modal.log-out": "Cerrar sesión",
+
+  // "idle-modal.extend-session": "Extend session",
+  "idle-modal.extend-session": "Prolongar la sesión",
+
+  // "researcher.profile.action.processing" : "Processing...",
+  "researcher.profile.action.processing" : "Procesando...",
+
+  // "researcher.profile.associated": "Researcher profile associated",
+  "researcher.profile.associated": "Perfil asociado de investigador",
+
+  // "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+  "researcher.profile.change-visibility.fail": "Ocurrió un error al cambiar la visibilidad del perfil",
+
+  // "researcher.profile.create.new": "Create new",
+  "researcher.profile.create.new": "Crear nuevo",
+
+  // "researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success": "Perfil de investigador creado con éxito",
+
+  // "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
+  "researcher.profile.create.fail": "Ocurrió un error en la creación del perfil de investigador",
+
+  // "researcher.profile.delete": "Delete",
+  "researcher.profile.delete": "Borrar",
+
+  // "researcher.profile.expose": "Expose",
+  "researcher.profile.expose": "Mostrar",
+
+  // "researcher.profile.hide": "Hide",
+  "researcher.profile.hide": "Ocultar",
+
+  // "researcher.profile.not.associated": "Researcher profile not yet associated",
+  "researcher.profile.not.associated": "No hay asociado aún un perfil de investigador",
+
+  // "researcher.profile.view": "View",
+  "researcher.profile.view": "Ver",
+
+  // "researcher.profile.private.visibility" : "PRIVATE",
+  "researcher.profile.private.visibility" : "PRIVADO",
+
+  // "researcher.profile.public.visibility" : "PUBLIC",
+  "researcher.profile.public.visibility" : "PÚBLICO",
+
+  // "researcher.profile.status": "Status:",
+  "researcher.profile.status": "Estado:",
+
+  // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
+  "researcherprofile.claim.not-authorized": "No está autorizado pare reclamar este ítem. Contacte con el administrador para mas detalles.",
+
+  // "researcherprofile.error.claim.body" : "An error occurred while claiming the profile, please try again later",
+  "researcherprofile.error.claim.body" : "Hubo un error reclamando el perfil, por favor, inténtelo mas tarde",
+
+  // "researcherprofile.error.claim.title" : "Error",
+  "researcherprofile.error.claim.title" : "Error",
+
+  // "researcherprofile.success.claim.body" : "Profile claimed with success",
+  "researcherprofile.success.claim.body" : "Perfil reclamado con éxito",
+
+  // "researcherprofile.success.claim.title" : "Success",
+  "researcherprofile.success.claim.title" : "Éxito",
+
+  // "person.page.orcid.create": "Create an ORCID ID",
+  "person.page.orcid.create": "Crear un ORCID ID",
+
+  // "person.page.orcid.granted-authorizations": "Granted authorizations",
+  "person.page.orcid.granted-authorizations": "Autorizaciones concedidas",
+
+  // "person.page.orcid.grant-authorizations" : "Grant authorizations",
+  "person.page.orcid.grant-authorizations" : "Conceder autorizaciones",
+
+  // "person.page.orcid.link": "Connect to ORCID ID",
+  "person.page.orcid.link": "Conectar con ORCID ID",
+
+  // "person.page.orcid.link.processing": "Linking profile to ORCID...",
+  "person.page.orcid.link.processing": "Conectando perfil con ORCID...",
+
+  // "person.page.orcid.link.error.message": "Something went wrong while connecting the profile with ORCID. If the problem persists, contact the administrator.",
+  "person.page.orcid.link.error.message": "Algo falló al conectar el perfil con ORCID. Si el problema continuase, contacte con el administrador.",
+
+  // "person.page.orcid.orcid-not-linked-message": "The ORCID iD of this profile ({{ orcid }}) has not yet been connected to an account on the ORCID registry or the connection is expired.",
+  "person.page.orcid.orcid-not-linked-message": "El ORCID iD de este perfil ({{ orcid }}) no se ha conectado aún con una cuenta en el registro ORCID o la conexión caducó.",
+
+  // "person.page.orcid.unlink": "Disconnect from ORCID",
+  "person.page.orcid.unlink": "Desconectar de  ORCID",
+
+  // "person.page.orcid.unlink.processing": "Processing...",
+  "person.page.orcid.unlink.processing": "Procesando...",
+
+  // "person.page.orcid.missing-authorizations": "Missing authorizations",
+  "person.page.orcid.missing-authorizations": "Faltan autorizaciones",
+
+  // "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
+  "person.page.orcid.missing-authorizations-message": "Faltan las siguientes autorizaciones:",
+
+  // "person.page.orcid.no-missing-authorizations-message": "Great! This box is empty, so you have granted all access rights to use all functions offers by your institution.",
+  "person.page.orcid.no-missing-authorizations-message": "¡Perfecto! esta caja está vacía, por lo que usted ha concedido todos los permisos de acceso para todas las funciones que usa su institución.",
+
+  // "person.page.orcid.no-orcid-message": "No ORCID iD associated yet. By clicking on the button below it is possible to link this profile with an ORCID account.",
+  "person.page.orcid.no-orcid-message": "Aun no está asociado con un ORCID iD. Al pulsar en el botón inferior puede enlazar este perfil con una cuenta ORCID.",
+
+  // "person.page.orcid.profile-preferences": "Profile preferences",
+  "person.page.orcid.profile-preferences": "Preferencias del perfil",
+
+  // "person.page.orcid.funding-preferences": "Funding preferences",
+  "person.page.orcid.funding-preferences": "Preferencias de financiación",
+
+  // "person.page.orcid.publications-preferences": "Publication preferences",
+  "person.page.orcid.publications-preferences": "Preferencias de publicación",
+
+  // "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator",
+  "person.page.orcid.remove-orcid-message": "Si necesita retirar su ORCID, contacte por favor con el administrador del repositorio",
+
+  // "person.page.orcid.save.preference.changes": "Update settings",
+  "person.page.orcid.save.preference.changes": "Actualizar configuración",
+
+  // "person.page.orcid.sync-profile.affiliation" : "Affiliation",
+  "person.page.orcid.sync-profile.affiliation" : "Afiliación",
+
+  // "person.page.orcid.sync-profile.biographical" : "Biographical data",
+  "person.page.orcid.sync-profile.biographical" : "Biografía",
+
+  // "person.page.orcid.sync-profile.education" : "Education",
+  "person.page.orcid.sync-profile.education" : "Grados",
+
+  // "person.page.orcid.sync-profile.identifiers" : "Identifiers",
+  "person.page.orcid.sync-profile.identifiers" : "Identificadores",
+
+  // "person.page.orcid.sync-fundings.all" : "All fundings",
+  "person.page.orcid.sync-fundings.all" : "Todas las financiaciones",
+
+  // "person.page.orcid.sync-fundings.mine" : "My fundings",
+  "person.page.orcid.sync-fundings.mine" : "Mi financiación ",
+
+  // "person.page.orcid.sync-fundings.my_selected" : "Selected fundings",
+  "person.page.orcid.sync-fundings.my_selected" : "Financiaciones seleccionadas",
+
+  // "person.page.orcid.sync-fundings.disabled" : "Disabled",
+  "person.page.orcid.sync-fundings.disabled" : "Deshabilitado",
+
+  // "person.page.orcid.sync-publications.all" : "All publications",
+  "person.page.orcid.sync-publications.all" : "Todas las publicaciones",
+
+  // "person.page.orcid.sync-publications.mine" : "My publications",
+  "person.page.orcid.sync-publications.mine" : "Mis publicaciones",
+
+  // "person.page.orcid.sync-publications.my_selected" : "Selected publications",
+  "person.page.orcid.sync-publications.my_selected" : "Publicaciones seleccionadas",
+
+  // "person.page.orcid.sync-publications.disabled" : "Disabled",
+  "person.page.orcid.sync-publications.disabled" : "Deshabilitado",
+
+  // "person.page.orcid.sync-queue.discard" : "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard" : "Deshechar el cambio y no sincronizar con ORCID",
+
+  // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+  "person.page.orcid.sync-queue.discard.error": "Falló el borrado del registro ORCID en la cola",
+
+  // "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  "person.page.orcid.sync-queue.discard.success": "El registro ORCID ha sido eliminado exitosamente de la cola",
+
+  // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  "person.page.orcid.sync-queue.empty-message": "La cola del registro de ORCID está vacía",
+
+  // "person.page.orcid.sync-queue.table.header.type" : "Type",
+  "person.page.orcid.sync-queue.table.header.type" : "Tipo",
+
+  // "person.page.orcid.sync-queue.table.header.description" : "Description",
+  "person.page.orcid.sync-queue.table.header.description" : "Descripción",
+
+  // "person.page.orcid.sync-queue.table.header.action" : "Action",
+  "person.page.orcid.sync-queue.table.header.action" : "Acción",
+
+  // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+  "person.page.orcid.sync-queue.description.affiliation": "Affiliaciones",
+
+  // "person.page.orcid.sync-queue.description.country": "Country",
+  "person.page.orcid.sync-queue.description.country": "Pais",
+
+  // "person.page.orcid.sync-queue.description.education": "Educations",
+  "person.page.orcid.sync-queue.description.education": "Grados",
+
+  // "person.page.orcid.sync-queue.description.external_ids": "External ids",
+  "person.page.orcid.sync-queue.description.external_ids": "IDs externos",
+
+  // "person.page.orcid.sync-queue.description.other_names": "Other names",
+  "person.page.orcid.sync-queue.description.other_names": "Otras firmas",
+
+  // "person.page.orcid.sync-queue.description.qualification": "Qualifications",
+  "person.page.orcid.sync-queue.description.qualification": "Cualificaciones",
+
+  // "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URLs del Investigador",
+
+  // "person.page.orcid.sync-queue.description.keywords": "Keywords",
+  "person.page.orcid.sync-queue.description.keywords": "Palabras clave",
+
+  // "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.insert": "Añadir una nueva entrada al registro ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.update": "Actualizar esta entrada en el registro ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.delete": "Retirar esta entrada del registro ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.publication": "Publication",
+  "person.page.orcid.sync-queue.tooltip.publication": "Publicación",
+
+  // "person.page.orcid.sync-queue.tooltip.project": "Project",
+  "person.page.orcid.sync-queue.tooltip.project": "Proyecto",
+
+  // "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Afiliación",
+
+  // "person.page.orcid.sync-queue.tooltip.education": "Education",
+  "person.page.orcid.sync-queue.tooltip.education": "Grados",
+
+  // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Cualificación",
+
+  // "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Otras firmas",
+
+  // "person.page.orcid.sync-queue.tooltip.country": "Country",
+  "person.page.orcid.sync-queue.tooltip.country": "País",
+
+  // "person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Palabras clave",
+
+  // "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Identificador externo",
+
+  // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL del investigador",
+
+  // "person.page.orcid.sync-queue.send" : "Synchronize with ORCID registry",
+  "person.page.orcid.sync-queue.send" : "Sincronizar con el registro ORCID",
+
+  // "person.page.orcid.sync-queue.send.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.",
+  "person.page.orcid.sync-queue.send.unauthorized-error.title": "Falló el envío a ORCID debdo a autorización insuficiente.",
+
+  // "person.page.orcid.sync-queue.send.unauthorized-error.content": "Click <a href='{{orcid}}'>here</a> to grant again the required permissions. If the problem persists, contact the administrator",
+  "person.page.orcid.sync-queue.send.unauthorized-error.content": "Pulse <a href='{{orcid}}'>aquí</a> para conceder de nuevo los permisos requeridos. Si el problema continuase, contacte con el administrador",
+
+  // "person.page.orcid.sync-queue.send.bad-request-error": "The submission to ORCID failed because the resource sent to ORCID registry is not valid",
+  "person.page.orcid.sync-queue.send.bad-request-error": "El envío a  ORCID falló debido a que el recurso que se envión no era válido",
+
+  // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
+  "person.page.orcid.sync-queue.send.error": "Falló el envío a ORCID",
+
+  // "person.page.orcid.sync-queue.send.conflict-error": "The submission to ORCID failed because the resource is already present on the ORCID registry",
+  "person.page.orcid.sync-queue.send.conflict-error": "El envío a  ORCID falló debido a que el recurso ya existía en el registro ORCID",
+
+  // "person.page.orcid.sync-queue.send.not-found-warning": "The resource does not exists anymore on the ORCID registry.",
+  "person.page.orcid.sync-queue.send.not-found-warning": "El recurso no existe ya en el registro ORCID.",
+
+  // "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+  "person.page.orcid.sync-queue.send.success": "El envío a ORCID ha sido completado con éxito",
+
+  // "person.page.orcid.sync-queue.send.validation-error": "The data that you want to synchronize with ORCID is not valid",
+  "person.page.orcid.sync-queue.send.validation-error": "Los datos que quiere sincronizar con ORCID no son válidos",
+
+  // "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "The amount's currency is required",
+  "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "Se requiere la divisa de la cantidad",
+
+  // "person.page.orcid.sync-queue.send.validation-error.external-id.required": "The resource to be sent requires at least one identifier",
+  "person.page.orcid.sync-queue.send.validation-error.external-id.required": "El recurso que se quiere enviar necesita al menos un identificador",
+
+  // "person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "Se requiere un título",
+
+  // "person.page.orcid.sync-queue.send.validation-error.type.required": "The dc.type is required",
+  "person.page.orcid.sync-queue.send.validation-error.type.required": "Se requiere un  dc.type",
+
+  // "person.page.orcid.sync-queue.send.validation-error.start-date.required": "The start date is required",
+  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "Se requiere una fecha de comienzo",
+
+  // "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "Se requiere un financiador",
+
+  // "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Invalid 2 digits ISO 3166 country",
+  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Los 2 dígitos ISO 3166 de pais son inválidos",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "Se requiere una organización",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "The organization's name is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "Se requiere el nombre de la organización",
+
+  // "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid" : "The publication date must be one year after 1900",
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid" : "la fecha de la publicación debe ser posterior a 1900",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "The organization to be sent requires an address",
+  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "Se requiere la dirección de la organización",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "The address of the organization to be sent requires a city",
+  "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "Se requiere que la dirección de la organización tenga una ciudad",
+  
+  // "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "The address of the organization to be sent requires a valid 2 digits ISO 3166 country",
+  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "Se requiere que la dirección de la organización tenga un código de pais de 2 dígitos ISO 3166 válido",
+
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "An identifier to disambiguate organizations is required. Supported ids are GRID, Ringgold, Legal Entity identifiers (LEIs) and Crossref Funder Registry identifiers",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "Se requiere un identificador para desambiguar la organización. Los identificadores admitidos son GRID, Ringgold, Legal Entity identifiers (LEIs) y Crossref Funder Registry",
+
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "The organization's identifiers requires a value",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "Se requiere que los identificadores de la organización tengan un valor",
+  
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "The organization's identifiers requires a source",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "Se requiere que los identificadores de la organización tengan una fuente",
+
+   //  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "The source of one of the organization identifiers is invalid. Supported sources are RINGGOLD, GRID, LEI and FUNDREF",
+   "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "La fuente de uno de los identificadores de organización es inválida. Las fuentes admitidas son RINGGOLD, GRID, LEI and FUNDREF",
+
+  // "person.page.orcid.synchronization-mode": "Synchronization mode",
+  "person.page.orcid.synchronization-mode": "Modo sincronización",
+
+  // "person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.batch": "Batch",
+
+  // "person.page.orcid.synchronization-mode.label": "Synchronization mode",
+  "person.page.orcid.synchronization-mode.label": "Modo sincronización",
+
+  // "person.page.orcid.synchronization-mode-message": "Please select how you would like synchronization to ORCID to occur.   The options include \"Manual\" (you must send your data to ORCID manually), or \"Batch\" (the system will send your data to ORCID via a scheduled script).",
+  "person.page.orcid.synchronization-mode-message": "Seleccione cómo prefiere realizar la sincronización con ORCID.  Puede escoger  \"Manual\" (usted envía los datos a ORCID manualmente), o \"Batch\" (el sistema enviará sus datos a ORCID via un programa planificado).",
+
+  // "person.page.orcid.synchronization-mode-funding-message": "Select whether to send your linked Project entities to your ORCID record's list of funding information.",
+  "person.page.orcid.synchronization-mode-funding-message": "Seleccione si enviará información de sus entidades conectadas de tipo Proyecto a la información de financiación de ORCID.",
+
+  // "person.page.orcid.synchronization-mode-publication-message": "Select whether to send your linked Publication entities to your ORCID record's list of works.",
+  "person.page.orcid.synchronization-mode-publication-message": "Seleccione si enviará información de sus entidades conectadas de tipo Publicación a la información de trabajos de ORCID.",
+
+  // "person.page.orcid.synchronization-mode-profile-message": "Select whether to send your biographical data or personal identifiers to your ORCID record.",
+  "person.page.orcid.synchronization-mode-profile-message": "Seleccione si enviará información de sus datos biográficos o identificadores personales a ORCID",
+
+  // "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
+  "person.page.orcid.synchronization-settings-update.success": "Los ajustes de sincronización se han actualizado con éxito",
+
+  // "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+  "person.page.orcid.synchronization-settings-update.error": "Ha fallado la actualización de los ajustes de sincronización",
+
+  // "person.page.orcid.synchronization-mode.manual": "Manual",
+  "person.page.orcid.synchronization-mode.manual": "Manual",
+
+  // "person.page.orcid.scope.authenticate": "Get your ORCID iD",
+  "person.page.orcid.scope.authenticate": "Obtenga su ORCID iD",
+
+  // "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
+  "person.page.orcid.scope.read-limited": "Lea su información con la visibilidad ajustada a Terceros Confiables",
+
+  // "person.page.orcid.scope.activities-update": "Add/update your research activities",
+  "person.page.orcid.scope.activities-update": "Añada/actualice sus actividades de investigación",
+
+  // "person.page.orcid.scope.person-update": "Add/update other information about you",
+  "person.page.orcid.scope.person-update": "Añada/actualice otras informaciones sobre usted",
+
+  // "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  "person.page.orcid.unlink.success": "Se efectuó con éxito la desconexión entre el perfil y el registro de ORCID",
+
+  // "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+  "person.page.orcid.unlink.error": "Hubo un error en la desconexión entre el perfil y el registro de ORCID. Inténtelo de nuevo",
+
+  // "person.orcid.sync.setting": "ORCID Synchronization settings",
+  "person.orcid.sync.setting": "Ajustes de sincronización de ORCID",
+
+  // "person.orcid.registry.queue": "ORCID Registry Queue",
+  // TODO New key - Add a translation
+  "person.orcid.registry.queue": "Cola de registro de ORCID  ",
+
+  // "person.orcid.registry.auth": "ORCID Authorizations",
+  "person.orcid.registry.auth": "Autorizaciones ORCID ",
+
+
+
+}
\ No newline at end of file

From e464c0f8c7d44050fa22e32ec349894dffac9ea6 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 25 Aug 2022 14:01:23 +0200
Subject: [PATCH 16/48] 92900: Move duplicate code to new InitService method

---
 src/app/init.service.spec.ts                 |  24 ++-
 src/app/init.service.ts                      |  15 ++
 src/modules/app/browser-init.service.spec.ts | 155 -------------------
 src/modules/app/browser-init.service.ts      |  22 +--
 src/modules/app/server-init.service.ts       |   7 +-
 5 files changed, 44 insertions(+), 179 deletions(-)
 delete mode 100644 src/modules/app/browser-init.service.spec.ts

diff --git a/src/app/init.service.spec.ts b/src/app/init.service.spec.ts
index 2c9edfd4e0..592abdfd42 100644
--- a/src/app/init.service.spec.ts
+++ b/src/app/init.service.spec.ts
@@ -5,7 +5,7 @@ import { inject, TestBed, waitForAsync } from '@angular/core/testing';
 import { MetadataService } from './core/metadata/metadata.service';
 import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service';
 import { CommonModule } from '@angular/common';
-import { StoreModule } from '@ngrx/store';
+import { Store, StoreModule } from '@ngrx/store';
 import { authReducer } from './core/auth/auth.reducer';
 import { storeModuleConfig } from './app.reducer';
 import { AngularticsProviderMock } from './shared/mocks/angulartics-provider.service.mock';
@@ -31,6 +31,7 @@ import { getMockThemeService } from './shared/mocks/theme-service.mock';
 import objectContaining = jasmine.objectContaining;
 import createSpyObj = jasmine.createSpyObj;
 import SpyObj = jasmine.SpyObj;
+import { getTestScheduler } from 'jasmine-marbles';
 
 let spy: SpyObj<any>;
 
@@ -124,6 +125,15 @@ describe('InitService', () => {
     let metadataServiceSpy;
     let breadcrumbsServiceSpy;
 
+    const BLOCKING = {
+      t: {  core: { auth: { blocking: true } } },
+      f: {  core: { auth: { blocking: false } } },
+    };
+    const BOOLEAN = {
+      t: true,
+      f: false,
+    };
+
     beforeEach(waitForAsync(() => {
       correlationIdServiceSpy = jasmine.createSpyObj('correlationIdServiceSpy', [
         'initCorrelationId',
@@ -182,6 +192,18 @@ describe('InitService', () => {
         expect(breadcrumbsServiceSpy.listenForRouteChanges).toHaveBeenCalledTimes(1);
       }));
     });
+
+    describe('authenticationReady', () => {
+      it('should emit & complete the first time auth is unblocked', () => {
+        getTestScheduler().run(({ cold, expectObservable }) => {
+          TestBed.overrideProvider(Store, { useValue: cold('t--t--f--t--f--', BLOCKING) });
+          const service = TestBed.inject(InitService);
+
+          // @ts-ignore
+          expectObservable(service.authenticationReady$()).toBe('------(f|)', BOOLEAN);
+        });
+      });
+    });
   });
 });
 
diff --git a/src/app/init.service.ts b/src/app/init.service.ts
index 30630e1d84..3af8b6ceb6 100644
--- a/src/app/init.service.ts
+++ b/src/app/init.service.ts
@@ -20,6 +20,9 @@ import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
 import { MetadataService } from './core/metadata/metadata.service';
 import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service';
 import { ThemeService } from './shared/theme-support/theme.service';
+import { isAuthenticationBlocking } from './core/auth/selectors';
+import { distinctUntilChanged, find } from 'rxjs/operators';
+import { Observable } from 'rxjs';
 
 /**
  * Performs the initialization of the app.
@@ -186,4 +189,16 @@ export abstract class InitService {
     this.breadcrumbsService.listenForRouteChanges();
     this.themeService.listenForRouteChanges();
   }
+
+  /**
+   * Emits once authentication is ready (no longer blocking)
+   * @protected
+   */
+  protected authenticationReady$(): Observable<boolean> {
+    return this.store.pipe(
+      select(isAuthenticationBlocking),
+      distinctUntilChanged(),
+      find((b: boolean) => b === false)
+    );
+  }
 }
diff --git a/src/modules/app/browser-init.service.spec.ts b/src/modules/app/browser-init.service.spec.ts
deleted file mode 100644
index 05da7d9d36..0000000000
--- a/src/modules/app/browser-init.service.spec.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-import { InitService } from '../../app/init.service';
-import { APP_CONFIG } from 'src/config/app-config.interface';
-import { inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { GoogleAnalyticsService } from '../../app/statistics/google-analytics.service';
-import { MetadataService } from '../../app/core/metadata/metadata.service';
-import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service';
-import { CommonModule } from '@angular/common';
-import { Store, StoreModule } from '@ngrx/store';
-import { authReducer } from '../../app/core/auth/auth.reducer';
-import { storeModuleConfig } from '../../app/app.reducer';
-import { AngularticsProviderMock } from '../../app/shared/mocks/angulartics-provider.service.mock';
-import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
-import { AuthService } from '../../app/core/auth/auth.service';
-import { AuthServiceMock } from '../../app/shared/mocks/auth.service.mock';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterMock } from '../../app/shared/mocks/router.mock';
-import { MockActivatedRoute } from '../../app/shared/mocks/active-router.mock';
-import { MenuService } from '../../app/shared/menu/menu.service';
-import { LocaleService } from '../../app/core/locale/locale.service';
-import { environment } from '../../environments/environment';
-import { provideMockStore } from '@ngrx/store/testing';
-import { AppComponent } from '../../app/app.component';
-import { RouteService } from '../../app/core/services/route.service';
-import { getMockLocaleService } from '../../app/app.component.spec';
-import { MenuServiceStub } from '../../app/shared/testing/menu-service.stub';
-import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
-import { KlaroService } from '../../app/shared/cookies/klaro.service';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../app/shared/mocks/translate-loader.mock';
-import { getTestScheduler } from 'jasmine-marbles';
-import { ThemeService } from '../../app/shared/theme-support/theme.service';
-import { getMockThemeService } from '../../app/shared/mocks/theme-service.mock';
-import { BrowserInitService } from './browser-init.service';
-import { TransferState } from '@angular/platform-browser';
-
-const initialState = {
-  core: {
-    auth: {
-      loading: false,
-      blocking: true,
-    }
-  }
-};
-
-describe('BrowserInitService', () => {
-  describe('browser-specific initialization steps', () => {
-    let correlationIdServiceSpy;
-    let dspaceTransferStateSpy;
-    let transferStateSpy;
-    let metadataServiceSpy;
-    let breadcrumbsServiceSpy;
-    let klaroServiceSpy;
-    let googleAnalyticsSpy;
-
-    beforeEach(waitForAsync(() => {
-      correlationIdServiceSpy = jasmine.createSpyObj('correlationIdServiceSpy', [
-        'initCorrelationId',
-      ]);
-      dspaceTransferStateSpy = jasmine.createSpyObj('dspaceTransferStateSpy', [
-        'transfer',
-      ]);
-      transferStateSpy = jasmine.createSpyObj('dspaceTransferStateSpy', [
-        'get', 'hasKey'
-      ]);
-      breadcrumbsServiceSpy = jasmine.createSpyObj('breadcrumbsServiceSpy', [
-        'listenForRouteChanges',
-      ]);
-      metadataServiceSpy = jasmine.createSpyObj('metadataService', [
-        'listenForRouteChange',
-      ]);
-      klaroServiceSpy = jasmine.createSpyObj('klaroServiceSpy', [
-        'initialize',
-      ]);
-      googleAnalyticsSpy = jasmine.createSpyObj('googleAnalyticsService', [
-        'addTrackingIdToPage',
-      ]);
-
-
-      TestBed.resetTestingModule();
-      TestBed.configureTestingModule({
-        imports: [
-          CommonModule,
-          StoreModule.forRoot(authReducer, storeModuleConfig),
-          TranslateModule.forRoot({
-            loader: {
-              provide: TranslateLoader,
-              useClass: TranslateLoaderMock
-            }
-          }),
-        ],
-        providers: [
-          { provide: InitService, useClass: BrowserInitService },
-          { provide: CorrelationIdService, useValue: correlationIdServiceSpy },
-          { provide: APP_CONFIG, useValue: environment },
-          { provide: LocaleService, useValue: getMockLocaleService() },
-          { provide: Angulartics2DSpace, useValue: new AngularticsProviderMock() },
-          { provide: MetadataService, useValue: metadataServiceSpy },
-          { provide: BreadcrumbsService, useValue: breadcrumbsServiceSpy },
-          { provide: AuthService, useValue: new AuthServiceMock() },
-          { provide: Router, useValue: new RouterMock() },
-          { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
-          { provide: MenuService, useValue: new MenuServiceStub() },
-          { provide: KlaroService, useValue: klaroServiceSpy },
-          { provide: GoogleAnalyticsService, useValue: googleAnalyticsSpy },
-          { provide: ThemeService, useValue: getMockThemeService() },
-          provideMockStore({ initialState }),
-          AppComponent,
-          RouteService,
-          { provide: TransferState, useValue: undefined },
-        ]
-      });
-    }));
-
-    describe('initGoogleÀnalytics', () => {
-      it('should call googleAnalyticsService.addTrackingIdToPage()', inject([InitService], (service) => {
-        // @ts-ignore
-        service.initGoogleAnalytics();
-        expect(googleAnalyticsSpy.addTrackingIdToPage).toHaveBeenCalledTimes(1);
-      }));
-    });
-
-    describe('initKlaro', () => {
-      const BLOCKING = {
-        t: {  core: { auth: { blocking: true } } },
-        f: {  core: { auth: { blocking: false } } },
-      };
-
-      it('should not initialize Klaro while auth is blocking', () => {
-        getTestScheduler().run(({ cold, flush}) => {
-          TestBed.overrideProvider(Store, { useValue: cold('t--t--t--', BLOCKING) });
-          const service = TestBed.inject(InitService);
-
-          // @ts-ignore
-          service.initKlaro();
-          flush();
-          expect(klaroServiceSpy.initialize).not.toHaveBeenCalled();
-        });
-      });
-
-
-      it('should only initialize Klaro the first time auth is unblocked', () => {
-        getTestScheduler().run(({ cold, flush}) => {
-          TestBed.overrideProvider(Store, { useValue: cold('t--t--f--t--f--', BLOCKING) });
-          const service = TestBed.inject(InitService);
-
-          // @ts-ignore
-          service.initKlaro();
-          flush();
-          expect(klaroServiceSpy.initialize).toHaveBeenCalledTimes(1);
-        });
-      });
-    });
-  });
-});
-
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index 2d49870d58..05c591b0c6 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -6,7 +6,7 @@
  * http://www.dspace.org/license/
  */
 import { InitService } from '../../app/init.service';
-import { select, Store } from '@ngrx/store';
+import { Store } from '@ngrx/store';
 import { AppState } from '../../app/app.reducer';
 import { TransferState } from '@angular/platform-browser';
 import { APP_CONFIG, APP_CONFIG_STATE, AppConfig } from '../../config/app-config.interface';
@@ -21,15 +21,13 @@ import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-prov
 import { GoogleAnalyticsService } from '../../app/statistics/google-analytics.service';
 import { MetadataService } from '../../app/core/metadata/metadata.service';
 import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service';
-import { CSSVariableService } from '../../app/shared/sass-helper/sass-helper.service';
 import { KlaroService } from '../../app/shared/cookies/klaro.service';
 import { AuthService } from '../../app/core/auth/auth.service';
 import { ThemeService } from '../../app/shared/theme-support/theme.service';
 import { StoreAction, StoreActionTypes } from '../../app/store.actions';
 import { coreSelector } from '../../app/core/core.selectors';
-import { distinctUntilChanged, filter, find, map, take } from 'rxjs/operators';
+import { find, map } from 'rxjs/operators';
 import { isNotEmpty } from '../../app/shared/empty.util';
-import { isAuthenticationBlocking } from '../../app/core/auth/selectors';
 
 /**
  * Performs client-side initialization.
@@ -91,12 +89,7 @@ export class BrowserInitService extends InitService {
 
       this.initKlaro();
 
-      // wait for auth to be ready
-      await this.store.pipe(
-        select(isAuthenticationBlocking),
-        distinctUntilChanged(),
-        find((b: boolean) => b === false)
-      ).toPromise();
+      await this.authenticationReady$().toPromise();
 
       return true;
     };
@@ -124,16 +117,11 @@ export class BrowserInitService extends InitService {
   }
 
   /**
-   * Initialize Klaro
+   * Initialize Klaro (once authentication is resolved)
    * @protected
    */
   protected initKlaro() {
-    this.store.pipe(
-      select(isAuthenticationBlocking),
-      distinctUntilChanged(),
-      filter((isBlocking: boolean) => isBlocking === false),
-      take(1)
-    ).subscribe(() => {
+    this.authenticationReady$().subscribe(() => {
       this.klaroService.initialize();
     });
   }
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index fb3539ecfa..2e35083bf4 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -67,12 +67,7 @@ export class ServerInitService extends InitService {
       this.initRouteListeners();
       this.themeService.listenForThemeChanges(false);
 
-      // wait for auth to be ready
-      await this.store.pipe(
-        select(isAuthenticationBlocking),
-        distinctUntilChanged(),
-        find((b: boolean) => b === false)
-      ).toPromise();
+      await this.authenticationReady$().toPromise();
 
       return true;
     };

From db169251dfadc552f9e3c516316326fd22a383b9 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 25 Aug 2022 13:59:40 +0200
Subject: [PATCH 17/48] 92900: Update docs & specs for AuthRequestService

---
 .../core/auth/auth-request.service.spec.ts    | 161 ++++++++++++++----
 src/app/core/auth/auth-request.service.ts     |  16 ++
 2 files changed, 146 insertions(+), 31 deletions(-)

diff --git a/src/app/core/auth/auth-request.service.spec.ts b/src/app/core/auth/auth-request.service.spec.ts
index 707daf9e30..2afeb26b02 100644
--- a/src/app/core/auth/auth-request.service.spec.ts
+++ b/src/app/core/auth/auth-request.service.spec.ts
@@ -7,57 +7,156 @@ import { TestScheduler } from 'rxjs/testing';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { ShortLivedToken } from './models/short-lived-token.model';
 import { RemoteData } from '../data/remote-data';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import objectContaining = jasmine.objectContaining;
+import { AuthStatus } from './models/auth-status.model';
+import { RestRequestMethod } from '../data/rest-request-method';
 
 describe(`AuthRequestService`, () => {
   let halService: HALEndpointService;
   let endpointURL: string;
+  let requestID: string;
   let shortLivedToken: ShortLivedToken;
   let shortLivedTokenRD: RemoteData<ShortLivedToken>;
   let requestService: RequestService;
   let rdbService: RemoteDataBuildService;
-  let service: AuthRequestService;
+  let service;
   let testScheduler;
 
-    class TestAuthRequestService extends AuthRequestService {
-      constructor(
-        hes: HALEndpointService,
-        rs: RequestService,
-        rdbs: RemoteDataBuildService
-      ) {
-        super(hes, rs, rdbs);
-      }
+  const status = new AuthStatus();
 
-      protected createShortLivedTokenRequest(href: string): PostRequest {
-        return new PostRequest(this.requestService.generateRequestId(), href);
-      }
+  class TestAuthRequestService extends AuthRequestService {
+    constructor(
+      hes: HALEndpointService,
+      rs: RequestService,
+      rdbs: RemoteDataBuildService
+    ) {
+      super(hes, rs, rdbs);
     }
 
-    const init = (cold: typeof TestScheduler.prototype.createColdObservable) => {
-      endpointURL = 'https://rest.api/auth';
-      shortLivedToken = Object.assign(new ShortLivedToken(), {
-        value: 'some-token'
-      });
-      shortLivedTokenRD = createSuccessfulRemoteDataObject(shortLivedToken);
+    protected createShortLivedTokenRequest(href: string): PostRequest {
+      return new PostRequest(this.requestService.generateRequestId(), href);
+    }
+  }
 
-      halService = jasmine.createSpyObj('halService', {
-        'getEndpoint': cold('a', { a: endpointURL })
-      });
-      requestService = jasmine.createSpyObj('requestService', {
-        'send': null
-      });
-      rdbService = jasmine.createSpyObj('rdbService', {
-        'buildFromRequestUUID': cold('a', { a: shortLivedTokenRD })
-      });
+  const init = (cold: typeof TestScheduler.prototype.createColdObservable) => {
+    endpointURL = 'https://rest.api/auth';
+    requestID = 'requestID';
+    shortLivedToken = Object.assign(new ShortLivedToken(), {
+      value: 'some-token'
+    });
+    shortLivedTokenRD = createSuccessfulRemoteDataObject(shortLivedToken);
 
-      service = new TestAuthRequestService(halService, requestService, rdbService);
-    };
+    halService = jasmine.createSpyObj('halService', {
+      'getEndpoint': cold('a', { a: endpointURL })
+    });
+    requestService = jasmine.createSpyObj('requestService', {
+      'generateRequestId': requestID,
+      'send': null,
+    });
+    rdbService = jasmine.createSpyObj('rdbService', {
+      'buildFromRequestUUID': cold('a', { a: shortLivedTokenRD })
+    });
+
+    service = new TestAuthRequestService(halService, requestService, rdbService);
+
+    spyOn(service as any, 'fetchRequest').and.returnValue(cold('a', { a: createSuccessfulRemoteDataObject(status) }));
+  };
+
+  beforeEach(() => {
+    testScheduler = new TestScheduler((actual, expected) => {
+      expect(actual).toEqual(expected);
+    });
+  });
+
+  describe('REST request methods', () => {
+    let options: HttpOptions;
 
     beforeEach(() => {
-      testScheduler = new TestScheduler((actual, expected) => {
-        expect(actual).toEqual(expected);
+      options = Object.create({});
+    });
+
+    describe('GET', () => {
+      it('should send a GET request to the right endpoint and return the auth status', () => {
+        testScheduler.run(({ cold, expectObservable, flush }) => {
+          init(cold);
+
+          expectObservable(service.getRequest('method', options)).toBe('a', {
+            a: objectContaining({ payload: status }),
+          });
+          flush();
+
+          expect(requestService.send).toHaveBeenCalledWith(objectContaining({
+            uuid: requestID,
+            href: endpointURL + '/method',
+            method: RestRequestMethod.GET,
+            body: undefined,
+            options,
+          }));
+          expect((service as any).fetchRequest).toHaveBeenCalledWith(requestID);
+        });
+      });
+
+      it('should send the request even if caller doesn\'t subscribe to the response', () => {
+        testScheduler.run(({ cold, flush }) => {
+          init(cold);
+
+          service.getRequest('method', options);
+          flush();
+
+          expect(requestService.send).toHaveBeenCalledWith(objectContaining({
+            uuid: requestID,
+            href: endpointURL + '/method',
+            method: RestRequestMethod.GET,
+            body: undefined,
+            options,
+          }));
+          expect((service as any).fetchRequest).toHaveBeenCalledWith(requestID);
+        });
       });
     });
 
+    describe('POST', () => {
+      it('should send a POST request to the right endpoint and return the auth status', () => {
+        testScheduler.run(({ cold, expectObservable, flush }) => {
+          init(cold);
+
+          expectObservable(service.postToEndpoint('method', { content: 'something' }, options)).toBe('a', {
+            a: objectContaining({ payload: status }),
+          });
+          flush();
+
+          expect(requestService.send).toHaveBeenCalledWith(objectContaining({
+            uuid: requestID,
+            href: endpointURL + '/method',
+            method: RestRequestMethod.POST,
+            body: { content: 'something' },
+            options,
+          }));
+          expect((service as any).fetchRequest).toHaveBeenCalledWith(requestID);
+        });
+      });
+
+      it('should send the request even if caller doesn\'t subscribe to the response', () => {
+        testScheduler.run(({ cold, flush }) => {
+          init(cold);
+
+          service.postToEndpoint('method', { content: 'something' }, options);
+          flush();
+
+          expect(requestService.send).toHaveBeenCalledWith(objectContaining({
+            uuid: requestID,
+            href: endpointURL + '/method',
+            method: RestRequestMethod.POST,
+            body: { content: 'something' },
+            options,
+          }));
+          expect((service as any).fetchRequest).toHaveBeenCalledWith(requestID);
+        });
+      });
+    });
+  });
+
   describe(`getShortlivedToken`, () => {
     it(`should call createShortLivedTokenRequest with the url for the endpoint`, () => {
       testScheduler.run(({ cold, expectObservable, flush }) => {
diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts
index bcaa5972ac..4087989a6b 100644
--- a/src/app/core/auth/auth-request.service.ts
+++ b/src/app/core/auth/auth-request.service.ts
@@ -26,6 +26,11 @@ export abstract class AuthRequestService {
               ) {
   }
 
+  /**
+   * Fetch the response to a request from the cache, once it's completed.
+   * @param requestId the UUID of the request for which to retrieve the response
+   * @protected
+   */
   protected fetchRequest(requestId: string): Observable<RemoteData<AuthStatus>> {
     return this.rdbService.buildFromRequestUUID<AuthStatus>(requestId).pipe(
       getFirstCompletedRemoteData(),
@@ -36,6 +41,12 @@ export abstract class AuthRequestService {
     return isNotEmpty(method) ? `${endpoint}/${method}` : `${endpoint}`;
   }
 
+  /**
+   * Send a POST request to an authentication endpoint
+   * @param method    the method to send to (e.g. 'status')
+   * @param body      the data to send (optional)
+   * @param options   the HTTP options for the request
+   */
   public postToEndpoint(method: string, body?: any, options?: HttpOptions): Observable<RemoteData<AuthStatus>> {
     const requestId = this.requestService.generateRequestId();
 
@@ -52,6 +63,11 @@ export abstract class AuthRequestService {
     return this.fetchRequest(requestId);
   }
 
+  /**
+   * Send a GET request to an authentication endpoint
+   * @param method    the method to send to (e.g. 'status')
+   * @param options   the HTTP options for the request
+   */
   public getRequest(method: string, options?: HttpOptions): Observable<RemoteData<AuthStatus>> {
     const requestId = this.requestService.generateRequestId();
 

From ca341e53b44210b3b189bb91743dc8dfd3e88968 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Thu, 25 Aug 2022 15:33:23 +0200
Subject: [PATCH 18/48] Close modal on process delete success

---
 src/app/process-page/detail/process-detail.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/process-page/detail/process-detail.component.ts b/src/app/process-page/detail/process-detail.component.ts
index f9151d27b8..9d92dece61 100644
--- a/src/app/process-page/detail/process-detail.component.ts
+++ b/src/app/process-page/detail/process-detail.component.ts
@@ -196,6 +196,7 @@ export class ProcessDetailComponent implements OnInit {
     ).subscribe((rd) => {
       if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get('process.detail.delete.success'));
+        this.closeModal();
         this.router.navigateByUrl(getProcessListRoute());
       } else {
         this.notificationsService.error(this.translateService.get('process.detail.delete.error'));

From a77b1da804d0eb23d80cfdec4bda1242af63ffc3 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 25 Aug 2022 15:40:14 +0200
Subject: [PATCH 19/48] 92900: Patch start:dev CLI arguments through to ng
 serve

---
 scripts/serve.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/serve.ts b/scripts/serve.ts
index bf5506b8bd..09e517c3d4 100644
--- a/scripts/serve.ts
+++ b/scripts/serve.ts
@@ -7,8 +7,9 @@ const appConfig: AppConfig = buildAppConfig();
 
 /**
  * Calls `ng serve` with the following arguments configured for the UI in the app config: host, port, nameSpace, ssl
+ * Any CLI arguments given to this script are patched through to `ng serve` as well.
  */
 child.spawn(
-  `ng serve --host ${appConfig.ui.host} --port ${appConfig.ui.port} --serve-path ${appConfig.ui.nameSpace} --ssl ${appConfig.ui.ssl}`,
+  `ng serve --host ${appConfig.ui.host} --port ${appConfig.ui.port} --serve-path ${appConfig.ui.nameSpace} --ssl ${appConfig.ui.ssl} ${process.argv.slice(2).join(' ')}`,
   { stdio: 'inherit', shell: true }
 );

From ee26084d6adcd4c25e470cd68c2419c2a7eb393d Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 25 Aug 2022 15:53:13 +0200
Subject: [PATCH 20/48] Fix unused imports

---
 src/app/core/data/persistent-identifier-data.service.ts      | 4 ----
 src/app/core/resource-policy/resource-policy-data.service.ts | 1 -
 2 files changed, 5 deletions(-)

diff --git a/src/app/core/data/persistent-identifier-data.service.ts b/src/app/core/data/persistent-identifier-data.service.ts
index 661d8c044d..bd7d12a7c6 100644
--- a/src/app/core/data/persistent-identifier-data.service.ts
+++ b/src/app/core/data/persistent-identifier-data.service.ts
@@ -5,15 +5,11 @@
  *
  * http://www.dspace.org/license/
  */
-import { BaseDataService } from './base/base-data.service';
 import { RequestService } from './request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { IdentifiableDataService } from './base/identifiable-data.service';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { Observable } from 'rxjs';
-import { RemoteData } from './remote-data';
 import { DSpaceObject } from '../shared/dspace-object.model';
 
 export class PersistentIdentifierDataService extends IdentifiableDataService<DSpaceObject> {
diff --git a/src/app/core/resource-policy/resource-policy-data.service.ts b/src/app/core/resource-policy/resource-policy-data.service.ts
index 097e4fc447..5190ff30ed 100644
--- a/src/app/core/resource-policy/resource-policy-data.service.ts
+++ b/src/app/core/resource-policy/resource-policy-data.service.ts
@@ -25,7 +25,6 @@ import { PutRequest } from '../data/request.models';
 import { GenericConstructor } from '../shared/generic-constructor';
 import { ResponseParsingService } from '../data/parsing.service';
 import { StatusCodeOnlyResponseParsingService } from '../data/status-code-only-response-parsing.service';
-import { HALLink } from '../shared/hal-link.model';
 import { EPersonDataService } from '../eperson/eperson-data.service';
 import { GroupDataService } from '../eperson/group-data.service';
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';

From 72852dd031060887a7112d769f51be449157ce24 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Thu, 25 Aug 2022 17:05:34 +0200
Subject: [PATCH 21/48] Fix test

---
 src/app/process-page/detail/process-detail.component.spec.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/app/process-page/detail/process-detail.component.spec.ts b/src/app/process-page/detail/process-detail.component.spec.ts
index 53e65e62eb..e4ab7d1082 100644
--- a/src/app/process-page/detail/process-detail.component.spec.ts
+++ b/src/app/process-page/detail/process-detail.component.spec.ts
@@ -243,18 +243,23 @@ describe('ProcessDetailComponent', () => {
 
   describe('deleteProcess', () => {
     it('should delete the process and navigate back to the overview page on success', () => {
+      spyOn(component, 'closeModal');
       component.deleteProcess(process);
 
       expect(processService.delete).toHaveBeenCalledWith(process.processId);
       expect(notificationsService.success).toHaveBeenCalled();
+      expect(component.closeModal).toHaveBeenCalled();
       expect(router.navigateByUrl).toHaveBeenCalledWith(getProcessListRoute());
     });
     it('should delete the process and not navigate on error', () => {
       (processService.delete as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$());
+      spyOn(component, 'closeModal');
+
       component.deleteProcess(process);
 
       expect(processService.delete).toHaveBeenCalledWith(process.processId);
       expect(notificationsService.error).toHaveBeenCalled();
+      expect(component.closeModal).not.toHaveBeenCalled();
       expect(router.navigateByUrl).not.toHaveBeenCalled();
     });
   });

From c5d3776df73e1a27141d124a044cb6514d8159b3 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 5 Aug 2022 12:23:03 +0200
Subject: [PATCH 22/48] 93492: Fix SSR dodging pinned admin sidebar

On the server, @slideSidebarPadding always resolved to 'expanded' because slideSidebarOver did not emit true
This resulted in the SSR HTML leaving space for the expanded sidebar.

Also got rid of the sliding animation as it would always play, even when replacing SSR HTML where the sidebar was already visible.
---
 .../admin-sidebar.component.html              |  2 +-
 .../admin-sidebar/admin-sidebar.component.ts  | 25 +++++--------------
 src/app/root/root.component.ts                |  5 ++--
 src/app/shared/animations/slide.ts            |  7 ------
 4 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.html b/src/app/admin/admin-sidebar/admin-sidebar.component.html
index 84402c64e9..ef220b834b 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.html
@@ -1,4 +1,4 @@
-<nav @slideHorizontal class="navbar navbar-dark p-0"
+<nav class="navbar navbar-dark p-0"
      [ngClass]="{'active': sidebarOpen, 'inactive': sidebarClosed}"
      [@slideSidebar]="{
       value: (!(sidebarExpanded | async) ? 'collapsed' : 'expanded'),
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
index d07196502f..19c75a9d62 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -1,27 +1,14 @@
 import { Component, HostListener, Injector, OnInit } from '@angular/core';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { combineLatest, combineLatest as observableCombineLatest, Observable, BehaviorSubject } from 'rxjs';
-import { debounceTime, first, map, take, distinctUntilChanged, withLatestFrom } from 'rxjs/operators';
+import { combineLatest, Observable, BehaviorSubject } from 'rxjs';
+import { debounceTime, first, map, distinctUntilChanged, withLatestFrom } from 'rxjs/operators';
 import { AuthService } from '../../core/auth/auth.service';
-import { ScriptDataService } from '../../core/data/processes/script-data.service';
-import { slideHorizontal, slideSidebar } from '../../shared/animations/slide';
-import { CreateCollectionParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
-import { CreateCommunityParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
-import { CreateItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
-import { EditCollectionSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
-import { EditCommunitySelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
-import { EditItemSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
-import { ExportMetadataSelectorComponent } from '../../shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
-import { MenuID, MenuItemType } from '../../shared/menu/initial-menus-state';
-import { LinkMenuItemModel } from '../../shared/menu/menu-item/models/link.model';
-import { OnClickMenuItemModel } from '../../shared/menu/menu-item/models/onclick.model';
-import { TextMenuItemModel } from '../../shared/menu/menu-item/models/text.model';
+import { slideSidebar } from '../../shared/animations/slide';
+import { MenuID } from '../../shared/menu/initial-menus-state';
 import { MenuComponent } from '../../shared/menu/menu.component';
 import { MenuService } from '../../shared/menu/menu.service';
 import { CSSVariableService } from '../../shared/sass-helper/sass-helper.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { Router, ActivatedRoute } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 
 /**
  * Component representing the admin sidebar
@@ -30,7 +17,7 @@ import { Router, ActivatedRoute } from '@angular/router';
   selector: 'ds-admin-sidebar',
   templateUrl: './admin-sidebar.component.html',
   styleUrls: ['./admin-sidebar.component.scss'],
-  animations: [slideHorizontal, slideSidebar]
+  animations: [slideSidebar]
 })
 export class AdminSidebarComponent extends MenuComponent implements OnInit {
   /**
diff --git a/src/app/root/root.component.ts b/src/app/root/root.component.ts
index dc44095573..d811d28ca1 100644
--- a/src/app/root/root.component.ts
+++ b/src/app/root/root.component.ts
@@ -1,4 +1,4 @@
-import { map } from 'rxjs/operators';
+import { map, startWith } from 'rxjs/operators';
 import { Component, Inject, Input, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
@@ -71,7 +71,8 @@ export class RootComponent implements OnInit {
     const sidebarCollapsed = this.menuService.isMenuCollapsed(MenuID.ADMIN);
     this.slideSidebarOver = combineLatestObservable([sidebarCollapsed, this.windowService.isXsOrSm()])
       .pipe(
-        map(([collapsed, mobile]) => collapsed || mobile)
+        map(([collapsed, mobile]) => collapsed || mobile),
+        startWith(true),
       );
 
     if (this.router.url === getPageInternalServerErrorRoute()) {
diff --git a/src/app/shared/animations/slide.ts b/src/app/shared/animations/slide.ts
index 7928a25659..63107017aa 100644
--- a/src/app/shared/animations/slide.ts
+++ b/src/app/shared/animations/slide.ts
@@ -10,13 +10,6 @@ export const slide = trigger('slide', [
   transition('expanded <=> collapsed', animate(250))
 ]);
 
-export const slideHorizontal = trigger('slideHorizontal', [
-  state('void', style({ width: 0 })),
-  state('*', style({ width: '*' })),
-  transition(':enter', [animate('200ms')]),
-  transition(':leave', [animate('200ms')])
-]);
-
 export const slideMobileNav = trigger('slideMobileNav', [
 
   state('expanded', style({ height: '100vh' })),

From 154d66f1e8de1c09996f4775495d2aadacb354a0 Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Fri, 26 Aug 2022 11:25:07 +0200
Subject: [PATCH 23/48] remove unused imports

---
 src/app/process-page/overview/process-overview.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts
index 749f76b1a6..1ca29693cb 100644
--- a/src/app/process-page/overview/process-overview.component.ts
+++ b/src/app/process-page/overview/process-overview.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { BehaviorSubject, Observable, skipWhile, Subscription } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { Process } from '../processes/process.model';

From 795870d7122c29fc8f1e9b06b6d755accb41a017 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 26 Aug 2022 11:35:44 -0500
Subject: [PATCH 24/48] Update gitattributes to force LF line endings for code

---
 .gitattributes | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index dfe0770424..406640bfcc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,16 @@
-# Auto detect text files and perform LF normalization
+# By default, auto detect text files and perform LF normalization
+# This ensures code is always checked in with LF line endings
 * text=auto
+
+# JS and TS files must always use LF for Angular tools to work
+# Some Angular tools expect LF line endings, even on Windows.
+# This ensures Windows always checks out these files with LF line endings
+# We've copied many of these rules from https://github.com/angular/angular-cli/
+*.js eol=lf
+*.ts eol=lf
+*.json eol=lf
+*.json5 eol=lf
+*.css eol=lf
+*.scss eol=lf
+*.html eol=lf
+*.svg eol=lf
\ No newline at end of file

From b891ae0237738e42a1557393cb3212b041c1d93c Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 26 Aug 2022 11:36:51 -0500
Subject: [PATCH 25/48] End-of-line normalization for some files

---
 scripts/sync-i18n-files.ts |     0
 src/app/app.module.ts      |     0
 src/assets/i18n/tr.json5   | 10252 +++++++++++++++++------------------
 3 files changed, 5126 insertions(+), 5126 deletions(-)
 mode change 100755 => 100644 scripts/sync-i18n-files.ts
 mode change 100755 => 100644 src/app/app.module.ts

diff --git a/scripts/sync-i18n-files.ts b/scripts/sync-i18n-files.ts
old mode 100755
new mode 100644
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
old mode 100755
new mode 100644
diff --git a/src/assets/i18n/tr.json5 b/src/assets/i18n/tr.json5
index 7d658ee20f..d04a6eda2a 100644
--- a/src/assets/i18n/tr.json5
+++ b/src/assets/i18n/tr.json5
@@ -1,5126 +1,5126 @@
-{
-  
-  // "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
-  "401.help": "Bu sayfaya erişim yetkiniz bulunmamaktadır. Ana sayfaya dönmek için aşağıdaki butonu kullanabilirsiniz.",
-  
-  // "401.link.home-page": "Take me to the home page",
-  "401.link.home-page": "Beni ana sayfaya götür",
-  
-  // "401.unauthorized": "unauthorized",
-  "401.unauthorized": "yetkisiz",
-  
-  
-  
-  // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
-  "403.help": "Bu sayfaya erişim yetkiniz bulunmamaktadır. Ana sayfaya dönmek için aşağıdaki butonu kullanabilirsiniz.",
-  
-  // "403.link.home-page": "Take me to the home page",
-  "403.link.home-page": "Beni ana sayfaya götür",
-  
-  // "403.forbidden": "forbidden",
-  "403.forbidden": "yasaklı",
-  
-  
-  
-  // "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
-  "404.help": "Aradığınız sayfayı bulamıyoruz. Sayfa taşınmış veya silinmiş olabilir. Ana sayfaya geri dönmek için aşağıdaki butonu kullanabilirsiniz. ",
-  
-  // "404.link.home-page": "Take me to the home page",
-  "404.link.home-page": "Beni ana sayfaya götür",
-  
-  // "404.page-not-found": "page not found",
-  "404.page-not-found": "sayfa bulunamadı",
-  
-  // "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  "admin.curation-tasks.breadcrumbs": "Sistem iyileştirme görevleri",
-  
-  // "admin.curation-tasks.title": "System curation tasks",
-  "admin.curation-tasks.title": "Sistem iyileştirme görevleri",
-  
-  // "admin.curation-tasks.header": "System curation tasks",
-  "admin.curation-tasks.header": "Sistem iyileştirme görevleri",
-  
-  // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-  "admin.registries.bitstream-formats.breadcrumbs": "Kayıt defterini biçimlendir",
-  
-  // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
-  "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream biçimi",
-  
-  // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
-  "admin.registries.bitstream-formats.create.failure.content": "Yeni bitstream biçimi oluşturulurken bir hata oluştu.",
-  
-  // "admin.registries.bitstream-formats.create.failure.head": "Failure",
-  "admin.registries.bitstream-formats.create.failure.head": "Aksama",
-  
-  // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
-  "admin.registries.bitstream-formats.create.head": "Vit akışı biçimi oluştur",
-  
-  // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
-  "admin.registries.bitstream-formats.create.new": "Yeni bir bitstream biçimi ekleyin",
-  
-  // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
-  "admin.registries.bitstream-formats.create.success.content": "Yeni bitstream biçimi başarıyla oluşturuldu.",
-  
-  // "admin.registries.bitstream-formats.create.success.head": "Success",
-  "admin.registries.bitstream-formats.create.success.head": "Başarılı",
-  
-  // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
-  "admin.registries.bitstream-formats.delete.failure.amount": "{{ amount }} biçim(ler) kaldırılamadı",
-  
-  // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
-  "admin.registries.bitstream-formats.delete.failure.head": "Aksama",
-  
-  // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
-  "admin.registries.bitstream-formats.delete.success.amount": "{{ amount }} biçim(ler) başarıyla kaldırıldı",
-  
-  // "admin.registries.bitstream-formats.delete.success.head": "Success",
-  "admin.registries.bitstream-formats.delete.success.head": "Başarılı",
-  
-  // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
-  "admin.registries.bitstream-formats.description": "Bu bitstream biçimleri listesi, bilinen biçimler ve destek düzeyleri hakkında bilgi sağlar.",
-  
-  // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
-  "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream biçimi",
-  
-  // "admin.registries.bitstream-formats.edit.description.hint": "",
-  "admin.registries.bitstream-formats.edit.description.hint": "",
-  
-  // "admin.registries.bitstream-formats.edit.description.label": "Description",
-  "admin.registries.bitstream-formats.edit.description.label": "Tanımlama",
-  
-  // "admin.registries.bitstream-formats.edit.extensions.hint": "Extensions are file extensions that are used to automatically identify the format of uploaded files. You can enter several extensions for each format.",
-  "admin.registries.bitstream-formats.edit.extensions.hint": "Uzantılar, yüklenen dosyaların biçimini otomatik olarak tanımlamak için kullanılan dosya uzantılarıdır. Her biçim için birkaç uzantı girebilirsiniz.",
-  
-  // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
-  "admin.registries.bitstream-formats.edit.extensions.label": "Dosya uzantıları",
-  
-  // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
-  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Nokta olmadan bir dosya uzantısı girin",
-  
-  // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
-  "admin.registries.bitstream-formats.edit.failure.content": "Bitstream biçimi düzenlenirken bir hata oluştu.",
-  
-  // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
-  "admin.registries.bitstream-formats.edit.failure.head": "Aksama",
-  
-  // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
-  "admin.registries.bitstream-formats.edit.head": "Bitstream biçimi: {{ format }}",
-  
-  // "admin.registries.bitstream-formats.edit.internal.hint": "Formats marked as internal are hidden from the user, and used for administrative purposes.",
-  "admin.registries.bitstream-formats.edit.internal.hint": "Dahili olarak işaretlenen biçimler, kullanıcıdan gizlenir ve yönetim amacıyla kullanılır.",
-  
-  // "admin.registries.bitstream-formats.edit.internal.label": "Internal",
-  "admin.registries.bitstream-formats.edit.internal.label": "Dahili",
-  
-  // "admin.registries.bitstream-formats.edit.mimetype.hint": "The MIME type associated with this format, does not have to be unique.",
-  "admin.registries.bitstream-formats.edit.mimetype.hint": "Bu biçimle ilişkili MIME biçimi benzersiz olması gerekmez.",
-  
-  // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
-  "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Biçimi",
-  
-  // "admin.registries.bitstream-formats.edit.shortDescription.hint": "A unique name for this format, (e.g. Microsoft Word XP or Microsoft Word 2000)",
-  "admin.registries.bitstream-formats.edit.shortDescription.hint": "Bu biçim için benzersiz bir ad (ör. Microsoft Word XP veya Microsoft Word 2000)",
-  
-  // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
-  "admin.registries.bitstream-formats.edit.shortDescription.label": "İsim",
-  
-  // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
-  "admin.registries.bitstream-formats.edit.success.content": "Bitstream biçimi başarıyla düzenlendi.",
-  
-  // "admin.registries.bitstream-formats.edit.success.head": "Success",
-  "admin.registries.bitstream-formats.edit.success.head": "Başarılı",
-  
-  // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
-  "admin.registries.bitstream-formats.edit.supportLevel.hint": "Kurumunuzun bu biçim için taahhüt ettiği destek düzeyi.",
-  
-  // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
-  "admin.registries.bitstream-formats.edit.supportLevel.label": "Destek seviyesi",
-  
-  // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
-  "admin.registries.bitstream-formats.head": "Bitstream Biçimi Kayıt Defteri",
-  
-  // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
-  "admin.registries.bitstream-formats.no-items": "Gösterilecek bitstream biçimi yok.",
-  
-  // "admin.registries.bitstream-formats.table.delete": "Delete selected",
-  "admin.registries.bitstream-formats.table.delete": "Silme seçildi",
-  
-  // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
-  "admin.registries.bitstream-formats.table.deselect-all": "Tüm seçimleri kaldır",
-  
-  // "admin.registries.bitstream-formats.table.internal": "internal",
-  "admin.registries.bitstream-formats.table.internal": "dahili",
-  
-  // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
-  "admin.registries.bitstream-formats.table.mimetype": "MIME Biçimi",
-  
-  // "admin.registries.bitstream-formats.table.name": "Name",
-  "admin.registries.bitstream-formats.table.name": "İsim",
-  
-  // "admin.registries.bitstream-formats.table.return": "Return",
-  "admin.registries.bitstream-formats.table.return": "Geri Dön",
-  
-  // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
-  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Biliniyor",
-  
-  // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
-  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Destekleniyor",
-  
-  // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
-  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Bilinmiyor",
-  
-  // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
-  "admin.registries.bitstream-formats.table.supportLevel.head": "Destek Seviyesi",
-  
-  // "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
-  "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Biçimi Kayıt Defteri ",
-  
-  
-  
-  // "admin.registries.metadata.breadcrumbs": "Metadata registry",
-  "admin.registries.metadata.breadcrumbs": "Metadata kayıt defteri",
-  
-  // "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.",
-  "admin.registries.metadata.description": "Metadata kayıt defteri, veri havuzda bulunan tüm metadata alanlarının bir listesini tutar. Bu alanlar birden çok şema arasında bölünebilir. Ancak, DSpace nitelikli Dublin Core şemasını gerektirir.",
-  
-  // "admin.registries.metadata.form.create": "Create metadata schema",
-  "admin.registries.metadata.form.create": "Metadata şeması oluştur",
-  
-  // "admin.registries.metadata.form.edit": "Edit metadata schema",
-  "admin.registries.metadata.form.edit": "Metadata şemasını düzenle",
-  
-  // "admin.registries.metadata.form.name": "Name",
-  "admin.registries.metadata.form.name": "İsim",
-  
-  // "admin.registries.metadata.form.namespace": "Namespace",
-  "admin.registries.metadata.form.namespace": "Ad Alanı",
-  
-  // "admin.registries.metadata.head": "Metadata Registry",
-  "admin.registries.metadata.head": "Metadata Kayıt Defteri",
-  
-  // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
-  "admin.registries.metadata.schemas.no-items": "Gösterilecek metadata alanı yok.",
-  
-  // "admin.registries.metadata.schemas.table.delete": "Delete selected",
-  "admin.registries.metadata.schemas.table.delete": "Silme Seçildi",
-  
-  // "admin.registries.metadata.schemas.table.id": "ID",
-  "admin.registries.metadata.schemas.table.id": "Kimlik",
-  
-  // "admin.registries.metadata.schemas.table.name": "Name",
-  "admin.registries.metadata.schemas.table.name": "İsim",
-  
-  // "admin.registries.metadata.schemas.table.namespace": "Namespace",
-  "admin.registries.metadata.schemas.table.namespace": "Ad Alanı",
-  
-  // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
-  "admin.registries.metadata.title": "DSpace Angular :: Metadata Kayıt Defteri",
-  
-  
-  
-  // "admin.registries.schema.breadcrumbs": "Metadata schema",
-  "admin.registries.schema.breadcrumbs": "Metadata şeması",
-  
-  // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
-  "admin.registries.schema.description": "Bu, \"{{namesapce}}\" için metadata şemasıdır.",
-  
-  // "admin.registries.schema.fields.head": "Schema metadata fields",
-  "admin.registries.schema.fields.head": "Şema metadata alanları",
-  
-  // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
-  "admin.registries.schema.fields.no-items": "Gösterilecek metadata alanı yok.",
-  
-  // "admin.registries.schema.fields.table.delete": "Delete selected",
-  "admin.registries.schema.fields.table.delete": "Silme Seçildi",
-  
-  // "admin.registries.schema.fields.table.field": "Field",
-  "admin.registries.schema.fields.table.field": "Alan",
-  
-  // "admin.registries.schema.fields.table.scopenote": "Scope Note",
-  "admin.registries.schema.fields.table.scopenote": "Kapsam Notu",
-  
-  // "admin.registries.schema.form.create": "Create metadata field",
-  "admin.registries.schema.form.create": "Metadata alanı oluştur",
-  
-  // "admin.registries.schema.form.edit": "Edit metadata field",
-  "admin.registries.schema.form.edit": "Metadata alanını düzenle",
-  
-  // "admin.registries.schema.form.element": "Element",
-  "admin.registries.schema.form.element": "Element",
-  
-  // "admin.registries.schema.form.qualifier": "Qualifier",
-  "admin.registries.schema.form.qualifier": "Niteleyici",
-  
-  // "admin.registries.schema.form.scopenote": "Scope Note",
-  "admin.registries.schema.form.scopenote": "Kapsam Notu",
-  
-  // "admin.registries.schema.head": "Metadata Schema",
-  "admin.registries.schema.head": "Metadata Şeması",
-  
-  // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
-  "admin.registries.schema.notification.created": "Metadata şeması \"{{prefix}}\" başarıyla oluşturuldu",
-  
-  // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
-  "admin.registries.schema.notification.deleted.failure": "{{amount}} metadata şeması silinemedi",
-  
-  // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
-  "admin.registries.schema.notification.deleted.success": "{{amount}} metadata şeması başarıyla silindi",
-  
-  // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
-  "admin.registries.schema.notification.edited": "Metadata şeması \"{{prefix}}\" başarıyla düzenlendi",
-  
-  // "admin.registries.schema.notification.failure": "Error",
-  "admin.registries.schema.notification.failure": "Hata",
-  
-  // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
-  "admin.registries.schema.notification.field.created": "\"{{field}}\" metadata alanı başarıyla oluşturuldu",
-  
-  // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
-  "admin.registries.schema.notification.field.deleted.failure": "{{amount}} metadata alanı silinemedi",
-  
-  // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
-  "admin.registries.schema.notification.field.deleted.success": "{{amount}} metadata alanı başarıyla silindi",
-  
-  // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
-  "admin.registries.schema.notification.field.edited": "Metadata alanı \"{{field}}\" başarıyla düzenlendi",
-  
-  // "admin.registries.schema.notification.success": "Success",
-  "admin.registries.schema.notification.success": "Başarılı",
-  
-  // "admin.registries.schema.return": "Return",
-  "admin.registries.schema.return": "Geri Dön",
-  
-  // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
-  "admin.registries.schema.title": "DSpace Angular :: Metadata Şeması Kayıt Defteri",
-  
-  
-  
-  // "admin.access-control.epeople.actions.delete": "Delete EPerson",
-  "admin.access-control.epeople.actions.delete": "E-Kişiyi Sil",
-  
-  // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-  "admin.access-control.epeople.actions.impersonate": "E-Kişinin Kimliğine Bürün",
-  
-  // "admin.access-control.epeople.actions.reset": "Reset password",
-  "admin.access-control.epeople.actions.reset": "Parolayı sıfırla",
-  
-  // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
-  "admin.access-control.epeople.actions.stop-impersonating": "E-Kişilerin kimliğine bürünmeyi durdurun",
-  
-  // "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
-  "admin.access-control.epeople.title": "DSpace Angular :: E-kişiler",
-  
-  // "admin.access-control.epeople.head": "EPeople",
-  "admin.access-control.epeople.head": "E-Kişiler",
-  
-  // "admin.access-control.epeople.search.head": "Search",
-  "admin.access-control.epeople.search.head": "Ara",
-  
-  // "admin.access-control.epeople.button.see-all": "Tümüne Gözat",
-  "admin.access-control.epeople.button.see-all": "Browse All",
-  
-  // "admin.access-control.epeople.search.scope.metadata": "Metadata",
-  "admin.access-control.epeople.search.scope.metadata": "Metadata",
-  
-  // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
-  "admin.access-control.epeople.search.scope.email": "E-posta (tam)",
-  
-  // "admin.access-control.epeople.search.button": "Search",
-  "admin.access-control.epeople.search.button": "Ara",
-  
-  // "admin.access-control.epeople.button.add": "Add EPerson",
-  "admin.access-control.epeople.button.add": "E-Kişi Ekle",
-  
-  // "admin.access-control.epeople.table.id": "ID",
-  "admin.access-control.epeople.table.id": "Kimlik",
-  
-  // "admin.access-control.epeople.table.name": "Name",
-  "admin.access-control.epeople.table.name": "İsim",
-  
-  // "admin.access-control.epeople.table.email": "E-mail (exact)",
-  "admin.access-control.epeople.table.email": "E-posta (tam)",
-  
-  // "admin.access-control.epeople.table.edit": "Edit",
-  "admin.access-control.epeople.table.edit": "Düzenle",
-  
-  // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
-  "admin.access-control.epeople.table.edit.buttons.edit": "Düzenle \"{{name}}\"",
-  
-  // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
-  "admin.access-control.epeople.table.edit.buttons.remove": "Sil \"{{name}}\"",
-  
-  // "admin.access-control.epeople.no-items": "No EPeople to show.",
-  "admin.access-control.epeople.no-items": "Gösterilecek E-Kişiler yok.",
-  
-  // "admin.access-control.epeople.form.create": "Create EPerson",
-  "admin.access-control.epeople.form.create": "E-Kişi Oluştur",
-  
-  // "admin.access-control.epeople.form.edit": "Edit EPerson",
-  "admin.access-control.epeople.form.edit": "E-Kişiyi Düzenle",
-  
-  // "admin.access-control.epeople.form.firstName": "First name",
-  "admin.access-control.epeople.form.firstName": "İsim",
-  
-  // "admin.access-control.epeople.form.lastName": "Last name",
-  "admin.access-control.epeople.form.lastName": "Soyadı",
-  
-  // "admin.access-control.epeople.form.email": "E-mail",
-  "admin.access-control.epeople.form.email": "E-posta",
-  
-  // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
-  "admin.access-control.epeople.form.emailHint": "Geçerli bir e-posta adresi olmalı",
-  
-  // "admin.access-control.epeople.form.canLogIn": "Can log in",
-  "admin.access-control.epeople.form.canLogIn": "Giriş yapabilir",
-  
-  // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
-  "admin.access-control.epeople.form.requireCertificate": "Sertifika gerektirir",
-  
-  // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.created.success": "E-Kişi \"{{name}}\" başarıyla oluşturuldu",
-  
-  // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.created.failure": "E-Kişi \"{{name}}\" oluşturulamadı",
-  
-  // "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Failed to create EPerson \"{{name}}\", email \"{{email}}\" already in use.",
-  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "E-Kişi \"{{name}}\" oluşturulamadı, e-posta \"{{email}}\" zaten kullanımda.",
-  
-  // "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Failed to edit EPerson \"{{name}}\", email \"{{email}}\" already in use.",
-  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "E-Kişi \"{{name}}\" düzenlenemedi, e-posta \"{{email}}\" zaten kullanımda.",
-  
-  // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.edited.success": "E-kişi \"{{name}}\" başarıyla düzenlendi",
-  
-  // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.edited.failure": "E-Kişi \"{{name}}\" düzenlenemedi",
-  
-  // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.deleted.success": "E-Kişi \"{{name}}\" başarıyla silindi",
-  
-  // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.deleted.failure": "E-Kişi \"{{name}}\" silinemedi",
-  
-  // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
-  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Bu grupların üyesi:",
-  
-  // "admin.access-control.epeople.form.table.id": "ID",
-  "admin.access-control.epeople.form.table.id": "Kimlik",
-  
-  // "admin.access-control.epeople.form.table.name": "Name",
-  "admin.access-control.epeople.form.table.name": "İsim",
-  
-  // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
-  "admin.access-control.epeople.form.memberOfNoGroups": "Bu E-Kişi herhangi bir grubun üyesi değil",
-  
-  // "admin.access-control.epeople.form.goToGroups": "Add to groups",
-  "admin.access-control.epeople.form.goToGroups": "Gruplar ekle",
-  
-  // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
-  "admin.access-control.epeople.notification.deleted.failure": "E-Kişi silinemedi: \"{{name}}\"",
-  
-  // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
-  "admin.access-control.epeople.notification.deleted.success": "E-Kişiler başarıyla silindi: \"{{name}}\"",
-  
-  
-  
-  // "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  "admin.access-control.groups.title": "DSpace Angular :: Gruplar",
-  
-  // "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
-  "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Grubu Düzenle",
-  
-  // "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
-  "admin.access-control.groups.title.addGroup": "DSpace Angular :: Yeni Grup",
-  
-  // "admin.access-control.groups.head": "Groups",
-  "admin.access-control.groups.head": "Gruplar",
-  
-  // "admin.access-control.groups.button.add": "Add group",
-  "admin.access-control.groups.button.add": "Grup ekle",
-  
-  // "admin.access-control.groups.search.head": "Search groups",
-  "admin.access-control.groups.search.head": "Grupları ara",
-  
-  // "admin.access-control.groups.button.see-all": "Browse all",
-  "admin.access-control.groups.button.see-all": "Tümüne göz at",
-  
-  // "admin.access-control.groups.search.button": "Search",
-  "admin.access-control.groups.search.button": "Ara",
-  
-  // "admin.access-control.groups.table.id": "ID",
-  "admin.access-control.groups.table.id": "Kimlik",
-  
-  // "admin.access-control.groups.table.name": "Name",
-  "admin.access-control.groups.table.name": "İsim",
-  
-  // "admin.access-control.groups.table.members": "Members",
-  "admin.access-control.groups.table.members": "Üyeler",
-  
-  // "admin.access-control.groups.table.edit": "Edit",
-  "admin.access-control.groups.table.edit": "Düzenle",
-  
-  // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
-  "admin.access-control.groups.table.edit.buttons.edit": "Düzenle \"{{name}}\"",
-  
-  // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
-  "admin.access-control.groups.table.edit.buttons.remove": "Sil \"{{name}}\"",
-  
-  // "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
-  "admin.access-control.groups.no-items": "Bu adla veya bu UUID olarak hiçbir grup bulunamadı",
-  
-  // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
-  "admin.access-control.groups.notification.deleted.success": "\"{{name}}\" grubu başarıyla silindi",
-  
-  // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
-  "admin.access-control.groups.notification.deleted.failure.title": "\"{{name}}\" grubu silinemedi",
-  
-  // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
-  "admin.access-control.groups.notification.deleted.failure.content": "Sorun: \"{{cause}}\"",
-  
-  
-  
-  // "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
-  "admin.access-control.groups.form.alert.permanent": "Bu grup kalıcıdır, bu nedenle düzenlenemez veya silinemez. Yine de bu sayfayı kullanarak grup üyeleri ekleyip kaldırabilirsiniz.",
-  
-  // "admin.access-control.groups.form.alert.workflowGroup": "This group can’t be modified or deleted because it corresponds to a role in the submission and workflow process in the \"{{name}}\" {{comcol}}. You can delete it from the <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> tab on the edit {{comcol}} page. You can still add and remove group members using this page.",
-  "admin.access-control.groups.form.alert.workflowGroup": "Bu grup, \"{{name}}\" {{comcol}} içindeki gönderim ve iş akışı sürecindeki bir role karşılık geldiği için değiştirilemez veya silinemez. Bunu, {{comcol}} düzenleme sayfasındaki <a href='{{comcolEditRolesRoute}}'>\"rol ata\"</a> sekmesinden silebilirsiniz. Yine de bu sayfayı kullanarak grup üyeleri ekleyip kaldırabilirsiniz.",
-  
-  // "admin.access-control.groups.form.head.create": "Create group",
-  "admin.access-control.groups.form.head.create": "Grup oluştur",
-  
-  // "admin.access-control.groups.form.head.edit": "Edit group",
-  "admin.access-control.groups.form.head.edit": "Grubu düzenle",
-  
-  // "admin.access-control.groups.form.groupName": "Group name",
-  "admin.access-control.groups.form.groupName": "Grup adı",
-  
-  // "admin.access-control.groups.form.groupDescription": "Description",
-  "admin.access-control.groups.form.groupDescription": "Açıklama",
-  
-  // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
-  "admin.access-control.groups.form.notification.created.success": "Grup \"{{name}}\" başarıyla oluşturuldu",
-  
-  // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
-  "admin.access-control.groups.form.notification.created.failure": "\"{{name}}\" Grubu oluşturulamadı",
-  
-  // "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Failed to create Group with name: \"{{name}}\", make sure the name is not already in use.",
-  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Şu ada sahip Grup oluşturulamadı: \"{{name}}\", adın halihazırda kullanımda olmadığından emin olun.",
-  
-  // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
-  "admin.access-control.groups.form.notification.edited.failure": "\"{{name}}\" Grubu düzenlenemedi",
-  
-  // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
-  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "\"{{name}}\" adı zaten kullanılıyor!",
-  
-  // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
-  "admin.access-control.groups.form.notification.edited.success": "\"{{name}}\" Grubu başarıyla düzenlendi",
-  
-  // "admin.access-control.groups.form.actions.delete": "Delete Group",
-  "admin.access-control.groups.form.actions.delete": "Grubu Sil",
-  
-  // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
-  "admin.access-control.groups.form.delete-group.modal.header": "\"{{ dsoName }}\" Grubunu Sil",
-  
-  // "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"",
-  "admin.access-control.groups.form.delete-group.modal.info": "\"{{ dsoName }}\" Grubunu silmek istediğinizden emin misiniz?",
-  
-  // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
-  "admin.access-control.groups.form.delete-group.modal.cancel": "İptal",
-  
-  // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
-  "admin.access-control.groups.form.delete-group.modal.confirm": "Sil",
-  
-  // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
-  "admin.access-control.groups.form.notification.deleted.success": "\"{{ name }}\" grubu başarıyla silindi",
-  
-  // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
-  "admin.access-control.groups.form.notification.deleted.failure.title": "\"{{ name }}\" grubu silinemedi",
-  
-  // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
-  "admin.access-control.groups.form.notification.deleted.failure.content": "Sorun: \"{{ cause }}\"",
-  
-  // "admin.access-control.groups.form.members-list.head": "EPeople",
-  "admin.access-control.groups.form.members-list.head": "E-Kişiler",
-  
-  // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
-  "admin.access-control.groups.form.members-list.search.head": "E-Kişiler Ekle",
-  
-  // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
-  "admin.access-control.groups.form.members-list.button.see-all": "Tümüne Gözat",
-  
-  // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
-  "admin.access-control.groups.form.members-list.headMembers": "Mevcut Üyeler",
-  
-  // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-  
-  // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
-  "admin.access-control.groups.form.members-list.search.scope.email": "E-posta (tam)",
-  
-  // "admin.access-control.groups.form.members-list.search.button": "Search",
-  "admin.access-control.groups.form.members-list.search.button": "Ara",
-  
-  // "admin.access-control.groups.form.members-list.table.id": "ID",
-  "admin.access-control.groups.form.members-list.table.id": "Kimlik",
-  
-  // "admin.access-control.groups.form.members-list.table.name": "Name",
-  "admin.access-control.groups.form.members-list.table.name": "İsim",
-  
-  // "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
-  "admin.access-control.groups.form.members-list.table.edit": "Kaldır / Ekle",
-  
-  // "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
-  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "\"{{name}}\" adlı üyeyi kaldırın",
-  
-  // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
-  "admin.access-control.groups.form.members-list.notification.success.addMember": "Üye başarıyla eklendi: \"{{name}}\"",
-  
-  // "admin.access-control.groups.form.members-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
-  "admin.access-control.groups.form.members-list.notification.failure.addMember": "Üye eklenemedi: \"{{name}}\"",
-  
-  // "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
-  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Üye başarıyla silindi: \"{{name}}\"",
-  
-  // "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
-  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Üye silinemedi: \"{{name}}\"",
-  
-  // "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
-  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "\"{{name}}\" adlı üye ekleyin",
-  
-  // "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "Mevcut aktif grup yok, önce bir isim gönderin.",
-  
-  // "admin.access-control.groups.form.members-list.no-members-yet": "No members in group yet, search and add.",
-  "admin.access-control.groups.form.members-list.no-members-yet": "Henüz grupta üye yok, arayın ve ekleyin.",
-  
-  // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
-  "admin.access-control.groups.form.members-list.no-items": "Bu aramada E-Kişiler bulunamadı",
-  
-  // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
-  "admin.access-control.groups.form.subgroups-list.notification.failure": "Bir şeyler yanlış gitti: \"{{cause}}\"",
-  
-  // "admin.access-control.groups.form.subgroups-list.head": "Groups",
-  "admin.access-control.groups.form.subgroups-list.head": "Gruplar",
-  
-  // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
-  "admin.access-control.groups.form.subgroups-list.search.head": "Alt Grup Ekle",
-  
-  // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
-  "admin.access-control.groups.form.subgroups-list.button.see-all": "Tümüne Gözat",
-  
-  // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
-  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Mevcut Alt Gruplar",
-  
-  // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
-  "admin.access-control.groups.form.subgroups-list.search.button": "Ara",
-  
-  // "admin.access-control.groups.form.subgroups-list.table.id": "ID",
-  "admin.access-control.groups.form.subgroups-list.table.id": "Kimlik",
-  
-  // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
-  "admin.access-control.groups.form.subgroups-list.table.name": "İsim",
-  
-  // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
-  "admin.access-control.groups.form.subgroups-list.table.edit": "Kaldır / Ekle",
-  
-  // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"",
-  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "\"{{name}}\" adlı alt grubu kaldırın",
-  
-  // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
-  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "\"{{name}}\" adlı alt grup ekleyin",
-  
-  // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
-  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Mevcut grup",
-  
-  // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
-  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Alt grup başarıyla eklendi: \"{{name}}\"",
-  
-  // "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"",
-  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Alt grup eklenemedi: \"{{name}}\"",
-  
-  // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
-  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Alt grup başarıyla silindi: \"{{name}}\"",
-  
-  // "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{name}}\"",
-  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Alt grup silinemedi: \"{{name}}\"",
-  
-  // "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "Aktif grup mevcut değil, önce bir isim gönderin.",
-  
-  // "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "This is the current group, can't be added.",
-  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "Bu grup mevcut, eklenemez.",
-  
-  // "admin.access-control.groups.form.subgroups-list.no-items": "No groups found with this in their name or this as UUID",
-  "admin.access-control.groups.form.subgroups-list.no-items": "Bu adla veya bu UUID olarak hiçbir grup bulunamadı",
-  
-  // "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
-  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Henüz grupta alt grup yok.",
-  
-  // "admin.access-control.groups.form.return": "Return to groups",
-  "admin.access-control.groups.form.return": "Gruplara dön",
-  
-  
-  
-  // "admin.search.breadcrumbs": "Administrative Search",
-  "admin.search.breadcrumbs": "Yönetimsel Arama",
-  
-  // "admin.search.collection.edit": "Edit",
-  "admin.search.collection.edit": "Düzenle",
-  
-  // "admin.search.community.edit": "Edit",
-  "admin.search.community.edit": "Düzenle",
-  
-  // "admin.search.item.delete": "Delete",
-  "admin.search.item.delete": "Sil",
-  
-  // "admin.search.item.edit": "Edit",
-  "admin.search.item.edit": "Düzenle",
-  
-  // "admin.search.item.make-private": "Make Private",
-  "admin.search.item.make-private": "Özel yap",
-  
-  // "admin.search.item.make-public": "Make Public",
-  "admin.search.item.make-public": "Ortak yap",
-  
-  // "admin.search.item.move": "Move",
-  "admin.search.item.move": "Taşı",
-  
-  // "admin.search.item.reinstate": "Reinstate",
-  "admin.search.item.reinstate": "Eski durumuna getir",
-  
-  // "admin.search.item.withdraw": "Withdraw",
-  "admin.search.item.withdraw": "Çekil",
-  
-  // "admin.search.title": "Administrative Search",
-  "admin.search.title": "Yönetimsel Arama",
-  
-  // "administrativeView.search.results.head": "Administrative Search",
-  "administrativeView.search.results.head": "Yönetimsel Arama",
-  
-  
-  
-  
-  // "admin.workflow.breadcrumbs": "Administer Workflow",
-  "admin.workflow.breadcrumbs": "İş Akışını Yönet",
-  
-  // "admin.workflow.title": "Administer Workflow",
-  "admin.workflow.title": "İş Akışını Yönet",
-  
-  // "admin.workflow.item.workflow": "Workflow",
-  "admin.workflow.item.workflow": "İş akışı",
-  
-  // "admin.workflow.item.delete": "Delete",
-  "admin.workflow.item.delete": "Sil",
-  
-  // "admin.workflow.item.send-back": "Send back",
-  "admin.workflow.item.send-back": "Geri gönder",
-  
-  
-  
-  // "admin.metadata-import.breadcrumbs": "Import Metadata",
-  "admin.metadata-import.breadcrumbs": "Metadataları İçe Aktar",
-  
-  // "admin.metadata-import.title": "Import Metadata",
-  "admin.metadata-import.title": "Metadataları İçe Aktar",
-  
-  // "admin.metadata-import.page.header": "Import Metadata",
-  "admin.metadata-import.page.header": "Metadataları İçe Aktar",
-  
-  // "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
-  "admin.metadata-import.page.help": "Dosyalarda toplu metadata işlemleri içeren CSV dosyalarını buraya bırakabilir veya bunlara göz atabilirsiniz.",
-  
-  // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
-  "admin.metadata-import.page.dropMsg": "İçe aktarmak için bir metadata CSV'si bırakın",
-  
-  // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
-  "admin.metadata-import.page.dropMsgReplace": "İçe aktarılacak CSV metadatalarını değiştirmek için bırakın",
-  
-  // "admin.metadata-import.page.button.return": "Return",
-  "admin.metadata-import.page.button.return": "Geri Dön",
-  
-  // "admin.metadata-import.page.button.proceed": "Proceed",
-  "admin.metadata-import.page.button.proceed": "Devam Et",
-  
-  // "admin.metadata-import.page.error.addFile": "Select file first!",
-  "admin.metadata-import.page.error.addFile": "Önce dosyayı seçin!",
-  
-  
-  
-  
-  // "auth.errors.invalid-user": "Invalid email address or password.",
-  "auth.errors.invalid-user": "Geçersiz e-posta adresi veya parola.",
-  
-  // "auth.messages.expired": "Your session has expired. Please log in again.",
-  "auth.messages.expired": "Oturumunuz sona erdi. Lütfen tekrar giriş yapın.",
-  
-  
-  
-  // "bitstream.edit.bitstream": "Bitstream: ",
-  "bitstream.edit.bitstream": "Bitstream: ",
-  
-  // "bitstream.edit.form.description.hint": "Optionally, provide a brief description of the file, for example \"<i>Main article</i>\" or \"<i>Experiment data readings</i>\".",
-  "bitstream.edit.form.description.hint": "İsteğe bağlı olarak, dosyanın kısa bir açıklamasını sağlayın, örneğin \"<i>Ana makale</i>\" veya \"<i>Deneme veri okumaları</i>\".",
-  
-  // "bitstream.edit.form.description.label": "Description",
-  "bitstream.edit.form.description.label": "Açıklama",
-  
-  // "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. <b>This date cannot be modified on this form.</b> To set an embargo date for a bitstream, go to the <i>Item Status</i> tab, click <i>Authorizations...</i>, create or edit the bitstream's <i>READ</i> policy, and set the <i>Start Date</i> as desired.",
-  "bitstream.edit.form.embargo.hint": "Erişime izin verilen ilk gün. <b>Bu tarih bu formda değiştirilemez.</b> Bir bitstream için bir ambargo tarihi ayarlamak için <i>Öğe Durumu</i> sekmesine gidin, <i>Yetkiler...</i>'i tıklayın., bitstreamın <i>OKU</i> politikasını oluşturun veya düzenleyin ve <i>Başlangıç ​​Tarihi</i>'ni istediğiniz gibi ayarlayın.",
-  
-  // "bitstream.edit.form.embargo.label": "Embargo until specific date",
-  "bitstream.edit.form.embargo.label": "Belirli bir tarihe kadar ambargo",
-  
-  // "bitstream.edit.form.fileName.hint": "Change the filename for the bitstream. Note that this will change the display bitstream URL, but old links will still resolve as long as the sequence ID does not change.",
-  "bitstream.edit.form.fileName.hint": "Bitstreamın dosya adını değiştirin. Bunun görünen bitstream URL'sini değiştireceğini, ancak dizi kimliği değişmediği sürece eski bağlantıların çözüleceğini unutmayın.",
-  
-  // "bitstream.edit.form.fileName.label": "Filename",
-  "bitstream.edit.form.fileName.label": "Dosya adı",
-  
-  // "bitstream.edit.form.newFormat.label": "Describe new format",
-  "bitstream.edit.form.newFormat.label": "Yeni biçimi tanımla",
-  
-  // "bitstream.edit.form.newFormat.hint": "The application you used to create the file, and the version number (for example, \"<i>ACMESoft SuperApp version 1.5</i>\").",
-  "bitstream.edit.form.newFormat.hint": "Dosyayı oluşturmak için kullandığınız uygulama ve sürüm numarası (örneğin, \"<i>ACMESoft SuperApp versiyon 1.5</i>\").",
-  
-  // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
-  "bitstream.edit.form.primaryBitstream.label": "Birincil bitstream",
-  
-  // "bitstream.edit.form.selectedFormat.hint": "If the format is not in the above list, <b>select \"format not in list\" above</b> and describe it under \"Describe new format\".",
-  "bitstream.edit.form.selectedFormat.hint": "Biçim yukarıdaki listede yoksa, <b>select \"listede olmayan biçim\"i above</b> ve \"Yeni biçimi tanımla\" altında açıklayın.",
-  
-  // "bitstream.edit.form.selectedFormat.label": "Selected Format",
-  "bitstream.edit.form.selectedFormat.label": "Seçilen Biçim",
-  
-  // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
-  "bitstream.edit.form.selectedFormat.unknown": "Listede olmayan biçim",
-  
-  // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
-  "bitstream.edit.notifications.error.format.title": "Bitstreamın biçimi kaydedilirken bir hata oluştu",
-  
-  // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
-  "bitstream.edit.notifications.saved.content": "Bu bitstreamda yaptığınız değişiklikler kaydedildi.",
-  
-  // "bitstream.edit.notifications.saved.title": "Bitstream saved",
-  "bitstream.edit.notifications.saved.title": "Bitstream kaydedildi",
-  
-  // "bitstream.edit.title": "Edit bitstream",
-  "bitstream.edit.title": "Bitstreamı düzenle",
-  
-  
-  
-  // "browse.comcol.by.author": "By Author",
-  "browse.comcol.by.author": "Yazara Göre",
-  
-  // "browse.comcol.by.dateissued": "By Issue Date",
-  "browse.comcol.by.dateissued": "Yayın Tarihine Göre",
-  
-  // "browse.comcol.by.subject": "By Subject",
-  "browse.comcol.by.subject": "Konuya Göre",
-  
-  // "browse.comcol.by.title": "By Title",
-  "browse.comcol.by.title": "Başlığa Göre",
-  
-  // "browse.comcol.head": "Browse",
-  "browse.comcol.head": "Gözat",
-  
-  // "browse.empty": "No items to show.",
-  "browse.empty": "Gösterilecek öğe yok.",
-  
-  // "browse.metadata.author": "Author",
-  "browse.metadata.author": "Yazar",
-  
-  // "browse.metadata.dateissued": "Issue Date",
-  "browse.metadata.dateissued": "Yayın Tarihi",
-  
-  // "browse.metadata.subject": "Subject",
-  "browse.metadata.subject": "Konu",
-  
-  // "browse.metadata.title": "Title",
-  "browse.metadata.title": "Başlık",
-  
-  // "browse.metadata.author.breadcrumbs": "Browse by Author",
-  "browse.metadata.author.breadcrumbs": "Yazara Göre Gözat",
-  
-  // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
-  "browse.metadata.dateissued.breadcrumbs": "Tarihe Göre Gözat",
-  
-  // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
-  "browse.metadata.subject.breadcrumbs": "Konuya Göre Gözat",
-  
-  // "browse.metadata.title.breadcrumbs": "Browse by Title",
-  "browse.metadata.title.breadcrumbs": "Başlığa göre göz atın",
-  
-  // "browse.startsWith.choose_start": "(Choose start)",
-  "browse.startsWith.choose_start": "(Başlangıç seç)",
-  
-  // "browse.startsWith.choose_year": "(Choose year)",
-  "browse.startsWith.choose_year": "(Yıl seç)",
-  
-  // "browse.startsWith.jump": "Jump to a point in the index:",
-  "browse.startsWith.jump": "Dizinde bir noktaya atla:",
-  
-  // "browse.startsWith.months.april": "April",
-  "browse.startsWith.months.april": "Nisan",
-  
-  // "browse.startsWith.months.august": "August",
-  "browse.startsWith.months.august": "Ağustos",
-  
-  // "browse.startsWith.months.december": "December",
-  "browse.startsWith.months.december": "Aralık",
-  
-  // "browse.startsWith.months.february": "February",
-  "browse.startsWith.months.february": "Şubat",
-  
-  // "browse.startsWith.months.january": "January",
-  "browse.startsWith.months.january": "Ocak",
-  
-  // "browse.startsWith.months.july": "July",
-  "browse.startsWith.months.july": "Temmuz",
-  
-  // "browse.startsWith.months.june": "June",
-  "browse.startsWith.months.june": "Haziran",
-  
-  // "browse.startsWith.months.march": "March",
-  "browse.startsWith.months.march": "Mart",
-  
-  // "browse.startsWith.months.may": "May",
-  "browse.startsWith.months.may": "Mayıs",
-  
-  // "browse.startsWith.months.none": "(Choose month)",
-  "browse.startsWith.months.none": "(Ay seçin)",
-  
-  // "browse.startsWith.months.november": "November",
-  "browse.startsWith.months.november": "Kasım",
-  
-  // "browse.startsWith.months.october": "October",
-  "browse.startsWith.months.october": "Ekim",
-  
-  // "browse.startsWith.months.september": "September",
-  "browse.startsWith.months.september": "Eylül",
-  
-  // "browse.startsWith.submit": "Go",
-  "browse.startsWith.submit": "Git",
-  
-  // "browse.startsWith.type_date": "Or type in a date (year-month):",
-  "browse.startsWith.type_date": "Veya bir tarih yazın (yıl-ay):",
-  
-  // "browse.startsWith.type_text": "Or enter first few letters:",
-  "browse.startsWith.type_text": "Veya ilk birkaç harfi girin:",
-  
-  // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title": "{{ field }} {{ value }} ile {{ collection }}'a göz atma",
-  
-  
-  // "chips.remove": "Remove chip",
-  "chips.remove": "Çipi kaldır",
-  
-  
-  
-  // "collection.create.head": "Create a Collection",
-  "collection.create.head": "Koleksiyon Oluştur",
-  
-  // "collection.create.notifications.success": "Successfully created the Collection",
-  "collection.create.notifications.success": "Koleksiyon başarıyla oluşturuldu",
-  
-  // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
-  "collection.create.sub-head": "Komünite için Koleksiyon Oluşturun {{ parent }}",
-  
-  // "collection.curate.header": "Curate Collection: {{collection}}",
-  "collection.curate.header": "Koleksiyonu Düzenle: {{collection}}",
-  
-  // "collection.delete.cancel": "Cancel",
-  "collection.delete.cancel": "İptal",
-  
-  // "collection.delete.confirm": "Confirm",
-  "collection.delete.confirm": "Onayla",
-  
-  // "collection.delete.head": "Delete Collection",
-  "collection.delete.head": "Koleksiyonu sil",
-  
-  // "collection.delete.notification.fail": "Collection could not be deleted",
-  "collection.delete.notification.fail": "Koleksiyon silinemedi",
-  
-  // "collection.delete.notification.success": "Successfully deleted collection",
-  "collection.delete.notification.success": "Koleksiyon başarıyla silindi",
-  
-  // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
-  "collection.delete.text": "\"{{ dso }}\" koleksiyonunu silmek istediğinizden emin misiniz?",
-  
-  
-  
-  // "collection.edit.delete": "Delete this collection",
-  "collection.edit.delete": "Bu koleksiyonu sil",
-  
-  // "collection.edit.head": "Edit Collection",
-  "collection.edit.head": "Koleksiyonu Düzenle",
-  
-  // "collection.edit.breadcrumbs": "Edit Collection",
-  "collection.edit.breadcrumbs": "Koleksiyonu Düzenle",
-  
-  
-  
-  // "collection.edit.tabs.mapper.head": "Item Mapper",
-  "collection.edit.tabs.mapper.head": "Öğe eşleştirici",
-  
-  // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
-  "collection.edit.tabs.item-mapper.title": "Koleksiyon Düzenleme - Öğe Eşleştirici",
-  
-  // "collection.edit.item-mapper.cancel": "Cancel",
-  "collection.edit.item-mapper.cancel": "İptal",
-  
-  // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
-  "collection.edit.item-mapper.collection": "Koleksiyon: \"<b>{{name}}</b>\"",
-  
-  // "collection.edit.item-mapper.confirm": "Map selected items",
-  "collection.edit.item-mapper.confirm": "Seçilen öğeleri eşle",
-  
-  // "collection.edit.item-mapper.description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.",
-  "collection.edit.item-mapper.description": "Bu, koleksiyon yöneticilerinin diğer koleksiyonlardaki öğeleri bu koleksiyona eşlemelerine olanak tanıyan öğe eşleyici aracıdır. Diğer koleksiyonlardaki öğeleri arayabilir ve bunları eşleyebilir veya şu anda eşlenmiş öğelerin listesine göz atabilirsiniz.",
-  
-  // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
-  "collection.edit.item-mapper.head": "Öğe Eşleştirici - Diğer Koleksiyonlardaki Öğeleri Eşle",
-  
-  // "collection.edit.item-mapper.no-search": "Please enter a query to search",
-  "collection.edit.item-mapper.no-search": "Lütfen aramak için bir sorgu girin",
-  
-  // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
-  "collection.edit.item-mapper.notifications.map.error.content": "{{amount}} öğenin eşlenmesinde hatalar oluştu.",
-  
-  // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
-  "collection.edit.item-mapper.notifications.map.error.head": "Eşleme hataları",
-  
-  // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
-  "collection.edit.item-mapper.notifications.map.success.content": "{{amount}} öğe başarıyla eşlendi.",
-  
-  // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
-  "collection.edit.item-mapper.notifications.map.success.head": "Eşleme tamamlandı",
-  
-  // "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.",
-  "collection.edit.item-mapper.notifications.unmap.error.content": "{{amount}} öğenin eşlemeleri kaldırılırken hatalar oluştu.",
-  
-  // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
-  "collection.edit.item-mapper.notifications.unmap.error.head": "Eşleme hatalarını kaldır",
-  
-  // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
-  "collection.edit.item-mapper.notifications.unmap.success.content": "{{amount}} öğenin eşlemeleri başarıyla kaldırıldı.",
-  
-  // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
-  "collection.edit.item-mapper.notifications.unmap.success.head": "Eşlemeyi kaldır tamamlandı",
-  
-  // "collection.edit.item-mapper.remove": "Remove selected item mappings",
-  "collection.edit.item-mapper.remove": "Seçili öğe eşlemelerini kaldır",
-  
-  // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
-  "collection.edit.item-mapper.tabs.browse": "Eşlenen öğelere göz atın",
-  
-  // "collection.edit.item-mapper.tabs.map": "Map new items",
-  "collection.edit.item-mapper.tabs.map": "Yeni öğeleri işle",
-  
-  
-  
-  // "collection.edit.logo.label": "Collection logo",
-  "collection.edit.logo.label": "Koleksiyon logosu",
-
-  // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
-  "collection.edit.logo.notifications.add.error": "Koleksiyon logosu yüklemesi başarısız. Lütfen yeniden denemeden önce içeriği doğrulayın.",
-  
-  // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
-  "collection.edit.logo.notifications.add.success": "Koleksiyon logosu yüklemesi başarılı.",
-  
-  // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
-  "collection.edit.logo.notifications.delete.success.title": "Logo silindi",
-  
-  // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
-  "collection.edit.logo.notifications.delete.success.content": "Koleksiyonun logosunu başarıyla silindi",
-  
-  // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  "collection.edit.logo.notifications.delete.error.title": "Logo silinirken hata",
-  
-  // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
-  "collection.edit.logo.upload": "Yüklenecek bir koleksiyon logosu bırakın",
-  
-  
-  
-  // "collection.edit.notifications.success": "Successfully edited the Collection",
-  "collection.edit.notifications.success": "Koleksiyon başarıyla düzenlendi.",
-  
-  // "collection.edit.return": "Return",
-  "collection.edit.return": "Dönüş",
-  
-  
-  
-  // "collection.edit.tabs.curate.head": "Curate",
-  "collection.edit.tabs.curate.head": "Kuratör",
-  
-  // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
-  "collection.edit.tabs.curate.title": "Koleksiyon düzenleme - Küratör",
-  
-  // "collection.edit.tabs.authorizations.head": "Authorizations",
-  "collection.edit.tabs.authorizations.head": "Yetkilendirmeler",
-  
-  // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
-  "collection.edit.tabs.authorizations.title": "Koleksiyon düzenleme - Yetkilendirmeler",
-  
-  // "collection.edit.tabs.metadata.head": "Edit Metadata",
-  "collection.edit.tabs.metadata.head": "Metadataları Düzenle",
-  
-  // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
-  "collection.edit.tabs.metadata.title": "Koleksiyon Düzenle - Metadatalar",
-  
-  // "collection.edit.tabs.roles.head": "Assign Roles",
-  "collection.edit.tabs.roles.head": "Rol atamak",
-  
-  // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
-  "collection.edit.tabs.roles.title": "Koleksiyon düzenleme - Roller",
-  
-  // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
-  "collection.edit.tabs.source.external": "Bu koleksiyon içeriğini harici bir kaynaktan toplar",
-  
-  // "collection.edit.tabs.source.form.errors.oaiSource.required": "You must provide a set id of the target collection.",
-  "collection.edit.tabs.source.form.errors.oaiSource.required": "Hedef koleksiyonuna bir set kimliği sağlamalısınız.",
-  
-  // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
-  "collection.edit.tabs.source.form.harvestType": "İçerik harmanlanıyor",
-  
-  // "collection.edit.tabs.source.form.head": "Configure an external source",
-  "collection.edit.tabs.source.form.head": "Harici bir kaynak yapılandır",
-  
-  // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
-  "collection.edit.tabs.source.form.metadataConfigId": "Metadata formatı",
-  
-  // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
-  "collection.edit.tabs.source.form.oaiSetId": "OAI'ya Özel Set Kimliği",
-  
-  // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
-  "collection.edit.tabs.source.form.oaiSource": "OAI Sağlayıcısı",
-  
-  // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadata and bitstreams (requires ORE support)",
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Metadatalarını ve bitstreamı topla (ORE desteği gerektirir)",
-  
-  // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest metadata and references to bitstreams (ORE desteği gerektirir)",
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Metadatalarını ve referansları topla (ORE desteği gerektirir)",
-  
-  // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Sadece metadatalarını topla",
-  
-  // "collection.edit.tabs.source.head": "Content Source",
-  "collection.edit.tabs.source.head": "İçerik Kaynağı",
-  
-  // "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "collection.edit.tabs.source.notifications.discarded.content": "Değişiklikleriniz silindi. Değişikliklerinizi eski haline getirmek için 'Geri Al' düğmesine tıklayın.",
-  
-  // "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
-  "collection.edit.tabs.source.notifications.discarded.title": "Silinenler değiştirildi.",
-  
-  // "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
-  "collection.edit.tabs.source.notifications.invalid.content": "Değişiklikleriniz kaydedilmedi. Lütfen kaydetmeden önce tüm alanların geçerli olduğundan emin olun.",
-  
-  // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
-  "collection.edit.tabs.source.notifications.invalid.title": "Metadata geçersiz",
-  
-  // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
-  "collection.edit.tabs.source.notifications.saved.content": "Bu koleksiyonun içerik kaynağındaki değişiklikleriniz kaydedildi.",
-  
-  // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
-  "collection.edit.tabs.source.notifications.saved.title": "İçerik Kaynağı kaydedildi",
-  
-  // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
-  "collection.edit.tabs.source.title": "Koleksiyon düzenleme - İçerik Kaynağı",
-  
-  
-  
-  // "collection.edit.template.add-button": "Add",
-  "collection.edit.template.add-button": "Ekle",
-  
-  // "collection.edit.template.breadcrumbs": "Item template",
-  "collection.edit.template.breadcrumbs": "Öğe şablonu",
-  
-  // "collection.edit.template.cancel": "Cancel",
-  "collection.edit.template.cancel": "İptal",
-  
-  // "collection.edit.template.delete-button": "Delete",
-  "collection.edit.template.delete-button": "Sil",
-  
-  // "collection.edit.template.edit-button": "Edit",
-  "collection.edit.template.edit-button": "Düzenle",
-  
-  // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
-  "collection.edit.template.head": "Koleksiyon için Sablon Öğesini Düzenleyin \"{{ collection }}\"",
-  
-  // "collection.edit.template.label": "Template item",
-  "collection.edit.template.label": "Şablon öğe",
-  
-  // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
-  "collection.edit.template.notifications.delete.error": "Öğe şablonu silme başarısız",
-  
-  // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
-  "collection.edit.template.notifications.delete.success": "Öğe şablonu başarıyla silindi",
-  
-  // "collection.edit.template.title": "Edit Template Item",
-  "collection.edit.template.title": "Şablon Öğesini Düzenle",
-  
-  
-  
-  // "collection.form.abstract": "Short Description",
-  "collection.form.abstract": "Kısa Açıklama",
-  
-  // "collection.form.description": "Introductory text (HTML)",
-  "collection.form.description": "Tanıtım metni (HTML)",
-  
-  // "collection.form.errors.title.required": "Please enter a collection name",
-  "collection.form.errors.title.required": "Lütfen bir koleksiyon adı girin",
-  
-  // "collection.form.license": "License",
-  "collection.form.license": "Lisans",
-  
-  // "collection.form.provenance": "Provenance",
-  "collection.form.provenance": "Menşei",
-  
-  // "collection.form.rights": "Copyright text (HTML)",
-  "collection.form.rights": "Telif hakkı metni (HTML)",
-  
-  // "collection.form.tableofcontents": "News (HTML)",
-  "collection.form.tableofcontents": "Haberler (HTML)",
-  
-  // "collection.form.title": "Name",
-  "collection.form.title": "İsim",
-  
-  
-  
-  // "collection.listelement.badge": "Collection",
-  "collection.listelement.badge": "Koleksiyon",
-  
-  
-  
-  // "collection.page.browse.recent.head": "Recent Submissions",
-  "collection.page.browse.recent.head": "Son Başvurular",
-  
-  // "collection.page.browse.recent.empty": "No items to show",
-  "collection.page.browse.recent.empty": "Gösterilecek öğe yok",
-  
-  // "collection.page.edit": "Edit this collection",
-  "collection.page.edit": "Bu koleksiyonu düzenleyin",
-  
-  // "collection.page.handle": "Permanent URI for this collection",
-  "collection.page.handle": "Bu koleksiyon için kalıcı URI",
-  
-  // "collection.page.license": "License",
-  "collection.page.license": "Lisans",
-  
-  // "collection.page.news": "News",
-  "collection.page.news": "Haberler",
-  
-  
-  
-  // "collection.select.confirm": "Confirm selected",
-  "collection.select.confirm": "Seçilileri onayla",
-  
-  // "collection.select.empty": "No collections to show",
-  "collection.select.empty": "Gösterilecek koleksiyon yok",
-  
-  // "collection.select.table.title": "Title",
-  "collection.select.table.title": "Başlık",
-  
-  
-  
-  // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
-  "collection.source.update.notifications.error.content": "Sağlanan ayarlar test edildi ve işe yaramadı.",
-  
-  // "collection.source.update.notifications.error.title": "Server Error",
-  "collection.source.update.notifications.error.title": "Sunucu Hatası",
-  
-  
-  
-  // "communityList.tabTitle": "DSpace - Community List",
-  "communityList.tabTitle": "DSpace - Komünite Listesi",
-  
-  // "communityList.title": "List of Communities",
-  "communityList.title": "Komünitelerin Listesi",
-  
-  // "communityList.showMore": "Show More",
-  "communityList.showMore": "Daha fazla göster",
-  
-  
-  
-  // "community.create.head": "Create a Community",
-  "community.create.head": "Bir komünite oluştur",
-  
-  // "community.create.notifications.success": "Successfully created the Community",
-  "community.create.notifications.success": "Komünite başarıyla yaratıldı",
-  
-  // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
-  "community.create.sub-head": "Komünite için bir alt komünite oluşturun {{ parent }}",
-  
-  // "community.curate.header": "Curate Community: {{community}}",
-  "community.curate.header": "Kuratör komünitesi: {{community}}",
-  
-  // "community.delete.cancel": "Cancel",
-  "community.delete.cancel": "İptal",
-  
-  // "community.delete.confirm": "Confirm",
-  "community.delete.confirm": "Onayla",
-  
-  // "community.delete.head": "Delete Community",
-  "community.delete.head": "Komüniteyi sil",
-  
-  // "community.delete.notification.fail": "Community could not be deleted",
-  "community.delete.notification.fail": "Komünite silinemedi",
-  
-  // "community.delete.notification.success": "Successfully deleted community",
-  "community.delete.notification.success": "Komünite başarıyla silindi",
-  
-  // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
-  "community.delete.text": "Komüniteyi silmek istediğinize emin misiniz \"{{ dso }}\"",
-  
-  // "community.edit.delete": "Delete this community",
-  "community.edit.delete": "Bu komüniteyi sil",
-  
-  // "community.edit.head": "Edit Community",
-  "community.edit.head": "Komüniteyi düzenle",
-  
-  // "community.edit.breadcrumbs": "Edit Community",
-  "community.edit.breadcrumbs": "Komüniteyi düzenle",
-  
-  
-  // "community.edit.logo.label": "Community logo",
-  "community.edit.logo.label": "Komünite logosu",
-  
-  // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
-  "community.edit.logo.notifications.add.error": "Komünite logosu yüklemesi başarısız. Lütfen yeniden denemeden önce içeriği doğrulayın.",
-  
-  // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
-  "community.edit.logo.notifications.add.success": "Komünite logosunu başarılı yükle.",
-  
-  // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
-  "community.edit.logo.notifications.delete.success.title": "Logo silindi",
-  
-  // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
-  "community.edit.logo.notifications.delete.success.content": "Komünite logosu başarıyla silindi",
-  
-  // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  "community.edit.logo.notifications.delete.error.title": "Logo silme hatası",
-  
-  // "community.edit.logo.upload": "Drop a Community Logo to upload",
-  "community.edit.logo.upload": "Yüklenecek bir komünite logosu bırak",
-  
-  
-  
-  // "community.edit.notifications.success": "Successfully edited the Community",
-  "community.edit.notifications.success": "Komünite başarıyla düzenlendi",
-  
-  // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
-  "community.edit.notifications.unauthorized": "Bu değişikliği yapmak için ayrıcalıklarınız yok",
-  
-  // "community.edit.notifications.error": "An error occured while editing the Community",
-  "community.edit.notifications.error": "Komüniteyi düzenlerken bir hata oluştu",
-  
-  // "community.edit.return": "Return",
-  "community.edit.return": "Dönüş",
-  
-  
-  
-  // "community.edit.tabs.curate.head": "Curate",
-  "community.edit.tabs.curate.head": "Kuratör",
-  
-  // "community.edit.tabs.curate.title": "Community Edit - Curate",
-  "community.edit.tabs.curate.title": "Komünite Düzenle - Küratör",
-  
-  // "community.edit.tabs.metadata.head": "Edit Metadata",
-  "community.edit.tabs.metadata.head": "Metadataları Düzenle",
-  
-  // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
-  "community.edit.tabs.metadata.title": "Komünite Düzenle - Metadatalar",
-  
-  // "community.edit.tabs.roles.head": "Assign Roles",
-  "community.edit.tabs.roles.head": "Rol atamak",
-  
-  // "community.edit.tabs.roles.title": "Community Edit - Roles",
-  "community.edit.tabs.roles.title": "Komünite Düzenle - Roller",
-  
-  // "community.edit.tabs.authorizations.head": "Authorizations",
-  "community.edit.tabs.authorizations.head": "Yetkilendirmeler",
-  
-  // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-  "community.edit.tabs.authorizations.title": "Komünite Düzenle - Yetkilendirmeler",
-  
-  
-  
-  // "community.listelement.badge": "Community",
-  "community.listelement.badge": "Komünite",
-  
-  
-  
-  // "comcol-role.edit.no-group": "None",
-  "comcol-role.edit.no-group": "Hiçbiri",
-  
-  // "comcol-role.edit.create": "Create",
-  "comcol-role.edit.create": "Oluştur",
-  
-  // "comcol-role.edit.restrict": "Restrict",
-  "comcol-role.edit.restrict": "Kısıtla",
-  
-  // "comcol-role.edit.delete": "Delete",
-  "comcol-role.edit.delete": "Sil",
-  
-  
-  // "comcol-role.edit.community-admin.name": "Yöneticiler",
-  "comcol-role.edit.community-admin.name": "Administrators",
-  
-  // "comcol-role.edit.collection-admin.name": "Administrators",
-  "comcol-role.edit.collection-admin.name": "Yöneticiler",
-  
-  
-  // "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
-  "comcol-role.edit.community-admin.description": "Komünite yöneticileri alt komüniteler veya koleksiyonlar oluşturabilir ve bu alt komüniteler veya koleksiyonlar için yönetimi yönetebilir veya atayabilir. Ek olarak, kimsenin herhangi bir alt koleksiyona kimin gönderebileceğine, madde metadatalarını (sunulduktan sonra) düzenleyebileceğine karar verirler ve mevcut eşyaları diğer koleksiyonlardan (yetkilendirmeye tabi) ekleyin.",
-  
-  // "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).",
-  "comcol-role.edit.collection-admin.description": "Koleksiyon yöneticileri, eşyaları koleksiyona kimin gönderebileceğine, öğe metadatalarını (gönderimden sonra) düzenleyebileceğine karar verir ve mevcut eşyaları diğer koleksiyonlardan (bu koleksiyon için yetkilendirmeye tabi) ekleyin.",
-  
-  
-  // "comcol-role.edit.submitters.name": "Submitters",
-  "comcol-role.edit.submitters.name": "Göndericiler",
-  
-  // "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.",
-  "comcol-role.edit.submitters.description": "Bu koleksiyona yeni eşya gönderme iznine sahip olan E-insanlar ve gruplar.",
-  
-  
-  // "comcol-role.edit.item_read.name": "Default item read access",
-  "comcol-role.edit.item_read.name": "Varsayılan öğe okuma erişimi",
-  
-  // "comcol-role.edit.item_read.description": "E-People and Groups that can read new items submitted to this collection. Changes to this role are not retroactive. Existing items in the system will still be viewable by those who had read access at the time of their addition.",
-  "comcol-role.edit.item_read.description": "Bu koleksiyona sunulan yeni eşyaları okuyabilen E-insanlar ve gruplar. Bu roldeki değişiklikler geriye dönük değildir. Sistemdeki mevcut eşyalar, eklemeleri sırasında erişimi okuyanlar tarafından görülebilir.",
-  
-  // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
-  "comcol-role.edit.item_read.anonymous-group": "Gelen öğeler için varsayılan okuma şu anda isimsiz olarak ayarlanmıştır.",
-  
-  
-  // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
-  "comcol-role.edit.bitstream_read.name": "Varsayılan bitstream okuma erişimi",
-  
-  // "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
-  "comcol-role.edit.bitstream_read.description": "Komünite yöneticileri alt komüniteler veya koleksiyonlar oluşturabilir ve bu alt komüniteler veya koleksiyonlar için yönetimi yönetebilir veya atayabilirler. Ek olarak, eşyaları herhangi bir alt koleksiyona kimin gönderebileceğine, öğe metadatalarını (sunulduktan sonra) düzenleyebilir ve harita) Diğer koleksiyonlardan gelen mevcut eşyalar (yetkilendirmeye tabi).",
-  
-  // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
-  "comcol-role.edit.bitstream_read.anonymous-group": "Gelen bitstream için varsayılan okuma şu anda anonim olarak ayarlanmıştır.",
-  
-  
-  // "comcol-role.edit.editor.name": "Editors",
-  "comcol-role.edit.editor.name": "Editörler",
-  
-  // "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
-  "comcol-role.edit.editor.description": "Editörler, gelen gönderilerin metadatalarını düzenleyebilir ve ardından onları kabul edebilir veya reddedebilir.",
-  
-  
-  // "comcol-role.edit.finaleditor.name": "Final editors",
-  "comcol-role.edit.finaleditor.name": "Son editörler",
-  
-  // "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
-  "comcol-role.edit.finaleditor.description": "Nihai editörler gelen başvuruların metadatalarını düzenleyebilir, ancak onları reddedebilir.",
-  
-  
-  // "comcol-role.edit.reviewer.name": "Reviewers",
-  "comcol-role.edit.reviewer.name": "Yorumcular",
-  
-  // "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.",
-  "comcol-role.edit.reviewer.description": "Yorumcular gelen başvuruları kabul edebilir veya reddedebilirler. Ancak, gönderimin metadatalarını düzenleyemezler.",
-  
-  
-  
-  // "community.form.abstract": "Short Description",
-  "community.form.abstract": "Kısa Açıklama",
-  
-  // "community.form.description": "Introductory text (HTML)",
-  "community.form.description": "Tanıtım metni (HTML)",
-  
-  // "community.form.errors.title.required": "Please enter a community name",
-  "community.form.errors.title.required": "Lütfen bir komünite adı girin",
-  
-  // "community.form.rights": "Copyright text (HTML)",
-  "community.form.rights": "Telif Hakkı Metni (HTML)",
-  
-  // "community.form.tableofcontents": "News (HTML)",
-  "community.form.tableofcontents": "Haberler (HTML)",
-  
-  // "community.form.title": "Name",
-  "community.form.title": "İsim",
-  
-  // "community.page.edit": "Edit this community",
-  "community.page.edit": "Bu komüniteyi düzenle",
-  
-  // "community.page.handle": "Permanent URI for this community",
-  "community.page.handle": "Bu komünite için Kalıcı Uri",
-  
-  // "community.page.license": "License",
-  "community.page.license": "Lisans",
-  
-  // "community.page.news": "News",
-  "community.page.news": "Haberler",
-  
-  // "community.all-lists.head": "Subcommunities and Collections",
-  "community.all-lists.head": "Alt komüniteler ve koleksiyonlar",
-  
-  // "community.sub-collection-list.head": "Collections of this Community",
-  "community.sub-collection-list.head": "Bu komünitenin koleksiyonları",
-  
-  // "community.sub-community-list.head": "Communities of this Community",
-  "community.sub-community-list.head": "Bu komünitenin koleksiyonları",
-  
-  
-  
-  // "cookies.consent.accept-all": "Accept all",
-  "cookies.consent.accept-all": "Hepsini kabul et",
-  
-  // "cookies.consent.accept-selected": "Accept selected",
-  "cookies.consent.accept-selected": "Seçiliyi kabul et",
-  
-  // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
-  "cookies.consent.app.opt-out.description": "Bu uygulama varsayılan olarak yüklenir (ancak vazgeçebilirsiniz)",
-  
-  // "cookies.consent.app.opt-out.title": "(opt-out)",
-  "cookies.consent.app.opt-out.title": "(vazgeç)",
-  
-  // "cookies.consent.app.purpose": "purpose",
-  "cookies.consent.app.purpose": "amaç",
-  
-  // "cookies.consent.app.required.description": "This application is always required",
-  "cookies.consent.app.required.description": "Bu uygulama her zaman gereklidir",
-  
-  // "cookies.consent.app.required.title": "(always required)",
-  "cookies.consent.app.required.title": "(her zaman gerekli)",
-  
-  // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
-  "cookies.consent.update": "Son ziyaretinizden bu yana değişiklikler vardı, lütfen onayınızı güncelleyin.",
-  
-  // "cookies.consent.close": "Close",
-  "cookies.consent.close": "Kapat",
-  
-  // "cookies.consent.decline": "Decline",
-  "cookies.consent.decline": "Reddet",
-  
-  // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
-  "cookies.consent.content-notice.description": "Kişisel bilgilerinizi aşağıdaki amaçlarla topluyor ve işleriz: <strong>Kimlik Doğrulama, Tercihler, Onay ve İstatistikler</strong>. <br/> Daha fazla bilgi için, lütfen okuyun {privacyPolicy}.",
-  
-  // "cookies.consent.content-notice.learnMore": "Customize",
-  "cookies.consent.content-notice.learnMore": "Özelleştir",
-  
-  // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
-  "cookies.consent.content-modal.description": "Burada, sizin hakkınızda topladığımız bilgileri görebilir ve özelleştirebilirsiniz.",
-  
-  // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
-  "cookies.consent.content-modal.privacy-policy.name": "Gizlilik Politikası",
-  
-  // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
-  "cookies.consent.content-modal.privacy-policy.text": "Daha fazla bilgi için, lütfen okuyun {privacyPolicy}.",
-  
-  // "cookies.consent.content-modal.title": "Information that we collect",
-  "cookies.consent.content-modal.title": "Topladığımız bilgiler",
-  
-  
-  
-  // "cookies.consent.app.title.authentication": "Authentication",
-  "cookies.consent.app.title.authentication": "Kimlik doğrulama",
-  
-  // "cookies.consent.app.description.authentication": "Required for signing you in",
-  "cookies.consent.app.description.authentication": "Kayıt olmak için gerekli",
-  
-  
-  // "cookies.consent.app.title.preferences": "Preferences",
-  "cookies.consent.app.title.preferences": "Tercihler",
-  
-  // "cookies.consent.app.description.preferences": "Required for saving your preferences",
-  "cookies.consent.app.description.preferences": "Tercihlerinizi kaydetmek için gerekli",
-  
-  
-  
-  // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
-  "cookies.consent.app.title.acknowledgement": "Onaylama",
-  
-  // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
-  "cookies.consent.app.description.acknowledgement": "Teşekkürlerinizi ve onayları kurtarmak için gerekli",
-  
-  
-  
-  // "cookies.consent.app.title.google-analytics": "Google Analytics",
-  "cookies.consent.app.title.google-analytics": "Google Analitiği",
-  
-  // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
-  "cookies.consent.app.description.google-analytics": "İstatistiksel verileri izlememize izin verir",
-  
-  
-  
-  // "cookies.consent.purpose.functional": "Functional",
-  "cookies.consent.purpose.functional": "Fonksiyonel",
-  
-  // "cookies.consent.purpose.statistical": "Statistical",
-  "cookies.consent.purpose.statistical": "İstatistiksel",
-  
-  
-  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  "curation-task.task.checklinks.label":  "Metadatalardaki Bağlantıları Kontrol Et",
-  
-  // "curation-task.task.noop.label": "NOOP",
-  "curation-task.task.noop.label": "NOOP",
-  
-  // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
-  "curation-task.task.profileformats.label": "Profil Bitstream Formatları",
-  
-  // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
-  "curation-task.task.requiredmetadata.label": "Gerekli metadataları kontrol edin",
-  
-  // "curation-task.task.translate.label": "Microsoft Translator",
-  "curation-task.task.translate.label": "Microsoft Tercüman",
-  
-  // "curation-task.task.vscan.label": "Virus Scan",
-  "curation-task.task.vscan.label": "Virüs Taraması",
-  
-  
-  
-  // "curation.form.task-select.label": "Task:",
-  "curation.form.task-select.label": "Görev:",
-  
-  // "curation.form.submit": "Start",
-  "curation.form.submit": "Başlangıç",
-  
-  // "curation.form.submit.success.head": "The curation task has been started successfully",
-  "curation.form.submit.success.head": "Küratör görevi başarıyla başlatıldı",
-  
-  // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
-  "curation.form.submit.success.content": "İlgili işlem sayfasına yönlendirileceksiniz.",
-  
-  // "curation.form.submit.error.head": "Running the curation task failed",
-  "curation.form.submit.error.head": "Küratörlük görevi başarısız oldu",
-  
-  // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
-  "curation.form.submit.error.content": "Küratörlük görevi başlatmaya çalışırken bir hata oluştu.",
-  
-  // "curation.form.handle.label": "Handle:",
-  "curation.form.handle.label": "Ele al:",
-  
-  // "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
-  "curation.form.handle.hint": "İpucu: Gir [your-handle-prefix]/0 tüm sitede bir görevi çalıştırmak için (tüm görevler bu özelliği destekleyemez)",
-  
-  
-  
-  // "dso-selector.create.collection.head": "New collection",
-  "dso-selector.create.collection.head": "Yeni koleksiyon",
-  
-  // "dso-selector.create.collection.sub-level": "Create a new collection in",
-  "dso-selector.create.collection.sub-level": "Yeni bir koleksiyon oluşturun",
-  
-  // "dso-selector.create.community.head": "New community",
-  "dso-selector.create.community.head": "Yeni komünite",
-  
-  // "dso-selector.create.community.sub-level": "Create a new community in",
-  "dso-selector.create.community.sub-level": "Yeni bir komünite oluştur",
-  
-  // "dso-selector.create.community.top-level": "Create a new top-level community",
-  "dso-selector.create.community.top-level": "Yeni bir üst düzey komünite oluştur",
-  
-  // "dso-selector.create.item.head": "New item",
-  "dso-selector.create.item.head": "Yeni öğe",
-  
-  // "dso-selector.create.item.sub-level": "Create a new item in",
-  "dso-selector.create.item.sub-level": "İçinde yeni bir öğe oluşturun",
-  
-  // "dso-selector.create.submission.head": "New submission",
-  "dso-selector.create.submission.head": "Yeni başvuru",
-  
-  // "dso-selector.edit.collection.head": "Edit collection",
-  "dso-selector.edit.collection.head": "Koleksiyonu Düzenle",
-  
-  // "dso-selector.edit.community.head": "Edit community",
-  "dso-selector.edit.community.head": "Topluluğu Düzenle",
-  
-  // "dso-selector.edit.item.head": "Edit item",
-  "dso-selector.edit.item.head": "Ögeyi düzenle",
-  
-  // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
-  "dso-selector.export-metadata.dspaceobject.head": "Metadatalarını dışa aktar",
-  
-  // "dso-selector.no-results": "No {{ type }} found ",
-  "dso-selector.no-results": "Bulunamadı {{ type }} ",
-  
-  // "dso-selector.placeholder": "Search for a {{ type }}",
-  "dso-selector.placeholder": " Ara {{ type }}",
-  
-  
-  
-  // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
-  "confirmation-modal.export-metadata.header": "Metadatalarını dışa aktar {{ dsoName }}",
-  
-  // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
-  "confirmation-modal.export-metadata.info": "Metadataları dışarı aktarmak istediğinizden emin misiniz {{ dsoName }}",
-  
-  // "confirmation-modal.export-metadata.cancel": "Cancel",
-  "confirmation-modal.export-metadata.cancel": "İptal",
-  
-  // "confirmation-modal.export-metadata.confirm": "Export",
-  "confirmation-modal.export-metadata.confirm": "Dışarı aktar",
-  
-  // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
-  "confirmation-modal.delete-eperson.header": "EPerson'ı sil \"{{ dsoName }}\"",
-  
-  // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
-  "confirmation-modal.delete-eperson.info": "Eperson'u silmek istediğinize emin misiniz? \"{{ dsoName }}\"",
-  
-  // "confirmation-modal.delete-eperson.cancel": "Cancel",
-  "confirmation-modal.delete-eperson.cancel": "İptal",
-  
-  // "confirmation-modal.delete-eperson.confirm": "Delete",
-  "confirmation-modal.delete-eperson.confirm": "Sil",
-  
-  
-  // "error.bitstream": "Error fetching bitstream",
-  "error.bitstream": "Alınan bitstream hatası",
-  
-  // "error.browse-by": "Error fetching items",
-  "error.browse-by": "Alınan öğeler hatası",
-  
-  // "error.collection": "Error fetching collection",
-  "error.collection": "Alınan koleksiyon hatası",
-  
-  // "error.collections": "Error fetching collections",
-  "error.collections": "Alınan koleksiyonlar hatası",
-  
-  // "error.community": "Error fetching community",
-  "error.community": "Alınan komünite hatası",
-  
-  // "error.identifier": "No item found for the identifier",
-  "error.identifier": "Tanımlayıcı için ürün bulunamadı",
-  
-  // "error.default": "Error",
-  "error.default": "Hata",
-  
-  // "error.item": "Error fetching item",
-  "error.item": "Alınan öğe hatası",
-  
-  // "error.items": "Error fetching items",
-  "error.items": "Alınan öğeler hatası",
-  
-  // "error.objects": "Error fetching objects",
-  "error.objects": "Alınan nesneler hatası",
-  
-  // "error.recent-submissions": "Error fetching recent submissions",
-  "error.recent-submissions": "Son başvuruları alma hatası",
-  
-  // "error.search-results": "Error fetching search results",
-  "error.search-results": "Arama sonuçlarını alma hatası",
-  
-  // "error.sub-collections": "Error fetching sub-collections",
-  "error.sub-collections": "Alt koleksiyonları alma hatası",
-  
-  // "error.sub-communities": "Error fetching sub-communities",
-  "error.sub-communities": "Alt komüniteleri alma hatası",
-  
-  // "error.submission.sections.init-form-error": "An error occurred during section initialize, please check your input-form configuration. Details are below : <br> <br>",
-  "error.submission.sections.init-form-error": "Bölüm başlatma sırasında bir hata oluştu, lütfen giriş formu yapılandırmanızı kontrol edin. Detaylar aşağıdadır : <br> <br>",
-  
-  // "error.top-level-communities": "Error fetching top-level communities",
-  "error.top-level-communities": "Üst düzey komüniteleri alma hatası",
-  
-  // "error.validation.license.notgranted": "You must grant this license to complete your submission. If you are unable to grant this license at this time you may save your work and return later or remove the submission.",
-  "error.validation.license.notgranted": "Gönderinizi tamamlamak için bu lisansı vermelisiniz. Bu lisansı şu anda veremiyorsanız, çalışmanızı kaydedebilir ve daha sonra geri gönderebilir veya gönderimi kaldırabilirsiniz.",
-  
-  // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
-  "error.validation.pattern": "Bu giriş mevcut modelle sınırlandırılmıştır.: {{ pattern }}.",
-  
-  // "error.validation.filerequired": "The file upload is mandatory",
-  "error.validation.filerequired": "Dosya yükleme zorunludur",
-  
-  
-  
-  // "file-section.error.header": "Error obtaining files for this item",
-  "file-section.error.header": "Bu öğe için dosyaları elde etme hatası",
-  
-  
-  
-  // "footer.copyright": "copyright © 2002-{{ year }}",
-  "footer.copyright": "telif hakkı © 2002-{{ year }}",
-  
-  // "footer.link.dspace": "DSpace software",
-  "footer.link.dspace": "DSpace yazılım",
-  
-  // "footer.link.lyrasis": "LYRASIS",
-  "footer.link.lyrasis": "LYRASIS",
-  
-  // "footer.link.cookies": "Cookie settings",
-  "footer.link.cookies": "Çerez Ayarları",
-  
-  // "footer.link.privacy-policy": "Privacy policy",
-  "footer.link.privacy-policy": "Gizlilik Politikası",
-  
-  // "footer.link.end-user-agreement":"End User Agreement",
-  "footer.link.end-user-agreement":"Son Kullanıcı Sözleşmesi",
-  
-  
-  
-  // "forgot-email.form.header": "Forgot Password",
-  "forgot-email.form.header": "Parolanızı mı unuttunuz",
-  
-  // "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  "forgot-email.form.info": "E-posta güncellemeleri için koleksiyonlara abone olmak için bir hesap kaydedin ve DSPace'e yeni öğeler gönderin.",
-  
-  // "forgot-email.form.email": "Email Address *",
-  "forgot-email.form.email": "Eposta Adresi *",
-  
-  // "forgot-email.form.email.error.required": "Please fill in an email address",
-  "forgot-email.form.email.error.required": "Lütfen bir e-posta adresi giriniz",
-  
-  // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
-  "forgot-email.form.email.error.pattern": "Lütfen bir e-posta adresi giriniz",
-  
-  // "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
-  "forgot-email.form.email.hint": "Bu adres, giriş adınız olarak doğrulanacak ve kullanılacaktır.",
-  
-  // "forgot-email.form.submit": "Submit",
-  "forgot-email.form.submit": "Kaydet",
-  
-  // "forgot-email.form.success.head": "Verification email sent",
-  "forgot-email.form.success.head": "Doğrulama e-postası gönderildi",
-  
-  // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  "forgot-email.form.success.content": "Özel bir URL ve daha fazla talimat içeren bir e posta bu {{ email }} mail adresin gönderildi. ",
-  
-  // "forgot-email.form.error.head": "Error when trying to register email",
-  "forgot-email.form.error.head": "E-postayı kaydetmeye çalışırken hata oluştu",
-  
-  // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
-  "forgot-email.form.error.content": "E-posta adresini kaydederken bir hata oluştu: {{ email }}",
-  
-  
-  
-  // "forgot-password.title": "Forgot Password",
-  "forgot-password.title": "Parolanızı mı unuttunuz",
-  
-  // "forgot-password.form.head": "Forgot Password",
-  "forgot-password.form.head": "Parolanızı mı unuttunuz",
-  
-  // "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": "Aşağıdaki kutuya yeni bir parola girin ve tekrar ikinci kutuya yazarak onaylayın. En az altı karakter uzunluğunda olmalıdır.",
-  
-  // "forgot-password.form.card.security": "Security",
-  "forgot-password.form.card.security": "Güvenlik",
-  
-  // "forgot-password.form.identification.header": "Identify",
-  "forgot-password.form.identification.header": "Kimlik",
-  
-  // "forgot-password.form.identification.email": "Email address: ",
-  "forgot-password.form.identification.email": "E-posta adresi: ",
-  
-  // "forgot-password.form.label.password": "Password",
-  "forgot-password.form.label.password": "Parola",
-  
-  // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
-  "forgot-password.form.label.passwordrepeat": "Doğrulamak için yeniden yazınız",
-  
-  // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
-  "forgot-password.form.error.empty-password": "Lütfen aşağıdaki kutuya bir parola girin.",
-  
-  // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
-  "forgot-password.form.error.matching-passwords": "Parolalar eşleşmiyor.",
-  
-  // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
-  "forgot-password.form.error.password-length": "Parola en az 6 karakter uzunluğunda olmalıdır.",
-  
-  // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
-  "forgot-password.form.notification.error.title": "Yeni parola göndermeye çalışırken hata oluştu",
-  
-  // "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.",
-  "forgot-password.form.notification.success.content": "Parola sıfırlama başarılı oldu. Oluşturulan kullanıcı olarak giriş yaptınız.",
-  
-  // "forgot-password.form.notification.success.title": "Password reset completed",
-  "forgot-password.form.notification.success.title": "Parola sıfırlama tamamlandı",
-  
-  // "forgot-password.form.submit": "Submit password",
-  "forgot-password.form.submit": "Parolayı kaydet",
-  
-  
-  
-  // "form.add": "Add",
-  "form.add": "Ekle",
-  
-  // "form.add-help": "Click here to add the current entry and to add another one",
-  "form.add-help": "Geçerli girişi eklemek ve bir tane daha eklemek için buraya tıklayın.",
-  
-  // "form.cancel": "Cancel",
-  "form.cancel": "İptal",
-  
-  // "form.clear": "Clear",
-  "form.clear": "Temizle",
-  
-  // "form.clear-help": "Click here to remove the selected value",
-  "form.clear-help": "Seçilen değeri kaldırmak için buraya tıklayın",
-  
-  // "form.edit": "Edit",
-  "form.edit": "Düzenle",
-  
-  // "form.edit-help": "Click here to edit the selected value",
-  "form.edit-help": "Seçilen değeri düzenlemek için buraya tıklayın",
-  
-  // "form.first-name": "First name",
-  "form.first-name": "İlk adı",
-  
-  // "form.group-collapse": "Collapse",
-  "form.group-collapse": "Yığmak",
-  
-  // "form.group-collapse-help": "Click here to collapse",
-  "form.group-collapse-help": "Yığmak için buraya tıklayın",
-  
-  // "form.group-expand": "Expand",
-  "form.group-expand": "Uzat",
-  
-  // "form.group-expand-help": "Click here to expand and add more elements",
-  "form.group-expand-help": "Genişletmek ve daha fazla öğe eklemek için buraya tıklayın",
-  
-  // "form.last-name": "Last name",
-  "form.last-name": "Soyadı",
-  
-  // "form.loading": "Loading...",
-  "form.loading": "Yükleniyor...",
-  
-  // "form.lookup": "Lookup",
-  "form.lookup": "Yukarı Bak",
-  
-  // "form.lookup-help": "Click here to look up an existing relation",
-  "form.lookup-help": "Mevcut bir bağlantı aramak için buraya tıklayın",
-  
-  // "form.no-results": "No results found",
-  "form.no-results": "Sonuç bulunamadı",
-  
-  // "form.no-value": "No value entered",
-  "form.no-value": "Değer girilmez",
-  
-  // "form.other-information": {},
-  "form.other-information": {},
-  
-  // "form.remove": "Remove",
-  "form.remove": "Kaldır",
-  
-  // "form.save": "Save",
-  "form.save": "Kaydet",
-  
-  // "form.save-help": "Save changes",
-  "form.save-help": "Değişiklikleri kaydet",
-  
-  // "form.search": "Search",
-  "form.search": "Ara",
-  
-  // "form.search-help": "Click here to look for an existing correspondence",
-  "form.search-help": "Mevcut bir yazışma aramak için buraya tıklayın",
-  
-  // "form.submit": "Submit",
-  "form.submit": "Gönder",
-  
-  
-  
-  // "home.description": "",
-  "home.description": "",
-  
-  // "home.breadcrumbs": "Home",
-  "home.breadcrumbs": "Anasayfa",
-  
-  // "home.title": "DSpace Angular :: Home",
-  "home.title": "DSpace Açısal :: Anasayfa",
-  
-  // "home.top-level-communities.head": "Communities in DSpace",
-  "home.top-level-communities.head": "Dspace'deki Komüniteler",
-  
-  // "home.top-level-communities.help": "Select a community to browse its collections.",
-  "home.top-level-communities.help": "Koleksiyonlarına göz atmak için bir komünite seçin.",
- 
-  // "home.search-form.placeholder": "Search the repository ...", 
-  "home.search-form.placeholder": "Depoda ara ...", 
-  
-  
-  // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
-  "info.end-user-agreement.accept": "Okudum ve son kullanıcı sözleşmesini kabul ediyorum",
-  
-  // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
-  "info.end-user-agreement.accept.error": "Son kullanıcı sözleşmesini kabul eden bir hata oluştu",
-  
-  // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
-  "info.end-user-agreement.accept.success": "Son Kullanıcı Sözleşmesini başarıyla güncelledi",
-  
-  // "info.end-user-agreement.breadcrumbs": "End User Agreement",
-  "info.end-user-agreement.breadcrumbs": "Son Kullanıcı Sözleşmesi",
-  
-  // "info.end-user-agreement.buttons.cancel": "Cancel",
-  "info.end-user-agreement.buttons.cancel": "İptal",
-  
-  // "info.end-user-agreement.buttons.save": "Save",
-  "info.end-user-agreement.buttons.save": "Kaydet",
-  
-  // "info.end-user-agreement.head": "End User Agreement",
-  "info.end-user-agreement.head": "Son Kullanıcı Sözleşmesi",
-  
-  // "info.end-user-agreement.title": "End User Agreement",
-  "info.end-user-agreement.title": "Son Kullanıcı Sözleşmesi",
-  
-  // "info.privacy.breadcrumbs": "Privacy Statement",
-  "info.privacy.breadcrumbs": "Gizlilik bildirimi",
-  
-  // "info.privacy.head": "Privacy Statement",
-  "info.privacy.head": "Gizlilik bildirimi",
-  
-  // "info.privacy.title": "Privacy Statement",
-  "info.privacy.title": "Gizlilik bildirimi",
-  
-  
-  
-  // "item.alerts.private": "This item is private",
-  "item.alerts.private": "Bu öğe özel",
-  
-  // "item.alerts.withdrawn": "This item has been withdrawn",
-  "item.alerts.withdrawn": "Bu ürün geri çekildi",
-  
-  
-  
-  // "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
-  "item.edit.authorizations.heading": "Bu editör ile bir öğenin politikalarını görüntüleyebilir ve değiştirebilirsiniz, ayrıca bireysel ürün bileşenlerinin politikalarını değiştirebilirsiniz: Paketler ve Bitstream. Kısaca, bir öğe bir paket konteynırıdır ve paketler bitstream konteynırıdır. Konteynerler genellikle, bitstream yalnızca okuma / yazma politikalarına sahip olur.",
-  
-  // "item.edit.authorizations.title": "Edit item's Policies",
-  "item.edit.authorizations.title": "Edit item's Politikalar",
-  
-  
-  
-  // "item.badge.private": "Private",
-  "item.badge.private": "Özel",
-  
-  // "item.badge.withdrawn": "Withdrawn",
-  "item.badge.withdrawn": "Çekilmiş",
-  
-  
-  
-  // "item.bitstreams.upload.bundle": "Bundle",
-  "item.bitstreams.upload.bundle": "Paket",
-  
-  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
-  "item.bitstreams.upload.bundle.placeholder": "Bir paket seçin",
-  
-  // "item.bitstreams.upload.bundle.new": "Create bundle",
-  "item.bitstreams.upload.bundle.new": "Paket oluştur",
-  
-  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
-  "item.bitstreams.upload.bundles.empty": "Bu öğe, bir bitstream yüklemek için herhangi bir paket içermiyor.",
-  
-  // "item.bitstreams.upload.cancel": "Cancel",
-  "item.bitstreams.upload.cancel": "İptal",
-  
-  // "item.bitstreams.upload.drop-message": "Drop a file to upload",
-  "item.bitstreams.upload.drop-message": "Yüklenecek bir dosya bırak",
-  
-  // "item.bitstreams.upload.item": "Item: ",
-  "item.bitstreams.upload.item": "Öğe: ",
-  
-  // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
-  "item.bitstreams.upload.notifications.bundle.created.content": "Başarıyla yeni paket oluşturuldu.",
-  
-  // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
-  "item.bitstreams.upload.notifications.bundle.created.title": "Paket oluşturdu",
-  
-  // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
-  "item.bitstreams.upload.notifications.upload.failed": "Yükleme başarısız. Lütfen yeniden denemeden önce içeriği doğrulayın.",
-  
-  // "item.bitstreams.upload.title": "Upload bitstream",
-  "item.bitstreams.upload.title": "Bitstream yükle",
-  
-  
-  
-  // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
-  "item.edit.bitstreams.bundle.edit.buttons.upload": "Yükle",
-  
-  // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
-  "item.edit.bitstreams.bundle.displaying": "Şu anda görüntülenen {{ amount }} bitstream {{ total }}.",
-  
-  // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
-  "item.edit.bitstreams.bundle.load.all": "Hepsini yükle ({{ total }})",
-  
-  // "item.edit.bitstreams.bundle.load.more": "Load more",
-  "item.edit.bitstreams.bundle.load.more": "Daha fazla yükle",
-  
-  // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
-  "item.edit.bitstreams.bundle.name": "PAKET: {{ name }}",
-  
-  // "item.edit.bitstreams.discard-button": "Discard",
-  "item.edit.bitstreams.discard-button": "Yoksay",
-  
-  // "item.edit.bitstreams.edit.buttons.download": "Download",
-  "item.edit.bitstreams.edit.buttons.download": "İndir",
-  
-  // "item.edit.bitstreams.edit.buttons.drag": "Drag",
-  "item.edit.bitstreams.edit.buttons.drag": "Sürükle",
-  
-  // "item.edit.bitstreams.edit.buttons.edit": "Edit",
-  "item.edit.bitstreams.edit.buttons.edit": "Düzenle",
-  
-  // "item.edit.bitstreams.edit.buttons.remove": "Remove",
-  "item.edit.bitstreams.edit.buttons.remove": "Kaldır",
-
-  // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
-  "item.edit.bitstreams.edit.buttons.undo": "Değişiklikleri geri al",
-  
-  // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
-  "item.edit.bitstreams.empty": "Bu öge herhangi bir veri içermiyor. Bir tane oluşturmak için yükle düğmesini tıklayınız.",
-  
-  // "item.edit.bitstreams.headers.actions": "Actions",
-  "item.edit.bitstreams.headers.actions": "İşlemler",
-  
-  // "item.edit.bitstreams.headers.bundle": "Bundle",
-  "item.edit.bitstreams.headers.bundle": "Seri",
-  
-  // "item.edit.bitstreams.headers.description": "Description",
-  "item.edit.bitstreams.headers.description": "Açıklama",
-  
-  // "item.edit.bitstreams.headers.format": "Format",
-  "item.edit.bitstreams.headers.format": "Format",
-  
-  // "item.edit.bitstreams.headers.name": "Name",
-  "item.edit.bitstreams.headers.name": "Ad",
-  
-  // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "item.edit.bitstreams.notifications.discarded.content": "Yaptığınız değişiklikler silindi.Yaptığınız değişiklikleri geri yüklemek için 'Geri al' butonuna tıklayınız.",
-  
-  // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
-  "item.edit.bitstreams.notifications.discarded.title": "Değişiklikler silindi.",
-  
-  // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
-  "item.edit.bitstreams.notifications.move.failed.title": "Veri taşınırken bir hata oluştu.",
-  
-  // "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this item's bitstreams and bundles have been saved.",
-  "item.edit.bitstreams.notifications.move.saved.content": "Bu öğenin bitstreamda ve paketlerinde yaptığınız değişiklikler kaydedildi.",
-  
-  // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
-  "item.edit.bitstreams.notifications.move.saved.title": "Değişiklikler kaydedildi.",
-  
-  // "item.edit.bitstreams.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
-  "item.edit.bitstreams.notifications.outdated.content": "Şu anda üzerinde çalıştığınız öğe başka bir kullanıcı tarafından değiştirildi.Mevcut değişiklikleriniz çakışma olmasını önlemek için silindi. ",
-  
-  // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
-  "item.edit.bitstreams.notifications.outdated.title": "Değişiklikler zaman aşımına uğradı.",
-  
-  // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
-  "item.edit.bitstreams.notifications.remove.failed.title": "Bitstream silinirken bir hata oluştu",
-  
-  // "item.edit.bitstreams.notifications.remove.saved.content": "Your removal changes to this item's bitstreams have been saved.",
-  "item.edit.bitstreams.notifications.remove.saved.content": "Bu öğenin bitstreamda yaptığınız kaldırma değişiklikleri kaydedildi.",
-  
-  // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
-  "item.edit.bitstreams.notifications.remove.saved.title": "Kaldırma değişiklikleri kaydedildi.",
-  
-  // "item.edit.bitstreams.reinstate-button": "Undo",
-  "item.edit.bitstreams.reinstate-button": "Geri al",
-  
-  // "item.edit.bitstreams.save-button": "Save",
-  "item.edit.bitstreams.save-button": "Kaydet",
-  
-  // "item.edit.bitstreams.upload-button": "Upload",
-  "item.edit.bitstreams.upload-button": "Yükle",
-  
-  
-  
-  // "item.edit.delete.cancel": "Cancel",
-  "item.edit.delete.cancel": "İptal et",
-  
-  // "item.edit.delete.confirm": "Delete",
-  "item.edit.delete.confirm": "Sil",
-  
-  // "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.",
-  "item.edit.delete.description": "Bu öğeyi kalıcı olarak silmek istedğinizden emin misiniz? Silme işlemi gerçekleştikten sonra geri alınamaz. ",
-  
-  // "item.edit.delete.error": "An error occurred while deleting the item",
-  "item.edit.delete.error": "Silme işlemi sırasında bir hata oluştu.",
-  
-  // "item.edit.delete.header": "Delete item: {{ id }}",
-  "item.edit.delete.header": "Silinecek öğeler: {{ id }}",
-  
-  // "item.edit.delete.success": "The item has been deleted",
-  "item.edit.delete.success": "Öğe silindi.",
-  
-  // "item.edit.head": "Edit Item",
-  "item.edit.head": "Ögeleri düzenle",
-  
-  // "item.edit.breadcrumbs": "Edit Item",
-  "item.edit.breadcrumbs": "Ögeleri düzenle",
-  
-  
-  // "item.edit.tabs.mapper.head": "Collection Mapper",
-  "item.edit.tabs.mapper.head": "Koleksiyon eşleştiricisi",
-  
-  // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
-  "item.edit.tabs.item-mapper.title": "Öge düzenle- Koleksiyon eşleştiricisi",
-  
-  // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
-  "item.edit.item-mapper.buttons.add": "Ögeyi seçili koleksiyonlarla eşleştir",
-  
-  // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
-  "item.edit.item-mapper.buttons.remove": "Seçili koleksiyonların öge eşleştirmelerini kaldır",
-  
-  // "item.edit.item-mapper.cancel": "Cancel",
-  "item.edit.item-mapper.cancel": "İptal et",
-  
-  // "item.edit.item-mapper.description": "This is the item mapper tool that allows administrators to map this item to other collections. You can search for collections and map them, or browse the list of collections the item is currently mapped to.",
-  "item.edit.item-mapper.description": "Öge eşleme aracı, yöneticilerin bu öğeyi diğer koleksiyonlarla eşleştirmesini ögeleri eşleştirmesini sağlar. Koleksiyonları arayabilir ve bunları eşleyebilir veya öğenin şu anda eşlendiği koleksiyonların listesine göz atabilirsiniz.",
-  
-  // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
-  "item.edit.item-mapper.head": "Öge eşleştirici - Ögeleri koleksiyonlarla eşleştirir",
-  
-  // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
-  "item.edit.item-mapper.item": "Öge: \"<b>{{name}}</b>\"",
-  
-  // "item.edit.item-mapper.no-search": "Please enter a query to search",
-  "item.edit.item-mapper.no-search": "Lütfen arama yapmak için bir soru giriniz.",
-  
-  // "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of item to {{amount}} collections.",
-  "item.edit.item-mapper.notifications.add.error.content": "Ögelerin {{amount}} koleksiyonlarla eşleştirirken bir hata oluştu.",
-  
-  // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
-  "item.edit.item-mapper.notifications.add.error.head": "Eşleştirme hataları",
-  
-  // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
-  "item.edit.item-mapper.notifications.add.success.content": "Ögeler {{amount}} koleksiyonlarla başarıyla eşleştirildi.",
-  
-  // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
-  "item.edit.item-mapper.notifications.add.success.head": "Eşleştirme tamamlandı.",
-  
-  // "item.edit.item-mapper.notifications.remove.error.content": "Errors occurred for the removal of the mapping to {{amount}} collections.",
-  "item.edit.item-mapper.notifications.remove.error.content": "Ögelerin {{amount}} koleksiyonlarla eşleştirmeleri kaldırılırken bir hata oluştu.",
-  
-  // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
-  "item.edit.item-mapper.notifications.remove.error.head": "Eşleştirme hatalarının kaldırılması",
-  
-  // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
-  "item.edit.item-mapper.notifications.remove.success.content": "Ögeler {{amount}} koleksiyonlarla eşleştirmeleri başarıyla kaldırıldı.",
-  
-  // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
-  "item.edit.item-mapper.notifications.remove.success.head": "Eşleştirmelerin kaldırılması tamamlandı.",
-  
-  // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
-  "item.edit.item-mapper.tabs.browse": "Eşleştirilen koleksiyonları ara",
-  
-  // "item.edit.item-mapper.tabs.map": "Map new collections",
-  "item.edit.item-mapper.tabs.map": "Yeni koleksiyonları eşleştir",
-  
-  
-  
-  // "item.edit.metadata.add-button": "Add",
-  "item.edit.metadata.add-button": "Ekle",
-  
-  // "item.edit.metadata.discard-button": "Discard",
-  "item.edit.metadata.discard-button": "Sil",
-  
-  // "item.edit.metadata.edit.buttons.edit": "Edit",
-  "item.edit.metadata.edit.buttons.edit": "Düzenle",
-  
-  // "item.edit.metadata.edit.buttons.remove": "Remove",
-  "item.edit.metadata.edit.buttons.remove": "Kaldır",
-  
-  // "item.edit.metadata.edit.buttons.undo": "Undo changes",
-  "item.edit.metadata.edit.buttons.undo": "Değişiklikleri geri al",
-  
-  // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
-  "item.edit.metadata.edit.buttons.unedit": "Düzenlemeyi bitir",
-  
-  // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
-  "item.edit.metadata.empty": "Öğe şu anda herhangi bir metadata içermiyor. Bir metadata değeri eklemeye başlamak için Ekle'ye tıklayın.",
-  
-  // "item.edit.metadata.headers.edit": "Edit",
-  "item.edit.metadata.headers.edit": "Düzenle",
-  
-  // "item.edit.metadata.headers.field": "Field",
-  "item.edit.metadata.headers.field": "Alan",
-  
-  // "item.edit.metadata.headers.language": "Lang",
-  "item.edit.metadata.headers.language": "Dil",
-  
-  // "item.edit.metadata.headers.value": "Value",
-  "item.edit.metadata.headers.value": "Değer",
-  
-  // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
-  "item.edit.metadata.metadatafield.invalid": "Lütfen geçerli bir metadata alanı seçin",
-  
-  // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "item.edit.metadata.notifications.discarded.content": "Yaptığınız değişiklikler silindi.Yaptığınız değişiklikleri geri yüklemek için 'Geri al' butonuna tıklayınız.",
-  
-  // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
-  "item.edit.metadata.notifications.discarded.title": "Değişiklikler silindi",
-  
-  // "item.edit.metadata.notifications.error.title": "An error occurred",
-  "item.edit.metadata.notifications.error.title": "Bir hata oluştu",
-  
-  // "item.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
-  "item.edit.metadata.notifications.invalid.content": "Değişiklikleriniz kaydedilmedi. Lütfen kaydetmeden önce tüm alanların geçerli olduğundan emin olun.",
-  
-  // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
-  "item.edit.metadata.notifications.invalid.title": "Metadata geçersiz",
-  
-  // "item.edit.metadata.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
-  "item.edit.metadata.notifications.outdated.content": "Şu anda üzerinde çalıştığınız öge başka bir kullanıcı tarafından değiştirildi.Mevcut değişiklikleriniz çakışma olmasını önlemek için silindi.",
-  
-  // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
-  "item.edit.metadata.notifications.outdated.title": "Değişiklikler zaman aşımına uğradı.",
-  
-  // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
-  "item.edit.metadata.notifications.saved.content": "Ögenin metadatalarında yaptığınız değişiklikler kaydedildi.",
-  
-  // "item.edit.metadata.notifications.saved.title": "Metadata saved",
-  "item.edit.metadata.notifications.saved.title": "Metadatalar kaydedildi",
-  
-  // "item.edit.metadata.reinstate-button": "Undo",
-  "item.edit.metadata.reinstate-button": "Geri al",
-  
-  // "item.edit.metadata.save-button": "Save",
-  "item.edit.metadata.save-button": "Kaydet",
-  
-  
-  
-  // "item.edit.modify.overview.field": "Field",
-  "item.edit.modify.overview.field": "Alan",
-  
-  // "item.edit.modify.overview.language": "Language",
-  "item.edit.modify.overview.language": "Dil",
-  
-  // "item.edit.modify.overview.value": "Value",
-  "item.edit.modify.overview.value": "Değer",
-  
-  
-  
-  // "item.edit.move.cancel": "Cancel",
-  "item.edit.move.cancel": "İptal et",
-  
-  // "item.edit.move.description": "Select the collection you wish to move this item to. To narrow down the list of displayed collections, you can enter a search query in the box.",
-  "item.edit.move.description": "Bu öğeyi taşımak istediğiniz koleksiyonu seçin. Görüntülenen koleksiyonların listesini daraltmak için arama kısmına bir arama sorgusu girebilirsiniz.",
-  
-  // "item.edit.move.error": "An error occurred when attempting to move the item",
-  "item.edit.move.error": "Öğeyi taşımaya çalışırken bir hata oluştu",
-  
-  // "item.edit.move.head": "Move item: {{id}}",
-  "item.edit.move.head": "Kaldırılacak öge: {{id}}",
-  
-  // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
-  "item.edit.move.inheritpolicies.checkbox": "Poliçeyi devral",
-  
-  // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
-  "item.edit.move.inheritpolicies.description": "Hedef koleksiyonun varsayılan poliçelerini devral",
-  
-  // "item.edit.move.move": "Move",
-  "item.edit.move.move": "Taşı",
-  
-  // "item.edit.move.processing": "Moving...",
-  "item.edit.move.processing": "Taşınıyor...",
-  
-  // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
-  "item.edit.move.search.placeholder": "Lütfen koleksiyonları aramak için bir arama sorgusu giriniz.",
-  
-  // "item.edit.move.success": "The item has been moved successfully",
-  "item.edit.move.success": "Öge başarıyla taşındı",
-  
-  // "item.edit.move.title": "Move item",
-  "item.edit.move.title": "Ögeleri taşı",
-  
-  
-  
-  // "item.edit.private.cancel": "Cancel",
-  "item.edit.private.cancel": "İptal et",
-  
-  // "item.edit.private.confirm": "Make it Private",
-  "item.edit.private.confirm": "Gizli yap",
-  
-  // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
-  "item.edit.private.description": "Bu öğenin arşivde gizli yapılması gerektiğinden emin misiniz?",
-  
-  // "item.edit.private.error": "An error occurred while making the item private",
-  "item.edit.private.error": "Öge gizli yapılırken bir hata oluştu",
-  
-  // "item.edit.private.header": "Make item private: {{ id }}",
-  "item.edit.private.header": "Ögeyi gizli yap: {{ id }}",
-  
-  // "item.edit.private.success": "The item is now private",
-  "item.edit.private.success": "Öge gizlendi",
-  
-  
-  
-  // "item.edit.public.cancel": "Cancel",
-  "item.edit.public.cancel": "İptal et",
-  
-  // "item.edit.public.confirm": "Make it Public",
-  "item.edit.public.confirm": "Ögeyi herkese açık yap",
-  
-  // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
-  "item.edit.public.description": "Bu öğenin arşivde herkese açık yapılması gerektiğinden emin misiniz?",
-  
-  // "item.edit.public.error": "An error occurred while making the item public",
-  "item.edit.public.error": "Öge herkese açık yapılırken bir hata oluştu",
-  
-  // "item.edit.public.header": "Make item public: {{ id }}",
-  "item.edit.public.header": "Herkese açık yapılacak öge: {{ id }}",
-  
-  // "item.edit.public.success": "The item is now public",
-  "item.edit.public.success": "Öge herkese açık yapıldı",
-  
-  
-  
-  // "item.edit.reinstate.cancel": "Cancel",
-  "item.edit.reinstate.cancel": "İptal et",
-  
-  // "item.edit.reinstate.confirm": "Reinstate",
-  "item.edit.reinstate.confirm": "Getir yükle",
-  
-  // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
-  "item.edit.reinstate.description": "Bu öğenin arşive geri yüklenmesi gerektiğinden emin misiniz?",
-  
-  // "item.edit.reinstate.error": "An error occurred while reinstating the item",
-  "item.edit.reinstate.error": "Öğe geri yüklenirken bir hata oluştu",
-  
-  // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
-  "item.edit.reinstate.header": "Geri yüklenecek öge: {{ id  }}",
-  
-  // "item.edit.reinstate.success": "The item was reinstated successfully",
-  "item.edit.reinstate.success": "Öge başarıyla geri yüklendi",
-  
-  
-  
-  // "item.edit.relationships.discard-button": "Discard",
-  "item.edit.relationships.discard-button": "Sil",
-  
-  // "item.edit.relationships.edit.buttons.add": "Add",
-  "item.edit.relationships.edit.buttons.add": "Ekle",
-  
-  // "item.edit.relationships.edit.buttons.remove": "Remove",
-  "item.edit.relationships.edit.buttons.remove": "Kaldır",
-  
-  // "item.edit.relationships.edit.buttons.undo": "Undo changes",
-  "item.edit.relationships.edit.buttons.undo": "Değişiklikleri geri al",
-  
-  // "item.edit.relationships.no-relationships": "No relationships",
-  "item.edit.relationships.no-relationships": "İlişki yok",
-  
-  // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "item.edit.relationships.notifications.discarded.content": "Yaptığınız değişiklikler silindi.Yaptığınız değişiklikleri geri yüklemek için 'Geri al' butonuna tıklayınız.",
-  
-  // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
-  "item.edit.relationships.notifications.discarded.title": "Değişiklikler silindi",
-  
-  // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
-  "item.edit.relationships.notifications.failed.title": "İlişkileri düzenlemede hata",
-  
-  // "item.edit.relationships.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
-  "item.edit.relationships.notifications.outdated.content": "Şu anda üzerinde çalıştığınız öge başka bir kullanıcı tarafından değiştirildi.Mevcut değişiklikleriniz çakışma olmasını önlemek için silindi.",
-  
-  // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
-  "item.edit.relationships.notifications.outdated.title": "Değişiklikler zaman aşımına uğradı.",
-  
-  // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
-  "item.edit.relationships.notifications.saved.content": "Bu öğenin ilişkilerinde yaptığınız değişiklikler kaydedildi.",
-  
-  // "item.edit.relationships.notifications.saved.title": "Relationships saved",
-  "item.edit.relationships.notifications.saved.title": "İlişkiler kaydedildi",
-  
-  // "item.edit.relationships.reinstate-button": "Undo",
-  "item.edit.relationships.reinstate-button": "Geri al",
-  
-  // "item.edit.relationships.save-button": "Save",
-  "item.edit.relationships.save-button": "Kaydet",
-  
-  // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
-  "item.edit.relationships.no-entity-type": "Bu öğe için ilişkileri etkinleştirmek için 'dspace.entity.type' metadatalarını ekleyin",
-  
-  
-  
-  // "item.edit.tabs.bitstreams.head": "Bitstreams",
-  "item.edit.tabs.bitstreams.head": "Bitstreamlar",
-  
-  // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
-  "item.edit.tabs.bitstreams.title": "Öge düzenle - Bitstreamlar",
-  
-  // "item.edit.tabs.curate.head": "Curate",
-  "item.edit.tabs.curate.head": "Düzenleme",
-  
-  // "item.edit.tabs.curate.title": "Item Edit - Curate",
-  "item.edit.tabs.curate.title": "Öge düzenle  - Düzenleme",
-  
-  // "item.edit.tabs.metadata.head": "Metadata",
-  "item.edit.tabs.metadata.head": "Metadata",
-  
-  // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
-  "item.edit.tabs.metadata.title": "Öge düzenle -  Metadata",
-  
-  // "item.edit.tabs.relationships.head": "Relationships",
-  "item.edit.tabs.relationships.head": "İlişkiler",
-  
-  // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
-  "item.edit.tabs.relationships.title": "Öge düzenle - İlişkiler",
-  
-  // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
-  "item.edit.tabs.status.buttons.authorizations.button": "Yetkilendiriliyor...",
-  
-  // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
-  "item.edit.tabs.status.buttons.authorizations.label": "Öğenin yetkilendirme politikalarını düzenle",
-  
-  // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
-  "item.edit.tabs.status.buttons.delete.button": "Kalıcı olarak sil",
-  
-  // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
-  "item.edit.tabs.status.buttons.delete.label": "Ögeyi kalıcı olarak sil",
-  
-  // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
-  "item.edit.tabs.status.buttons.mappedCollections.button": "Eşleştirilmiş koleksiyonlar",
-  
-  // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
-  "item.edit.tabs.status.buttons.mappedCollections.label": "Eşlenen koleksiyonları yönetin",
-  
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Taşınıyor...",
-  
-  // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
-  "item.edit.tabs.status.buttons.move.label": "Öğeyi başka bir koleksiyona taşı",
-  
-  // "item.edit.tabs.status.buttons.private.button": "Make it private...",
-  "item.edit.tabs.status.buttons.private.button": "Gizleniyor...",
-  
-  // "item.edit.tabs.status.buttons.private.label": "Make item private",
-  "item.edit.tabs.status.buttons.private.label": "Ögeyi gizle",
-  
-  // "item.edit.tabs.status.buttons.public.button": "Make it public...",
-  "item.edit.tabs.status.buttons.public.button": "Öge herkese açık yapılıyor...",
-  
-  // "item.edit.tabs.status.buttons.public.label": "Make item public",
-  "item.edit.tabs.status.buttons.public.label": "Herkese açık yap",
-  
-  // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
-  "item.edit.tabs.status.buttons.reinstate.button": "Geri yükleniyor...",
-  
-  // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
-  "item.edit.tabs.status.buttons.reinstate.label": "Öğeyi depoya geri yükle",
-  
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Çıkar...",
-  
-  // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
-  "item.edit.tabs.status.buttons.withdraw.label": "Depodan öğeyi çıkar",
-  
-  // "item.edit.tabs.status.description": "Welcome to the item management page. From here you can withdraw, reinstate, move or delete the item. You may also update or add new metadata / bitstreams on the other tabs.",
-  "item.edit.tabs.status.description": "Öğe yönetimi sayfasına hoş geldiniz. Buradan öğeyi  çıkarabilir, geri yükleyebilir, taşıyabilir veya silebilirsiniz. Diğer sekmelerde de güncelleyebilir veya yeni metadata / bit akışları ekleyebilirsiniz.",
-  
-  // "item.edit.tabs.status.head": "Status",
-  "item.edit.tabs.status.head": "Durum",
-  
-  // "item.edit.tabs.status.labels.handle": "Handle",
-  "item.edit.tabs.status.labels.handle": "Handle",
-  
-  // "item.edit.tabs.status.labels.id": "Item Internal ID",
-  "item.edit.tabs.status.labels.id": "Öge Dahili Kimliğ",
-  
-  // "item.edit.tabs.status.labels.itemPage": "Item Page",
-  "item.edit.tabs.status.labels.itemPage": "Öge sayfası",
-  
-  // "item.edit.tabs.status.labels.lastModified": "Last Modified",
-  "item.edit.tabs.status.labels.lastModified": "Son düzenleme",
-  
-  // "item.edit.tabs.status.title": "Item Edit -  Status",
-  "item.edit.tabs.status.title": "Öge düzenle -  Durum",
-  
-  // "item.edit.tabs.versionhistory.head": "Version History",
-  "item.edit.tabs.versionhistory.head": "Sürüm Geçmişi",
-  
-  // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
-  "item.edit.tabs.versionhistory.title": "Öge düzenle - Sürüm Geçmişi",
-  
-  // "item.edit.tabs.versionhistory.under-construction": "Editing or adding new versions is not yet possible in this user interface.",
-  "item.edit.tabs.versionhistory.under-construction": "Bu kullanıcı arayüzünde henüz yeni sürümleri düzenlemek veya eklemek mümkün değil.",
-  
-  // "item.edit.tabs.view.head": "View Item",
-  "item.edit.tabs.view.head": "Ürünü incele",
-  
-  // "item.edit.tabs.view.title": "Item Edit -  View",
-  "item.edit.tabs.view.title": "Öge düzenle -  incele",
-  
-  
-  
-  // "item.edit.withdraw.cancel": "Cancel",
-  "item.edit.withdraw.cancel": "İptal et",
-  
-  // "item.edit.withdraw.confirm": "Withdraw",
-  "item.edit.withdraw.confirm": "Çıkar",
-  
-  // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
-  "item.edit.withdraw.description": "Bu öğenin arşivden çıkartılması gerektiğinden emin misiniz?",
-  
-  // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
-  "item.edit.withdraw.error": "Öğe çıkartılırken bir hata oluştu",
-  
-  // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
-  "item.edit.withdraw.header": "Çıkarılan öge: {{ id }}",
-  
-  // "item.edit.withdraw.success": "The item was withdrawn successfully",
-  "item.edit.withdraw.success": "Öğe başarıyla çıkartıldı",
-  
-  
-  
-  // "item.listelement.badge": "Item",
-  "item.listelement.badge": "Öge",
-  
-  // "item.page.description": "Description",
-  "item.page.description": "Açıklama",
-  
-  // "item.page.edit": "Edit this item",
-  "item.page.edit": "Bu ögeyi düzenle",
-  
-  // "item.page.journal-issn": "Journal ISSN",
-  "item.page.journal-issn": "Süreli Yayın ISSN",
-  
-  // "item.page.journal-title": "Journal Title",
-  "item.page.journal-title": "Süreli Yayın başlığı",
-  
-  // "item.page.publisher": "Publisher",
-  "item.page.publisher": "Yayınevi",
-  
-  // "item.page.titleprefix": "Item: ",
-  "item.page.titleprefix": "Öge: ",
-  
-  // "item.page.volume-title": "Volume Title",
-  "item.page.volume-title": "Cilt Başlığı",
-  
-  // "item.search.results.head": "Item Search Results",
-  "item.search.results.head": "Öge Arama Sonuçları",
-  
-  // "item.search.title": "DSpace Angular :: Item Search",
-  "item.search.title": "DSpace Angular :: Öge Arama",
-  
-  
-  // "item.page.abstract": "Abstract",
-  "item.page.abstract": "Özet",
-  
-  // "item.page.author": "Authors",
-  "item.page.author": "Yazarlar",
-  
-  // "item.page.citation": "Citation",
-  "item.page.citation": "Alıntı",
-  
-  // "item.page.collections": "Collections",
-  "item.page.collections": "Koleksiyonlar",
-  
-  // "item.page.date": "Date",
-  "item.page.date": "Tarih",
-  
-  // "item.page.edit": "Edit this item",
-  "item.page.edit": "Bu öğeyi düzenle",
-  
-  // "item.page.files": "Files",
-  "item.page.files": "Dosyalar",
-  
-  // "item.page.filesection.description": "Description:",
-  "item.page.filesection.description": "Açıklama",
-  
-  // "item.page.filesection.download": "Download",
-  "item.page.filesection.download": "İndir",
-  
-  // "item.page.filesection.format": "Format:",
-  "item.page.filesection.format": "Format:",
-  
-  // "item.page.filesection.name": "Name:",
-  "item.page.filesection.name": "Ad:",
-  
-  // "item.page.filesection.size": "Size:",
-  "item.page.filesection.size": "Boyut:",
-  
-  // "item.page.journal.search.title": "Articles in this journal",
-  "item.page.journal.search.title": "Bu süreli yayındaki makaleler",
-  
-  // "item.page.link.full": "Full item page",
-  "item.page.link.full": "Tam öğe sayfası",
-  
-  // "item.page.link.simple": "Simple item page",
-  "item.page.link.simple": "Sadeleştirilmiş öğe sayfası",
-  
-  // "item.page.person.search.title": "Articles by this author",
-  "item.page.person.search.title": "Bu yazarın makaleleri",
-  
-  // "item.page.related-items.view-more": "Show {{ amount }} more",
-  "item.page.related-items.view-more": "Daha fazla göster {{ amount }}",
-  
-  // "item.page.related-items.view-less": "Hide last {{ amount }}",
-  "item.page.related-items.view-less": "Sonuncuyu gizle {{ amount }}",
-  
-  // "item.page.relationships.isAuthorOfPublication": "Publications",
-  "item.page.relationships.isAuthorOfPublication": "Yayınlar",
-  
-  // "item.page.relationships.isJournalOfPublication": "Publications",
-  "item.page.relationships.isJournalOfPublication": "Yayınlar",
-  
-  // "item.page.relationships.isOrgUnitOfPerson": "Authors",
-  "item.page.relationships.isOrgUnitOfPerson": "Yazarlar",
-  
-  // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
-  "item.page.relationships.isOrgUnitOfProject": "Araştırma projeleri",
-  
-  // "item.page.subject": "Keywords",
-  "item.page.subject": "Anahtar kelimeler",
-  
-  // "item.page.uri": "URI",
-  "item.page.uri": "URI",
-  
-  // "item.page.bitstreams.view-more": "Show more",
-  "item.page.bitstreams.view-more": "Daha fazla göster",
-  
-  // "item.page.bitstreams.collapse": "Collapse",
-  "item.page.bitstreams.collapse": "Daralt",
-  
-  // "item.page.filesection.original.bundle" : "Original bundle",
-  "item.page.filesection.original.bundle" : "Orijinal seri",
-  
-  // "item.page.filesection.license.bundle" : "License bundle",
-  "item.page.filesection.license.bundle" : "Lisanslı seri",
-  
-  // "item.preview.dc.identifier.uri": "Identifier:",
-  "item.preview.dc.identifier.uri": "Belirteç:",
-  
-  // "item.preview.dc.contributor.author": "Authors:",
-  "item.preview.dc.contributor.author": "Yazarlar:",
-  
-  // "item.preview.dc.date.issued": "Published date:",
-  "item.preview.dc.date.issued": "Yayınlanma tarihi:",
-  
-  // "item.preview.dc.description.abstract": "Abstract:",
-  "item.preview.dc.description.abstract": "Özet:",
-  
-  // "item.preview.dc.identifier.other": "Other identifier:",
-  "item.preview.dc.identifier.other": "Diğer Belirteçler:",
-  
-  // "item.preview.dc.language.iso": "Language:",
-  "item.preview.dc.language.iso": "Dil:",
-  
-  // "item.preview.dc.subject": "Subjects:",
-  "item.preview.dc.subject": "Konular:",
-  
-  // "item.preview.dc.title": "Title:",
-  "item.preview.dc.title": "Başlık:",
-  
-  // "item.preview.person.familyName": "Surname:",
-  "item.preview.person.familyName": "Soyad:",
-  
-  // "item.preview.person.givenName": "Name:",
-  "item.preview.person.givenName": "Ad:",
-  
-  // "item.preview.person.identifier.orcid": "ORCID:",
-  "item.preview.person.identifier.orcid": "ORCID:",
-  
-  
-  // "item.select.confirm": "Confirm selected",
-  "item.select.confirm": "Seçileni onayla",
-  
-  // "item.select.empty": "No items to show",
-  "item.select.empty": "Gösterilecek öğe yok",
-  
-  // "item.select.table.author": "Author",
-  "item.select.table.author": "Yazar",
-  
-  // "item.select.table.collection": "Collection",
-  "item.select.table.collection": "Koleksiyon",
-  
-  // "item.select.table.title": "Title",
-  "item.select.table.title": "Başlık",
-  
-  
-  // "item.version.history.empty": "There are no other versions for this item yet.",
-  "item.version.history.empty": "Bu öğe için henüz başka sürüm yok.",
-  
-  // "item.version.history.head": "Version History",
-  "item.version.history.head": "Sürüm Geçmişi",
-  
-  // "item.version.history.return": "Return",
-  "item.version.history.return": "Geri dön",
-  
-  // "item.version.history.selected": "Selected version",
-  "item.version.history.selected": "Seçilen sürüm",
-  
-  // "item.version.history.table.version": "Version",
-  "item.version.history.table.version": "Sürüm",
-  
-  // "item.version.history.table.item": "Item",
-  "item.version.history.table.item": "Öge",
-  
-  // "item.version.history.table.editor": "Editor",
-  "item.version.history.table.editor": "Editör",
-  
-  // "item.version.history.table.date": "Date",
-  "item.version.history.table.date": "Tarih",
-  
-  // "item.version.history.table.summary": "Summary",
-  "item.version.history.table.summary": "Özet",
-  
-  
-  
-  // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
-  "item.version.notice": "Bu, bu öğenin en son sürümü değil. En son sürüm <a href='{{destination}}'>burada</a> bulunabilir.", 
-  
-  
-  
-  // "journal.listelement.badge": "Journal",
-  "journal.listelement.badge": "Süreli yayın",
-  
-  // "journal.page.description": "Description",
-  "journal.page.description": "Açıklama",
-  
-  // "journal.page.edit": "Edit this item",
-  "journal.page.edit": "Bu öğeyi düzenle",
-  
-  // "journal.page.editor": "Editor-in-Chief",
-  "journal.page.editor": "Genel Yayın Yönetmeni",
-  
-  // "journal.page.issn": "ISSN",
-  "journal.page.issn": "ISSN",
-  
-  // "journal.page.publisher": "Publisher",
-  "journal.page.publisher": "Yayınevi",
-  
-  // "journal.page.titleprefix": "Journal: ",
-  "journal.page.titleprefix": "Süreli yayın: ",
-  
-  // "journal.search.results.head": "Journal Search Results",
-  "journal.search.results.head": "Süreli Yayın Arama Sonuçları",
-  
-  // "journal.search.title": "DSpace Angular :: Journal Search",
-  "journal.search.title": "DSpace Angular :: Süreli Yayın Arama",
-  
-  
-  
-  // "journalissue.listelement.badge": "Journal Issue",
-  "journalissue.listelement.badge": "Süreli Yayın Sayısı",
-  
-  // "journalissue.page.description": "Description",
-  "journalissue.page.description": "Açıklama",
-  
-  // "journalissue.page.edit": "Edit this item",
-  "journalissue.page.edit": "Bu öğeyi düzenle",
-  
-  // "journalissue.page.issuedate": "Issue Date",
-  "journalissue.page.issuedate": "Yayın tarihi",
-  
-  // "journalissue.page.journal-issn": "Journal ISSN",
-  "journalissue.page.journal-issn": "Süreli yayın ISSN",
-  
-  // "journalissue.page.journal-title": "Journal Title",
-  "journalissue.page.journal-title": "Süreli yayın Başlığı",
-  
-  // "journalissue.page.keyword": "Keywords",
-  "journalissue.page.keyword": "Anahtar kelimeler",
-  
-  // "journalissue.page.number": "Number",
-  "journalissue.page.number": "Sayı",
-  
-  // "journalissue.page.titleprefix": "Journal Issue: ",
-  "journalissue.page.titleprefix": "Süreli yayın sayısı: ",
-  
-  
-  
-  // "journalvolume.listelement.badge": "Journal Volume",
-  "journalvolume.listelement.badge": "Süreli yayın cilti",
-  
-  // "journalvolume.page.description": "Description",
-  "journalvolume.page.description": "Açıklama",
-  
-  // "journalvolume.page.edit": "Edit this item",
-  "journalvolume.page.edit": "Bu öğeyi düzenle",
-  
-  // "journalvolume.page.issuedate": "Issue Date",
-  "journalvolume.page.issuedate": "Yayın tarihi",
-  
-  // "journalvolume.page.titleprefix": "Journal Volume: ",
-  "journalvolume.page.titleprefix": "Süreli yayın cilti: ",
-  
-  // "journalvolume.page.volume": "Volume",
-  "journalvolume.page.volume": "Cilt",
-  
-  
-  
-  // "loading.bitstream": "Loading bitstream...",
-  "loading.bitstream": "Bitstream yükleniyor...",
-  
-  // "loading.bitstreams": "Loading bitstreams...",
-  "loading.bitstreams": "Bitstream yükleniyor...",
-  
-  // "loading.browse-by": "Loading items...",
-  "loading.browse-by": "Bitstream yükleniyor...",
-  
-  // "loading.browse-by-page": "Loading page...",
-  "loading.browse-by-page": "Yükleme sayfası...",
-  
-  // "loading.collection": "Loading collection...",
-  "loading.collection": "Koleksiyon yükleniyor...",
-  
-  // "loading.collections": "Loading collections...",
-  "loading.collections": "Koleksiyon yükleniyor...",
-  
-  // "loading.content-source": "Loading content source...",
-  "loading.content-source": "İçerik kaynağı yükleniyor...",
-  
-  // "loading.community": "Loading community...",
-  "loading.community": "Komünite yükleniyor...",
-  
-  // "loading.default": "Loading...",
-  "loading.default": "Yükleniyor...",
-  
-  // "loading.item": "Loading item...",
-  "loading.item": "Ögeler yükleniyor...",
-  
-  // "loading.items": "Loading items...",
-  "loading.items": "Ögeler yükleniyor...",
-  
-  // "loading.mydspace-results": "Loading items...",
-  "loading.mydspace-results": "Ögeler yükleniyor...",
-  
-  // "loading.objects": "Loading...",
-  "loading.objects": "Yükleniyor...",
-  
-  // "loading.recent-submissions": "Loading recent submissions...",
-  "loading.recent-submissions": "Son gönderiler yükleniyor...",
-  
-  // "loading.search-results": "Loading search results...",
-  "loading.search-results": "Arama sonuçları yükleniyor...",
-  
-  // "loading.sub-collections": "Loading sub-collections...",
-  "loading.sub-collections": "Alt koleksiyonlar yükleniyor...",
-  
-  // "loading.sub-communities": "Loading sub-communities...",
-  "loading.sub-communities": "Alt komüniteler yükleniyor...",
-  
-  // "loading.top-level-communities": "Loading top-level communities...",
-  "loading.top-level-communities": "Üst düzey komüniteler yükleniyor...",
-  
-  
-  
-  // "login.form.email": "Email address",
-  "login.form.email": "E-posta adresi",
-  
-  // "login.form.forgot-password": "Have you forgotten your password?",
-  "login.form.forgot-password": "Parolanızı unuttunuz mu?",
-  
-  // "login.form.header": "Please log in to DSpace",
-  "login.form.header": "Lütfen DSpace'e giriş yapın",
-  
-  // "login.form.new-user": "New user? Click here to register.",
-  "login.form.new-user": "Yeni kullanıcı mısınız? Kayıt olmak için buraya tıklayın.",
-  
-  // "login.form.or-divider": "or",
-  "login.form.or-divider": "ya da",
-  
-  // "login.form.password": "Password",
-  "login.form.password": "Parola",
-  
-  // "login.form.shibboleth": "Log in with Shibboleth",
-  "login.form.shibboleth": "Shibboleth ile giriş yapın",
-  
-  // "login.form.submit": "Log in",
-  "login.form.submit": "Giriş yap",
-  
-  // "login.title": "Login",
-  "login.title": "Giriş",
-  
-  // "login.breadcrumbs": "Login",
-  "login.breadcrumbs": "Giriş",
-  
-  
-  
-  // "logout.form.header": "Log out from DSpace",
-  "logout.form.header": "DSpace'den çıkış yapın",
-  
-  // "logout.form.submit": "Log out",
-  "logout.form.submit": "Çıkış yap",
-  
-  // "logout.title": "Logout",
-  "logout.title": "Çıkış yap",
-  
-  
-  
-  // "menu.header.admin": "Admin",
-  "menu.header.admin": "Yönetici",
-  
-  // "menu.header.image.logo": "Repository logo",
-  "menu.header.image.logo": "Depo logosu",
-  
-  
-  
-  // "menu.section.access_control": "Access Control",
-  "menu.section.access_control": "Giriş kontrolü",
-  
-  // "menu.section.access_control_authorizations": "Authorizations",
-  "menu.section.access_control_authorizations": "Yetkilendirmeler",
-  
-  // "menu.section.access_control_groups": "Groups",
-  "menu.section.access_control_groups": "Gruplar",
-  
-  // "menu.section.access_control_people": "People",
-  "menu.section.access_control_people": "Kişiler",
-  
-  
-  
-  // "menu.section.admin_search": "Admin Search",
-  "menu.section.admin_search": "Yönetici araması",
-  
-  
-  
-  // "menu.section.browse_community": "This Community",
-  "menu.section.browse_community": "Bu Komünite",
-  
-  // "menu.section.browse_community_by_author": "By Author",
-  "menu.section.browse_community_by_author": "Yazara göre",
-  
-  // "menu.section.browse_community_by_issue_date": "By Issue Date",
-  "menu.section.browse_community_by_issue_date": "Yayın tarihine göre",
-  
-  // "menu.section.browse_community_by_title": "By Title",
-  "menu.section.browse_community_by_title": "Başlığa göre",
-  
-  // "menu.section.browse_global": "All of DSpace",
-  "menu.section.browse_global": "Tümü",
-  
-  // "menu.section.browse_global_by_author": "By Author",
-  "menu.section.browse_global_by_author": "Yazara göre",
-  
-  // "menu.section.browse_global_by_dateissued": "By Issue Date",
-  "menu.section.browse_global_by_dateissued": "Yayın tarihine göre",
-  
-  // "menu.section.browse_global_by_subject": "By Subject",
-  "menu.section.browse_global_by_subject": "Konuya göre",
-  
-  // "menu.section.browse_global_by_title": "By Title",
-  "menu.section.browse_global_by_title": "Başlığa göre",
-  
-  // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-  "menu.section.browse_global_communities_and_collections": "Komüniteler ve Koleksiyonlar",
-  
-  
-  
-  // "menu.section.control_panel": "Control Panel",
-  "menu.section.control_panel": "Kontrol Paneli",
-  
-  // "menu.section.curation_task": "Curation Task",
-  "menu.section.curation_task": "Düzenleme görevi",
-  
-  
-  
-  // "menu.section.edit": "Edit",
-  "menu.section.edit": "Düzenle",
-  
-  // "menu.section.edit_collection": "Collection",
-  "menu.section.edit_collection": "Koleksiyon",
-  
-  // "menu.section.edit_community": "Community",
-  "menu.section.edit_community": "Komünite",
-  
-  // "menu.section.edit_item": "Item",
-  "menu.section.edit_item": "Öge",
-  
-  
-  
-  // "menu.section.export": "Export",
-  "menu.section.export": "Dışa aktar",
-  
-  // "menu.section.export_collection": "Collection",
-  "menu.section.export_collection": "Koleksiyon",
-  
-  // "menu.section.export_community": "Community",
-  "menu.section.export_community": "Komünite",
-  
-  // "menu.section.export_item": "Item",
-  "menu.section.export_item": "Öge",
-  
-  // "menu.section.export_metadata": "Metadata",
-  "menu.section.export_metadata": "Metadata",
-  
-  
-  
-  // "menu.section.icon.access_control": "Access Control menu section",
-  "menu.section.icon.access_control": "Erişim Kontrolü menüsü bölümü",
-  
-  // "menu.section.icon.admin_search": "Admin search menu section",
-  "menu.section.icon.admin_search": "Yönetici arama menüsü bölümü",
-  
-  // "menu.section.icon.control_panel": "Control Panel menu section",
-  "menu.section.icon.control_panel": "Kontrol Paneli menü bölümü",
-  
-  // "menu.section.icon.curation_task": "Curation Task menu section",
-  "menu.section.icon.curation_task": "Düzenleme Görevi menüsü bölümü",
-  
-  // "menu.section.icon.edit": "Edit menu section",
-  "menu.section.icon.edit": "Menü bölümünü düzenle",
-  
-  // "menu.section.icon.export": "Export menu section",
-  "menu.section.icon.export": "Menü bölümünü dışa aktar",
-  
-  // "menu.section.icon.find": "Find menu section",
-  "menu.section.icon.find": "Menü bölümünü bulun",
-  
-  // "menu.section.icon.import": "Import menu section",
-  "menu.section.icon.import": "Menü bölümünü içe aktar",
-  
-  // "menu.section.icon.new": "New menu section",
-  "menu.section.icon.new": "Yeni menü bölümü",
-  
-  // "menu.section.icon.pin": "Pin sidebar",
-  "menu.section.icon.pin": "Yan çubuğu sabitle",
-  
-  // "menu.section.icon.processes": "Processes menu section",
-  "menu.section.icon.processes": "İşlemler menüsü bölümü",
-  
-  // "menu.section.icon.registries": "Registries menu section",
-  "menu.section.icon.registries": "Kayıtlar menüsü bölümü",
-  
-  // "menu.section.icon.statistics_task": "Statistics Task menu section",
-  "menu.section.icon.statistics_task": "İstatistik Görev menüsü bölümü",
-  
-  // "menu.section.icon.unpin": "Unpin sidebar",
-  "menu.section.icon.unpin": "Kenar çubuğunu kaldır",
-  
-  
-  
-  // "menu.section.import": "Import",
-  "menu.section.import": "İçe aktar",
-  
-  // "menu.section.import_batch": "Batch Import (ZIP)",
-  "menu.section.import_batch": "Toplu İçe Aktarma (ZIP)",
-  
-  // "menu.section.import_metadata": "Metadata",
-  "menu.section.import_metadata": "Metadata",
-
-
-
-  // "menu.section.new": "New",
-  "menu.section.new": "Yeni",
-  
-  // "menu.section.new_collection": "Collection",
-  "menu.section.new_collection": "Koleksiyon",
-  
-  // "menu.section.new_community": "Community",
-  "menu.section.new_community": "Komünite",
-  
-  // "menu.section.new_item": "Item",
-  "menu.section.new_item": "Öğe",
-  
-  // "menu.section.new_item_version": "Item Version",
-  "menu.section.new_item_version": "Öğe Sürümü",
-  
-  // "menu.section.new_process": "Process",
-  "menu.section.new_process": "Süreç",
-  
-  
-  
-  // "menu.section.pin": "Pin sidebar",
-  "menu.section.pin": "Kenar çubuğunu sabitle",
-  
-  // "menu.section.unpin": "Unpin sidebar",
-  "menu.section.unpin": "Kenar çubuğunun sabitlemesini kaldır",
-  
-  
-  
-  // "menu.section.processes": "Processes",
-  "menu.section.processes": "Süreçler",
-  
-  
-  
-  // "menu.section.registries": "Registries",
-  "menu.section.registries": "Kayıt",
-  
-  // "menu.section.registries_format": "Format",
-  "menu.section.registries_format": "Format",
-  
-  // "menu.section.registries_metadata": "Metadata",
-  "menu.section.registries_metadata": "Metadata",
-  
-  
-  
-  // "menu.section.statistics": "Statistics",
-  "menu.section.statistics": "İstatistik",
-  
-  // "menu.section.statistics_task": "Statistics Task",
-  "menu.section.statistics_task": "İstatistiksel Görev",
-  
-  
-  
-  // "menu.section.toggle.access_control": "Toggle Access Control section",
-  "menu.section.toggle.access_control": "Erişim kontrolü bölümünü aç/kapat",
-  
-  // "menu.section.toggle.control_panel": "Toggle Control Panel section",
-  "menu.section.toggle.control_panel": "Kontrol Paneli bölümünü aç/kapat",
-  
-  // "menu.section.toggle.curation_task": "Toggle Curation Task section",
-  "menu.section.toggle.curation_task": "İyileştirme Görevi bölümünü aç/kapat",
-  
-  // "menu.section.toggle.edit": "Toggle Edit section",
-  "menu.section.toggle.edit": "Düzenleme bölümünü aç/kapat",
-  
-  // "menu.section.toggle.export": "Toggle Export section",
-  "menu.section.toggle.export": "Dışa Aktarma bölümünü aç/kapat",
-  
-  // "menu.section.toggle.find": "Toggle Find section",
-  "menu.section.toggle.find": "Arama bölümünü aç/kapat",
-  
-  // "menu.section.toggle.import": "Toggle Import section",
-  "menu.section.toggle.import": "İçe Aktarma bölümünü aç/kapat",
-  
-  // "menu.section.toggle.new": "Toggle New section",
-  "menu.section.toggle.new": "Yeni bölümü aç/kapat",
-  
-  // "menu.section.toggle.registries": "Toggle Registries section",
-  "menu.section.toggle.registries": "Kayıtlar bölümünü aç/kapat",
-  
-  // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
-  "menu.section.toggle.statistics_task": "İstatistik Görev bölümünü aç/kapat",
-  
-  
-  // "menu.section.workflow": "Administer Workflow",
-  "menu.section.workflow": "İş Akışını Yönet",
-  
-  
-  // "mydspace.description": "",
-  "mydspace.description": "",
-  
-  // "mydspace.general.text-here": "here",
-  "mydspace.general.text-here": "Burada",
-  
-  // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
-  "mydspace.messages.controller-help": "Öğeyi gönderene bir mesaj göndermek için bu seçeneği seçin.",
-  
-  // "mydspace.messages.description-placeholder": "Insert your message here...",
-  "mydspace.messages.description-placeholder": "Mesajınızı buraya ekleyin...",
-  
-  // "mydspace.messages.hide-msg": "Hide message",
-  "mydspace.messages.hide-msg": "Mesajı gizle",
-  
-  // "mydspace.messages.mark-as-read": "Mark as read",
-  "mydspace.messages.mark-as-read": "Okundu olarak işaretle",
-  
-  // "mydspace.messages.mark-as-unread": "Mark as unread",
-  "mydspace.messages.mark-as-unread": "Okunmamış olarak işaretle",
-  
-  // "mydspace.messages.no-content": "No content.",
-  "mydspace.messages.no-content": "İçerik yok.",
-  
-  // "mydspace.messages.no-messages": "No messages yet.",
-  "mydspace.messages.no-messages": "Henüz mesaj yok.",
-  
-  // "mydspace.messages.send-btn": "Send",
-  "mydspace.messages.send-btn": "Gönder",
-  
-  // "mydspace.messages.show-msg": "Show message",
-  "mydspace.messages.show-msg": "Mesajı göster",
-  
-  // "mydspace.messages.subject-placeholder": "Subject...",
-  "mydspace.messages.subject-placeholder": "Konu...",
-  
-  // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
-  "mydspace.messages.submitter-help": "Kontrolöre mesaj göndermek için bu seçeneği seçin.",
-  
-  // "mydspace.messages.title": "Messages",
-  "mydspace.messages.title": "Mesajlar",
-  
-  // "mydspace.messages.to": "To",
-  "mydspace.messages.to": "-e",
-  
-  // "mydspace.new-submission": "New submission",
-  "mydspace.new-submission": "Yeni talep",
-  
-  // "mydspace.new-submission-external": "Import metadata from external source",
-  "mydspace.new-submission-external": "Harici kaynaktan metadataları içe aktar",
-  
-  // "mydspace.new-submission-external-short": "Import metadata",
-  "mydspace.new-submission-external-short": "Metadataları içeri aktar.",
-  
-  // "mydspace.results.head": "Your submissions",
-  "mydspace.results.head": "Gönderimleriniz",
-  
-  // "mydspace.results.no-abstract": "No Abstract",
-  "mydspace.results.no-abstract": "Özet yok",
-  
-  // "mydspace.results.no-authors": "No Authors",
-  "mydspace.results.no-authors": "Yazar yok.",
-  
-  // "mydspace.results.no-collections": "No Collections",
-  "mydspace.results.no-collections": "Koleksiyon yok",
-  
-  // "mydspace.results.no-date": "No Date",
-  "mydspace.results.no-date": "Tarih yok",
-  
-  // "mydspace.results.no-files": "No Files",
-  "mydspace.results.no-files": "Dosya yok",
-  
-  // "mydspace.results.no-results": "There were no items to show",
-  "mydspace.results.no-results": "Gösterilecek öğe yok.",
-  
-  // "mydspace.results.no-title": "No title",
-  "mydspace.results.no-title": "Başlık yok",
-  
-  // "mydspace.results.no-uri": "No Uri",
-  "mydspace.results.no-uri": "Uri yok",
-  
-  // "mydspace.show.workflow": "All tasks",
-  "mydspace.show.workflow": "Tüm görevler",
-  
-  // "mydspace.show.workspace": "Your Submissions",
-  "mydspace.show.workspace": "Gönderimleriniz",
-  
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Arşivlendi",
-  
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Doğrulama",
-  
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Kontrolör bekleniyor",
-  
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "İş akışı",
-  
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Çalışma alanı",
-  
-  // "mydspace.title": "MyDSpace",
-  "mydspace.title": "MyDSpace",
-  
-  // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
-  "mydspace.upload.upload-failed": "Yeni çalışma alanı oluşturulurken hata oluştu. Lütfen yeniden denemeden önce yüklenen içeriği doğrulayın.",
-  
-  // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
-  "mydspace.upload.upload-failed-manyentries": "İşlenemeyen dosya. Çok fazla giriş algılandı fakat dosya için yalnızca bir girişe izin verildi.",
-  
-  // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
-  "mydspace.upload.upload-failed-moreonefile": "İşlenemeyen istek. Yalnızca bir dosyaya izin verilir.",
-  
-  // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
-  "mydspace.upload.upload-multiple-successful": "{{qty}} yeni çalışma alanı öğeleri oluşturuldu.",
-  
-  // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
-  "mydspace.upload.upload-successful": "Yeni çalışma alanı öğesi oluşturuldu. Düzenlemek için {{here}} tıklayın.",
-  
-  // "mydspace.view-btn": "View",
-  "mydspace.view-btn": "Görünüm",
-  
-  
-  
-  // "nav.browse.header": "All of DSpace",
-  "nav.browse.header": "DSpace'in tümü",
-  
-  // "nav.community-browse.header": "By Community",
-  "nav.community-browse.header": "Komünite tarafından",
-  
-  // "nav.language": "Language switch",
-  "nav.language": "Dil değiştirme",
-  
-  // "nav.login": "Log In",
-  "nav.login": "Giriş yap",
-  
-  // "nav.logout": "Log Out",
-  "nav.logout": "Çıkış yap",
-  
-  // "nav.mydspace": "MyDSpace",
-  "nav.mydspace": "BenimDSpace'im",
-  
-  // "nav.profile": "Profile",
-  "nav.profile": "Profil",
-  
-  // "nav.search": "Search",
-  "nav.search": "Arama",
-  
-  // "nav.statistics.header": "Statistics",
-  "nav.statistics.header": "İstatistik",
-  
-  // "nav.stop-impersonating": "Stop impersonating EPerson",
-  "nav.stop-impersonating": "EPerson'ı taklit etmeyi bırakın",
-  
-  
-  
-  // "orgunit.listelement.badge": "Organizational Unit",
-  "orgunit.listelement.badge": "Organizasyon Birimi",
-  
-  // "orgunit.page.city": "City",
-  "orgunit.page.city": "Şehir",
-  
-  // "orgunit.page.country": "Country",
-  "orgunit.page.country": "Ülke",
-  
-  // "orgunit.page.dateestablished": "Date established",
-  "orgunit.page.dateestablished": "Kuruluş tarihi",
-  
-  // "orgunit.page.description": "Description",
-  "orgunit.page.description": "Açıklama",
-  
-  // "orgunit.page.edit": "Edit this item",
-  "orgunit.page.edit": "Bu öğeyi düzenle",
-  
-  // "orgunit.page.id": "ID",
-  "orgunit.page.id": "Kimlik",
-  
-  // "orgunit.page.titleprefix": "Organizational Unit: ",
-  "orgunit.page.titleprefix": "Organizasyon Birimi: ",
-  
-  
-  
-  // "pagination.results-per-page": "Results Per Page",
-  "pagination.results-per-page": "Sayfa başına sonuç",
-  
-  // "pagination.showing.detail": "{{ range }} of {{ total }}",
-  "pagination.showing.detail": "{{ range }} / {{ total }}",
-  
-  // "pagination.showing.label": "Now showing ",
-  "pagination.showing.label": "Şimdi gösteriliyor ",
-  
-  // "pagination.sort-direction": "Sort Options",
-  "pagination.sort-direction": "Sıralama Seçenekleri",
-  
-  
-  
-  // "person.listelement.badge": "Person",
-  "person.listelement.badge": "Kişi",
-  
-  // "person.listelement.no-title": "No name found",
-  "person.listelement.no-title": "İsim bulunamadı",
-  
-  // "person.page.birthdate": "Birth Date",
-  "person.page.birthdate": "Doğum Tarihi",
-  
-  // "person.page.edit": "Edit this item",
-  "person.page.edit": "Bu öğeyi düzenle",
-  
-  // "person.page.email": "Email Address",
-  "person.page.email": "E-posta Adresi",
-  
-  // "person.page.firstname": "First Name",
-  "person.page.firstname": "Ad",
-  
-  // "person.page.jobtitle": "Job Title",
-  "person.page.jobtitle": "İş Adı",
-  
-  // "person.page.lastname": "Last Name",
-  "person.page.lastname": "Soyad",
-  
-  // "person.page.link.full": "Show all metadata",
-  "person.page.link.full": "Tüm metadata'yı göster",
-  
-  // "person.page.orcid": "ORCID",
-  "person.page.orcid": "ORCID",
-  
-  // "person.page.staffid": "Staff ID",
-  "person.page.staffid": "Personel Kimliği",
-  
-  // "person.page.titleprefix": "Person: ",
-  "person.page.titleprefix": "Kişi: ",
-  
-  // "person.search.results.head": "Person Search Results",
-  "person.search.results.head": "Kişi Arama Sonuçları",
-  
-  // "person.search.title": "DSpace Angular :: Person Search",
-  "person.search.title": "DSpace Angular :: Kişi Arama",
-  
-  
-  
-  // "process.new.select-parameters": "Parameters",
-  "process.new.select-parameters": "Parametreler",
-  
-  // "process.new.cancel": "Cancel",
-  "process.new.cancel": "İptal etmek",
-  
-  // "process.new.submit": "Submit",
-  "process.new.submit": "Göndermek",
-  
-  // "process.new.select-script": "Script",
-  "process.new.select-script": "Betik",
-  
-  // "process.new.select-script.placeholder": "Choose a script...",
-  "process.new.select-script.placeholder": "Betik Seçiniz...",
-  
-  // "process.new.select-script.required": "Script is required",
-  "process.new.select-script.required": "Betik gerekli",
-  
-  // "process.new.parameter.file.upload-button": "Select file...",
-  "process.new.parameter.file.upload-button": "Dosya seç...",
-  
-  // "process.new.parameter.file.required": "Please select a file",
-  "process.new.parameter.file.required": "Lütfen dosya seçiniz.",
-  
-  // "process.new.parameter.string.required": "Parameter value is required",
-  "process.new.parameter.string.required": "Parametre değeri gerekli",
-  
-  // "process.new.parameter.type.value": "value",
-  "process.new.parameter.type.value": "Değer",
-  
-  // "process.new.parameter.type.file": "file",
-  "process.new.parameter.type.file": "dosya",
-  
-  // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
-  "process.new.parameter.required.missing": "Aşağıdaki parametreler gerekli ancak yine de eksik:",
-  
-  // "process.new.notification.success.title": "Success",
-  "process.new.notification.success.title": "Başarı",
-  
-  // "process.new.notification.success.content": "The process was successfully created",
-  "process.new.notification.success.content": "Süreç başarıyla oluşturuldu",
-  
-  // "process.new.notification.error.title": "Error",
-  "process.new.notification.error.title": "Hata",
-  
-  // "process.new.notification.error.content": "An error occurred while creating this process",
-  "process.new.notification.error.content": "Bu süreç oluşturulurken bir hata oluştu",
-  
-  // "process.new.header": "Create a new process",
-  "process.new.header": "Yeni bir süreç oluştur",
-  
-  // "process.new.title": "Create a new process",
-  "process.new.title": "Yeni bir süreç oluştur",
-  
-  // "process.new.breadcrumbs": "Create a new process",
-  "process.new.breadcrumbs": "Yeni bir süreç oluştur",
-  
-  
-  
-  // "process.detail.arguments" : "Arguments",
-  "process.detail.arguments" : "Argümanlar",
-  
-  // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
-  "process.detail.arguments.empty" : "Bu süreç herhangi bir argüman içermiyor",
-  
-  // "process.detail.back" : "Back",
-  "process.detail.back" : "Geri",
-  
-  // "process.detail.output" : "Process Output",
-  "process.detail.output" : "Süreç Çıktısı",
-  
-  // "process.detail.logs.button": "Retrieve process output",
-  "process.detail.logs.button": "Süreç çıktısını geri al",
-  
-  // "process.detail.logs.loading": "Retrieving",
-  "process.detail.logs.loading": "Geri almak",
-  
-  // "process.detail.logs.none": "This process has no output",
-  "process.detail.logs.none": "Bu sürecin çıktısı yok",
-  
-  // "process.detail.output-files" : "Output Files",
-  "process.detail.output-files" : "Çıktı dosyaları",
-  
-  // "process.detail.output-files.empty" : "This process doesn't contain any output files",
-  "process.detail.output-files.empty" : "Bu süreç herhangi bir çıktı dosyası içermiyor",
-  
-  // "process.detail.script" : "Script",
-  "process.detail.script" : "Betik",
-  
-  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
-  "process.detail.title" : "Süreç: {{ id }} - {{ name }}",
-  
-  // "process.detail.start-time" : "Start time",
-  "process.detail.start-time" : "Başlangıç saati",
-  
-  // "process.detail.end-time" : "Finish time",
-  "process.detail.end-time" : "Bitiş zamanı",
-  
-  // "process.detail.status" : "Status",
-  "process.detail.status" : "Durum",
-  
-  // "process.detail.create" : "Create similar process",
-  "process.detail.create" : "Benzer süreç oluştur",
-  
-  
-  
-  // "process.overview.table.finish" : "Finish time",
-  "process.overview.table.finish" : "Bitiş zamanı",
-  
-  // "process.overview.table.id" : "Process ID",
-  "process.overview.table.id" : "Süreç kimliği",
-  
-  // "process.overview.table.name" : "Name",
-  "process.overview.table.name" : "Ad",
-  
-  // "process.overview.table.start" : "Start time",
-  "process.overview.table.start" : "Başlangıç zamanı",
-  
-  // "process.overview.table.status" : "Status",
-  "process.overview.table.status" : "Durum",
-  
-  // "process.overview.table.user" : "User",
-  "process.overview.table.user" : "Kullanıcı",
-  
-  // "process.overview.title": "Processes Overview",
-  "process.overview.title": "Süreçlere Genel Bakış",
-  
-  // "process.overview.breadcrumbs": "Processes Overview",
-  "process.overview.breadcrumbs": "Süreçlere Genel Bakış",
-  
-  // "process.overview.new": "New",
-  "process.overview.new": "Yeni",
-  
-  
-  // "profile.breadcrumbs": "Update Profile",
-  "profile.breadcrumbs": "Profili Güncelle",
-  
-  // "profile.card.identify": "Identify",
-  "profile.card.identify": "Kimlik",
-  
-  // "profile.card.security": "Security",
-  "profile.card.security": "Güvenlik",
-  
-  // "profile.form.submit": "Update Profile",
-  "profile.form.submit": "Profili Güncelle",
-  
-  // "profile.groups.head": "Authorization groups you belong to",
-  "profile.groups.head": "Ait olduğunuz yetkilendirme grupları",
-  
-  // "profile.head": "Update Profile",
-  "profile.head": "Profili Güncelle",
-  
-  // "profile.metadata.form.error.firstname.required": "First Name is required",
-  "profile.metadata.form.error.firstname.required": "Ad gereklidir",
-  
-  // "profile.metadata.form.error.lastname.required": "Last Name is required",
-  "profile.metadata.form.error.lastname.required": "Soyadı gerekli",
-  
-  // "profile.metadata.form.label.email": "Email Address",
-  "profile.metadata.form.label.email": "E-posta Adresi",
-  
-  // "profile.metadata.form.label.firstname": "First Name",
-  "profile.metadata.form.label.firstname": "Ad",
-  
-  // "profile.metadata.form.label.language": "Language",
-  "profile.metadata.form.label.language": "Dil",
-  
-  // "profile.metadata.form.label.lastname": "Last Name",
-  "profile.metadata.form.label.lastname": "Soyadı",
-  
-  // "profile.metadata.form.label.phone": "Contact Telephone",
-  "profile.metadata.form.label.phone": "İletişim telefonu",
-  
-  // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
-  "profile.metadata.form.notifications.success.content": "Profilde yaptığınız değişiklikler kaydedildi.",
-  
-  // "profile.metadata.form.notifications.success.title": "Profile saved",
-  "profile.metadata.form.notifications.success.title": "Profil kaydedildi",
-  
-  // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
-  "profile.notifications.warning.no-changes.content": "Profilde herhangi bir değişiklik yapılmadı.",
-  
-  // "profile.notifications.warning.no-changes.title": "No changes",
-  "profile.notifications.warning.no-changes.title": "Değişiklik yok",
-  
-  // "profile.security.form.error.matching-passwords": "The passwords do not match.",
-  "profile.security.form.error.matching-passwords": "Parolalar eşleşmiyor.",
-  
-  // "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-  "profile.security.form.error.password-length": "Parola en az 6 karakter uzunluğunda olmalıdır.",
-  
-  // "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": "İsteğe bağlı olarak aşağıdaki kutucuğa yeni bir parola girebilir ve ikinci kutucuğa tekrar yazarak onaylayabilirsiniz. En az altı karakter uzunluğunda olmalıdır.",
-  
-  // "profile.security.form.label.password": "Password",
-  "profile.security.form.label.password": "Parola",
-  
-  // "profile.security.form.label.passwordrepeat": "Retype to confirm",
-  "profile.security.form.label.passwordrepeat": "Doğrulamak için yeniden yazınız",
-  
-  // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
-  "profile.security.form.notifications.success.content": "Parola değişiklikleriniz kaydedildi.",
-  
-  // "profile.security.form.notifications.success.title": "Password saved",
-  "profile.security.form.notifications.success.title": "Parola kaydedildi",
-  
-  // "profile.security.form.notifications.error.title": "Error changing passwords",
-  "profile.security.form.notifications.error.title": "Parolalar değiştirilirken hata oluştu",
-  
-  // "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": "Parola en az 6 karakter uzunluğunda olmalıdır.",
-  
-  // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
-  "profile.security.form.notifications.error.not-same": "Sağlanan parolalar aynı değil.",
-  
-  // "profile.title": "Update Profile",
-  "profile.title": "Profili Güncelle",
-  
-  
-  
-  // "project.listelement.badge": "Research Project",
-  "project.listelement.badge": "Araştırma projesi",
-  
-  // "project.page.contributor": "Contributors",
-  "project.page.contributor": "Katkıda Bulunanlar",
-  
-  // "project.page.description": "Description",
-  "project.page.description": "Açıklama",
-  
-  // "project.page.edit": "Edit this item",
-  "project.page.edit": "Bu öğeyi düzenle",
-  
-  // "project.page.expectedcompletion": "Expected Completion",
-  "project.page.expectedcompletion": "Beklenen Tamamlanma",
-  
-  // "project.page.funder": "Funders",
-  "project.page.funder": "Fon Sağlayıcılar",
-  
-  // "project.page.id": "ID",
-  "project.page.id": "Kimlik",
-  
-  // "project.page.keyword": "Keywords",
-  "project.page.keyword": "Anahtar kelimeler",
-  
-  // "project.page.status": "Status",
-  "project.page.status": "Durum",
-  
-  // "project.page.titleprefix": "Research Project: ",
-  "project.page.titleprefix": "Araştırma Projesi: ",
-  
-  // "project.search.results.head": "Project Search Results",
-  "project.search.results.head": "Proje Arama Sonuçları",
-  
-  
-  
-  // "publication.listelement.badge": "Publication",
-  "publication.listelement.badge": "Yayın",
-  
-  // "publication.page.description": "Description",
-  "publication.page.description": "Açıklama",
-  
-  // "publication.page.edit": "Edit this item",
-  "publication.page.edit": "Bu öğeyi düzenle",
-  
-  // "publication.page.journal-issn": "Journal ISSN",
-  "publication.page.journal-issn": "Dergi ISSN",
-  
-  // "publication.page.journal-title": "Journal Title",
-  "publication.page.journal-title": "Dergi Başlığı",
-  
-  // "publication.page.publisher": "Publisher",
-  "publication.page.publisher": "Yayımcı",
-  
-  // "publication.page.titleprefix": "Publication: ",
-  "publication.page.titleprefix": "Yayın: ",
-  
-  // "publication.page.volume-title": "Volume Title",
-  "publication.page.volume-title": "Cilt Başlığı",
-  
-  // "publication.search.results.head": "Publication Search Results",
-  "publication.search.results.head": "Yayın Arama Sonuçları",
-  
-  // "publication.search.title": "DSpace Angular :: Publication Search",
-  "publication.search.title": "DSpace Angular :: Yayın Arama",
-  
-  
-  // "register-email.title": "New user registration",
-  "register-email.title": "Yeni kullanıcı kaydı",
-  
-  // "register-page.create-profile.header": "Create Profile",
-  "register-page.create-profile.header": "Profil oluştur",
-  
-  // "register-page.create-profile.identification.header": "Identify",
-  "register-page.create-profile.identification.header": "Tanımlamak",
-  
-  // "register-page.create-profile.identification.email": "Email Address",
-  "register-page.create-profile.identification.email": "E-posta Adresi",
-  
-  // "register-page.create-profile.identification.first-name": "First Name *",
-  "register-page.create-profile.identification.first-name": "Ad *",
-  
-  // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
-  "register-page.create-profile.identification.first-name.error": "Lütfen bir ad girin",
-  
-  // "register-page.create-profile.identification.last-name": "Last Name *",
-  "register-page.create-profile.identification.last-name": "Soyadı *",
-  
-  // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
-  "register-page.create-profile.identification.last-name.error": "Lütfen bir soyadı girin",
-  
-  // "register-page.create-profile.identification.contact": "Contact Telephone",
-  "register-page.create-profile.identification.contact": "İletişim telefonu",
-  
-  // "register-page.create-profile.identification.language": "Language",
-  "register-page.create-profile.identification.language": "Dil",
-  
-  // "register-page.create-profile.security.header": "Security",
-  "register-page.create-profile.security.header": "Güvenlik",
-  
-  // "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": "Lütfen aşağıdaki kutuya bir parola girin ve ikinci kutuya tekrar yazarak onaylayın. En az altı karakter uzunluğunda olmalıdır.",
-  
-  // "register-page.create-profile.security.label.password": "Password *",
-  "register-page.create-profile.security.label.password": "Parola *",
-  
-  // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
-  "register-page.create-profile.security.label.passwordrepeat": "Doğrulamak için yeniden yazınız *",
-  
-  // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
-  "register-page.create-profile.security.error.empty-password": "Lütfen aşağıdaki kutuya bir parola girin.",
-  
-  // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
-  "register-page.create-profile.security.error.matching-passwords": "Parolalar eşleşmiyor.",
-  
-  // "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": "Parola en az 6 karakter uzunluğunda olmalıdır.",
-  
-  // "register-page.create-profile.submit": "Complete Registration",
-  "register-page.create-profile.submit": "Kaydı Tamamla",
-  
-  // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
-  "register-page.create-profile.submit.error.content": "Yeni bir kullanıcı kaydedilirken bir şeyler ters gitti.",
-  
-  // "register-page.create-profile.submit.error.head": "Registration failed",
-  "register-page.create-profile.submit.error.head": "Kayıt başarısız",
-  
-  // "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.",
-  "register-page.create-profile.submit.success.content": "Kayıt başarıyla tamamlandı. Oluşturulan kullanıcı olarak giriş yaptınız",
-  
-  // "register-page.create-profile.submit.success.head": "Registration completed",
-  "register-page.create-profile.submit.success.head": "Kayıt tamamlandı",
-  
-  
-  // "register-page.registration.header": "New user registration",
-  "register-page.registration.header": "Yeni kullanıcı kaydı",
-  
-  // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  "register-page.registration.info": "E-mail güncellemeleri için koleksiyonlara abone olup hesap açın. Ve DSapce’e yeni öğeler kaydetin.",
-  
-  // "register-page.registration.email": "Email Address *",
-  "register-page.registration.email": "E-posta Adresi *",
-  
-  // "register-page.registration.email.error.required": "Please fill in an email address",
-  "register-page.registration.email.error.required": "Lütfen bir e-posta adresi girin",
-  
-  // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
-  "register-page.registration.email.error.pattern": "Lütfen geçerli bir email adresi girin",
-  
-  // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
-  "register-page.registration.email.hint": "Bu adres doğrulanacak ve oturum açma adınız olarak kullanılacaktır.",
-  
-  // "register-page.registration.submit": "Register",
-  "register-page.registration.submit": "Kayıt olmak",
-  
-  // "register-page.registration.success.head": "Verification email sent",
-  "register-page.registration.success.head": "Doğrulama e-postası gönderildi",
-  
-  // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  "register-page.registration.success.content": "{{ email }} adresine özel bir URL ve daha fazla talimat içeren bir e-posta gönderildi.",
-  
-  // "register-page.registration.error.head": "Error when trying to register email",
-  "register-page.registration.error.head": "E-posta kaydetmeye çalışırken hata",
-  
-  // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
-  "register-page.registration.error.content": "Aşağıdaki e-posta adresi kaydedilirken bir hata oluştu: {{ email }}",
-  
-  
-  
-  // "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
-  "relationships.add.error.relationship-type.content": "İki öğe arasında {{ type }} ilişki türü için uygun bir eşleşme bulunamadı",
-  
-  // "relationships.add.error.server.content": "The server returned an error",
-  "relationships.add.error.server.content": "Sunucu bir hata verdi",
-  
-  // "relationships.add.error.title": "Unable to add relationship",
-  "relationships.add.error.title": "İlişki eklenemedi",
-  
-  // "relationships.isAuthorOf": "Authors",
-  "relationships.isAuthorOf": "Yazarlar",
-  
-  // "relationships.isAuthorOf.Person": "Authors (persons)",
-  "relationships.isAuthorOf.Person": "Yazarlar (kişiler)",
-  
-  // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
-  "relationships.isAuthorOf.OrgUnit": "Yazarlar (organizasyon birimleri)",
-  
-  // "relationships.isIssueOf": "Journal Issues",
-  "relationships.isIssueOf": "Dergi Sayıları",
-  
-  // "relationships.isJournalIssueOf": "Journal Issue",
-  "relationships.isJournalIssueOf": "Dergi Sayısı",
-  
-  // "relationships.isJournalOf": "Journals",
-  "relationships.isJournalOf": "Dergiler",
-  
-  // "relationships.isOrgUnitOf": "Organizational Units",
-  "relationships.isOrgUnitOf": "Organizasyon Birimleri",
-  
-  // "relationships.isPersonOf": "Authors",
-  "relationships.isPersonOf": "Yazarlar",
-  
-  // "relationships.isProjectOf": "Research Projects",
-  "relationships.isProjectOf": "Araştırma Projeleri",
-  
-  // "relationships.isPublicationOf": "Publications",
-  "relationships.isPublicationOf": "Yayınlar",
-  
-  // "relationships.isPublicationOfJournalIssue": "Articles",
-  "relationships.isPublicationOfJournalIssue": "Makaleler",
-  
-  // "relationships.isSingleJournalOf": "Journal",
-  "relationships.isSingleJournalOf": "Dergi",
-  
-  // "relationships.isSingleVolumeOf": "Journal Volume",
-  "relationships.isSingleVolumeOf": "Dergi Cilti",
-  
-  // "relationships.isVolumeOf": "Journal Volumes",
-  "relationships.isVolumeOf": "Dergi Ciltleri",
-  
-  // "relationships.isContributorOf": "Contributors",
-  "relationships.isContributorOf": "Katkıda Bulunanlar",
-  
-  
-  
-  // "resource-policies.add.button": "Add",
-  "resource-policies.add.button": "Ekle",
-  
-  // "resource-policies.add.for.": "Add a new policy",
-  "resource-policies.add.for.": "Yeni bir politika ekle",
-  
-  // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
-  "resource-policies.add.for.bitstream": "Yeni bir Bitstream ilkesi ekleyin",
-  
-  // "resource-policies.add.for.bundle": "Add a new Bundle policy",
-  "resource-policies.add.for.bundle": "Yeni bir Bundle ilkesi ekleyin",
-  
-  // "resource-policies.add.for.item": "Add a new Item policy",
-  "resource-policies.add.for.item": "Yeni bir öğe ilkesi ekleyin",
-  
-  // "resource-policies.add.for.community": "Add a new Community policy",
-  "resource-policies.add.for.community": "Yeni bir Komünite politikası ekle",
-  
-  // "resource-policies.add.for.collection": "Add a new Collection policy",
-  "resource-policies.add.for.collection": "Yeni bir Koleksiyon politikası ekle",
-  
-  // "resource-policies.create.page.heading": "Create new resource policy for ",
-  "resource-policies.create.page.heading": "Şunun için yeni kaynak ilkesi oluşturun: ",
-  
-  // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
-  "resource-policies.create.page.failure.content": "Kaynak ilkesi oluşturulurken bir hata oluştu.",
-  
-  // "resource-policies.create.page.success.content": "Operation successful",
-  "resource-policies.create.page.success.content": "Operasyon başarılı",
-  
-  // "resource-policies.create.page.title": "Create new resource policy",
-  "resource-policies.create.page.title": "Yeni kaynak politikası oluştur",
-  
-  // "resource-policies.delete.btn": "Delete selected",
-  "resource-policies.delete.btn": "Seçileni sil",
-  
-  // "resource-policies.delete.btn.title": "Delete selected resource policies",
-  "resource-policies.delete.btn.title": "Seçili kaynak politikalarını sil",
-  
-  // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
-  "resource-policies.delete.failure.content": "Seçili kaynak ilkeleri silinirken bir hata oluştu.",
-  
-  // "resource-policies.delete.success.content": "Operation successful",
-  "resource-policies.delete.success.content": "İşlem başarılı",
-  
-  // "resource-policies.edit.page.heading": "Edit resource policy ",
-  "resource-policies.edit.page.heading": "Kaynak politikasını düzenle ",
-  
-  // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
-  "resource-policies.edit.page.failure.content": "Kaynak ilkesi düzenlenirken bir hata oluştu.",
-  
-  // "resource-policies.edit.page.success.content": "Operation successful",
-  "resource-policies.edit.page.success.content": "İşlem başarılı",
-  
-  // "resource-policies.edit.page.title": "Edit resource policy",
-  "resource-policies.edit.page.title": "Kaynak politikasını düzenle",
-  
-  // "resource-policies.form.action-type.label": "Select the action type",
-  "resource-policies.form.action-type.label": "Eylem türünü seçin",
-  
-  // "resource-policies.form.action-type.required": "You must select the resource policy action.",
-  "resource-policies.form.action-type.required": "Kaynak ilkesi eylemini seçmelisiniz.",
-  
-  // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
-  "resource-policies.form.eperson-group-list.label": "İzin verilecek e-kişi veya grup",
-  
-  // "resource-policies.form.eperson-group-list.select.btn": "Select",
-  "resource-policies.form.eperson-group-list.select.btn": "Seç",
-  
-  // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
-  "resource-policies.form.eperson-group-list.tab.eperson": "e-kişi arayın",
-  
-  // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
-  "resource-policies.form.eperson-group-list.tab.group": "Grup arayın",
-  
-  // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
-  "resource-policies.form.eperson-group-list.table.headers.action": "Eylem",
-  
-  // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
-  "resource-policies.form.eperson-group-list.table.headers.id": "Kimlik",
-  
-  // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
-  "resource-policies.form.eperson-group-list.table.headers.name": "Ad",
-  
-  // "resource-policies.form.date.end.label": "End Date",
-  "resource-policies.form.date.end.label": "Bitiş Tarihi",
-  
-  // "resource-policies.form.date.start.label": "Start Date",
-  "resource-policies.form.date.start.label": "Başlangıç tarihi",
-  
-  // "resource-policies.form.description.label": "Description",
-  "resource-policies.form.description.label": "Açıklama",
-  
-  // "resource-policies.form.name.label": "Name",
-  "resource-policies.form.name.label": "Ad",
-  
-  // "resource-policies.form.policy-type.label": "Select the policy type",
-  "resource-policies.form.policy-type.label": "Politika türünü seçin",
-  
-  // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
-  "resource-policies.form.policy-type.required": "Kaynak ilkesi türünü seçmelisiniz.",
-  
-  // "resource-policies.table.headers.action": "Action",
-  "resource-policies.table.headers.action": "Eylem",
-  
-  // "resource-policies.table.headers.date.end": "End Date",
-  "resource-policies.table.headers.date.end": "Bitiş tarihi",
-  
-  // "resource-policies.table.headers.date.start": "Start Date",
-  "resource-policies.table.headers.date.start": "Başlangıç Tarihi",
-  
-  // "resource-policies.table.headers.edit": "Edit",
-  "resource-policies.table.headers.edit": "Düzenle",
-  
-  // "resource-policies.table.headers.edit.group": "Edit group",
-  "resource-policies.table.headers.edit.group": "Grubu düzenle",
-  
-  // "resource-policies.table.headers.edit.policy": "Edit policy",
-  "resource-policies.table.headers.edit.policy": "Politikayı düzenle",
-  
-  // "resource-policies.table.headers.eperson": "E-kişi",
-  "resource-policies.table.headers.eperson": "E-kişi",
-  
-  // "resource-policies.table.headers.group": "Grup",
-  "resource-policies.table.headers.group": "Grup",
-  
-  // "resource-policies.table.headers.id": "ID",
-  "resource-policies.table.headers.id": "Kimlik",
-  
-  // "resource-policies.table.headers.name": "Name",
-  "resource-policies.table.headers.name": "Ad",
-  
-  // "resource-policies.table.headers.policyType": "type",
-  "resource-policies.table.headers.policyType": "tür",
-  
-  // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
-  "resource-policies.table.headers.title.for.bitstream": "BitStream Politikaları",
-  
-  // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
-  "resource-policies.table.headers.title.for.bundle": "Bundle Politikaları",
-  
-  // "resource-policies.table.headers.title.for.item": "Policies for Item",
-  "resource-policies.table.headers.title.for.item": "Öğe Politikaları",
-  
-  // "resource-policies.table.headers.title.for.community": "Policies for Community",
-  "resource-policies.table.headers.title.for.community": "Komünite Politikaları",
-  
-  // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-  "resource-policies.table.headers.title.for.collection": "Koleksiyon Politikaları",
-  
-  
-  
-  // "search.description": "",
-  "search.description": "",
-  
-  // "search.switch-configuration.title": "Show",
-  "search.switch-configuration.title": "Göster",
-  
-  // "search.title": "DSpace Angular :: Search",
-  "search.title": "DSpace Angular :: Ara",
-  
-  // "search.breadcrumbs": "Search",
-  "search.breadcrumbs": "Ara",
-  
-  
-  // "search.filters.applied.f.author": "Author",
-  "search.filters.applied.f.author": "Yazar",
-  
-  // "search.filters.applied.f.dateIssued.max": "End date",
-  "search.filters.applied.f.dateIssued.max": "Bitiş tarihi",
-  
-  // "search.filters.applied.f.dateIssued.min": "Start date",
-  "search.filters.applied.f.dateIssued.min": "Başlangıç Tarihi",
-  
-  // "search.filters.applied.f.dateSubmitted": "Date submitted",
-  "search.filters.applied.f.dateSubmitted": "Gönderilme tarihi",
-  
-  // "search.filters.applied.f.discoverable": "Private",
-  "search.filters.applied.f.discoverable": "Özel",
-  
-  // "search.filters.applied.f.entityType": "Item Type",
-  "search.filters.applied.f.entityType": "Öğe Türü",
-  
-  // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
-  "search.filters.applied.f.has_content_in_original_bundle": "Has dosyaları",
-  
-  // "search.filters.applied.f.itemtype": "Type",
-  "search.filters.applied.f.itemtype": "Tür",
-  
-  // "search.filters.applied.f.namedresourcetype": "Status",
-  "search.filters.applied.f.namedresourcetype": "Durum",
-  
-  // "search.filters.applied.f.subject": "Subject",
-  "search.filters.applied.f.subject": "Konu",
-  
-  // "search.filters.applied.f.submitter": "Submitter",
-  "search.filters.applied.f.submitter": "Gönderen",
-  
-  // "search.filters.applied.f.jobTitle": "Job Title",
-  "search.filters.applied.f.jobTitle": "İş Adı",
-  
-  // "search.filters.applied.f.birthDate.max": "End birth date",
-  "search.filters.applied.f.birthDate.max": "Doğum Tarih Sonu",
-  
-  // "search.filters.applied.f.birthDate.min": "Start birth date",
-  "search.filters.applied.f.birthDate.min": "Doğum Tarih Başlangıcı",
-  
-  // "search.filters.applied.f.withdrawn": "Withdrawn",
-  "search.filters.applied.f.withdrawn": "Geri çekildi",
-  
-  
-  
-  // "search.filters.filter.author.head": "Author",
-  "search.filters.filter.author.head": "Yazar",
-  
-  // "search.filters.filter.author.placeholder": "Author name",
-  "search.filters.filter.author.placeholder": "Yazar adı",
-  
-  // "search.filters.filter.birthDate.head": "Birth Date",
-  "search.filters.filter.birthDate.head": "Doğum Tarihi",
-  
-  // "search.filters.filter.birthDate.placeholder": "Birth Date",
-  "search.filters.filter.birthDate.placeholder": "Doğum Tarihi",
-  
-  // "search.filters.filter.creativeDatePublished.head": "Date Published",
-  "search.filters.filter.creativeDatePublished.head": "Yayınlanma Tarihi",
-  
-  // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
-  "search.filters.filter.creativeDatePublished.placeholder": "Yayınlanma Tarihi",
-  
-  // "search.filters.filter.creativeWorkEditor.head": "Editor",
-  "search.filters.filter.creativeWorkEditor.head": "Editör",
-  
-  // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
-  "search.filters.filter.creativeWorkEditor.placeholder": "Editör",
-  
-  // "search.filters.filter.creativeWorkKeywords.head": "Subject",
-  "search.filters.filter.creativeWorkKeywords.head": "Konu",
-  
-  // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
-  "search.filters.filter.creativeWorkKeywords.placeholder": "Konu",
-  
-  // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
-  "search.filters.filter.creativeWorkPublisher.head": "Yayımcı",
-  
-  // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
-  "search.filters.filter.creativeWorkPublisher.placeholder": "Yayımcı",
-  
-  // "search.filters.filter.dateIssued.head": "Date",
-  "search.filters.filter.dateIssued.head": "Tarih",
-
-  // "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
-  "search.filters.filter.dateIssued.max.placeholder": "En Erken Tarih",
-  
-  // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
-  "search.filters.filter.dateIssued.min.placeholder": "En Geç Tarih",
-  
-  // "search.filters.filter.dateSubmitted.head": "Date submitted",
-  "search.filters.filter.dateSubmitted.head": "Teslim Edilen Tarih",
-  
-  // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
-  "search.filters.filter.dateSubmitted.placeholder": "Teslim Edilen Tarih",
-  
-  // "search.filters.filter.discoverable.head": "Private",
-  "search.filters.filter.discoverable.head": "Özel",
-  
-  // "search.filters.filter.withdrawn.head": "Withdrawn",
-  "search.filters.filter.withdrawn.head": "Alınmış",
-  
-  // "search.filters.filter.entityType.head": "Item Type",
-  "search.filters.filter.entityType.head": "Materyal Türü",
-  
-  // "search.filters.filter.entityType.placeholder": "Item Type",
-  "search.filters.filter.entityType.placeholder": "Materyal Türü",
-  
-  // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
-  "search.filters.filter.has_content_in_original_bundle.head": "Dosyalara Sahip",
-  
-  // "search.filters.filter.itemtype.head": "Type",
-  "search.filters.filter.itemtype.head": "Tür",
-  
-  // "search.filters.filter.itemtype.placeholder": "Type",
-  "search.filters.filter.itemtype.placeholder": "Tür",
-  
-  // "search.filters.filter.jobTitle.head": "Job Title",
-  "search.filters.filter.jobTitle.head": "İş Ünvanı",
-  
-  // "search.filters.filter.jobTitle.placeholder": "Job Title",
-  "search.filters.filter.jobTitle.placeholder": "İş Ünvanı",
-  
-  // "search.filters.filter.knowsLanguage.head": "Known language",
-  "search.filters.filter.knowsLanguage.head": "Bilinen Diller",
-  
-  // "search.filters.filter.knowsLanguage.placeholder": "Known language",
-  "search.filters.filter.knowsLanguage.placeholder": "Bilinen Diller",
-  
-  // "search.filters.filter.namedresourcetype.head": "Status",
-  "search.filters.filter.namedresourcetype.head": "Durum",
-  
-  // "search.filters.filter.namedresourcetype.placeholder": "Status",
-  "search.filters.filter.namedresourcetype.placeholder": "Durum",
-  
-  // "search.filters.filter.objectpeople.head": "People",
-  "search.filters.filter.objectpeople.head": "İnsanlar",
-  
-  // "search.filters.filter.objectpeople.placeholder": "People",
-  "search.filters.filter.objectpeople.placeholder": "İnsanlar",
-  
-  // "search.filters.filter.organizationAddressCountry.head": "Country",
-  "search.filters.filter.organizationAddressCountry.head": "Ülke",
-  
-  // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
-  "search.filters.filter.organizationAddressCountry.placeholder": "Ülke",
-  
-  // "search.filters.filter.organizationAddressLocality.head": "City",
-  "search.filters.filter.organizationAddressLocality.head": "Şehir",
-  
-  // "search.filters.filter.organizationAddressLocality.placeholder": "City",
-  "search.filters.filter.organizationAddressLocality.placeholder": "Şehir",
-  
-  // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
-  "search.filters.filter.organizationFoundingDate.head": "Bulunduğu Tarih",
-  
-  // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
-  "search.filters.filter.organizationFoundingDate.placeholder": "Bulunduğu Tarih",
-  
-  // "search.filters.filter.scope.head": "Scope",
-  "search.filters.filter.scope.head": "Kapsam",
-  
-  // "search.filters.filter.scope.placeholder": "Scope filter",
-  "search.filters.filter.scope.placeholder": "Kapsam Filtresi",
-  
-  // "search.filters.filter.show-less": "Collapse",
-  "search.filters.filter.show-less": "Yığılmış",
-  
-  // "search.filters.filter.show-more": "Show more",
-  "search.filters.filter.show-more": "Daha Fazla Göster",
-  
-  // "search.filters.filter.subject.head": "Subject",
-  "search.filters.filter.subject.head": "Konu",
-  
-  // "search.filters.filter.subject.placeholder": "Subject",
-  "search.filters.filter.subject.placeholder": "Konu",
-  
-  // "search.filters.filter.submitter.head": "Submitter",
-  "search.filters.filter.submitter.head": "Teslim Eden",
-  
-  // "search.filters.filter.submitter.placeholder": "Submitter",
-  "search.filters.filter.submitter.placeholder": "Teslim Eden",
-  
-  
-  
-  // "search.filters.entityType.JournalIssue": "Journal Issue",
-  "search.filters.entityType.JournalIssue": "Makale Konusu",
-  
-  // "search.filters.entityType.JournalVolume": "Journal Volume",
-  "search.filters.entityType.JournalVolume": "Cilt Sayısı",
-  
-  // "search.filters.entityType.OrgUnit": "Organizational Unit",
-  "search.filters.entityType.OrgUnit": "Ait Olduğu Organizasyon",
-  
-  // "search.filters.has_content_in_original_bundle.true": "Yes",
-  "search.filters.has_content_in_original_bundle.true": "Evet",
-  
-  // "search.filters.has_content_in_original_bundle.false": "No",
-  "search.filters.has_content_in_original_bundle.false": "Hayır",
-  
-  // "search.filters.discoverable.true": "No",
-  "search.filters.discoverable.true": "Hayır",
-  
-  // "search.filters.discoverable.false": "Yes",
-  "search.filters.discoverable.false": "Evet",
-  
-  // "search.filters.withdrawn.true": "Yes",
-  "search.filters.withdrawn.true": "Evet",
-  
-  // "search.filters.withdrawn.false": "No",
-  "search.filters.withdrawn.false": "Hayır",
-  
-  
-  // "search.filters.head": "Filters",
-  "search.filters.head": "Filtreler",
-  
-  // "search.filters.reset": "Reset filters",
-  "search.filters.reset": "Filtreleri Sıfırla",
-  
-  
-  
-  // "search.form.search": "Search",
-  "search.form.search": "Ara",
-  
-  // "search.form.search_dspace": "Search DSpace",
-  "search.form.search_dspace": "DSpace içinde Ara",
-  
-  // "search.form.search_mydspace": "Search MyDSpace",
-  "search.form.search_mydspace": "MyDSpace içinde Ara",
-  
-  
-  
-  // "search.results.head": "Search Results",
-  "search.results.head": "Sonuçları Ara",
-  
-  // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
-  "search.results.no-results": "Aramanız hiçbir sonuç vermedi. Aradığınızı bulmakta sorun mu yaşıyorsunuz? Bir daha deneyin.",
-  
-  // "search.results.no-results-link": "quotes around it",
-  "search.results.no-results-link": "Çevresindeki Alıntılar",
-  
-  // "search.results.empty": "Your search returned no results.",
-  "search.results.empty": "Aramanız hiçbir sonuç vermedi.",
-  
-  
-  
-  // "search.sidebar.close": "Back to results",
-  "search.sidebar.close": "Sonuçlara Dön",
-  
-  // "search.sidebar.filters.title": "Filters",
-  "search.sidebar.filters.title": "Filtreler",
-  
-  // "search.sidebar.open": "Search Tools",
-  "search.sidebar.open": "Araç Gereç Ara",
-  
-  // "search.sidebar.results": "results",
-  "search.sidebar.results": "Sonuçlar",
-  
-  // "search.sidebar.settings.rpp": "Results per page",
-  "search.sidebar.settings.rpp": "Sayfa Sonuçları",
-  
-  // "search.sidebar.settings.sort-by": "Sort By",
-  "search.sidebar.settings.sort-by": "Göre Sıralanmış",
-  
-  // "search.sidebar.settings.title": "Settings",
-  "search.sidebar.settings.title": "Ayarlar",
-  
-  
-  
-  // "search.view-switch.show-detail": "Show detail",
-  "search.view-switch.show-detail": "Detayları Göster",
-  
-  // "search.view-switch.show-grid": "Show as grid",
-  "search.view-switch.show-grid": "Ağ Dizge Olarak Göster",
-  
-  // "search.view-switch.show-list": "Show as list",
-  "search.view-switch.show-list": "Liste Olarak Göster",
-  
-  
-  
-  // "sorting.ASC": "Ascending",
-  "sorting.ASC": "Artan",
-  
-  // "sorting.DESC": "Descending",
-  "sorting.DESC": "Azalan",
-  
-  // "sorting.dc.title.ASC": "Title Ascending",
-  "sorting.dc.title.ASC": "Artan Başlıklar",
-  
-  // "sorting.dc.title.DESC": "Title Descending",
-  "sorting.dc.title.DESC": "Azalan Başlıklar",
-  
-  // "sorting.score.DESC": "Relevance",
-  "sorting.score.DESC": "Bağıntılı",
-  
-  
-  
-  // "statistics.title": "Statistics",
-  "statistics.title": "İstatistikler",
-  
-  // "statistics.header": "Statistics for {{ scope }}",
-  "statistics.header": "{{ scope }} için İstatistikler",
-  
-  // "statistics.breadcrumbs": "Statistics",
-  "statistics.breadcrumbs": "İstatistikler",
-  
-  // "statistics.page.no-data": "No data available",
-  "statistics.page.no-data": "Data Bulunamadı.",
-  
-  // "statistics.table.no-data": "No data available",
-  "statistics.table.no-data": "Data Bulunamadı.",
-  
-  // "statistics.table.title.TotalVisits": "Total visits",
-  "statistics.table.title.TotalVisits": "Toplam Ziyaretler",
-  
-  // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
-  "statistics.table.title.TotalVisitsPerMonth": "Aylık Toplam Ziyaretler",
-  
-  // "statistics.table.title.TotalDownloads": "File Visits",
-  "statistics.table.title.TotalDownloads": "Dosya Ziyaretleri",
-  
-  // "statistics.table.title.TopCountries": "Top country views",
-  "statistics.table.title.TopCountries": "En Çok Gösterilen Ülke",
-  
-  // "statistics.table.title.TopCities": "Top city views",
-  "statistics.table.title.TopCities": "En Çok Gösterilen Şehir",
-  
-  // "statistics.table.header.views": "Views",
-  "statistics.table.header.views": "Gösterilmeler",
-  
-  
-  
-  // "submission.edit.title": "Edit Submission",
-  "submission.edit.title": "Teslimi Düzenle",
-  
-  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
-  "submission.general.cannot_submit": "Yeni bir teslim yapamazsınız.",
-  
-  // "submission.general.deposit": "Deposit",
-  "submission.general.deposit": "Tamamla",
-  
-  // "submission.general.discard.confirm.cancel": "Cancel",
-  "submission.general.discard.confirm.cancel": "Vazgeç",
-  
-  // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
-  "submission.general.discard.confirm.info": "Bu işlem geri alınamaz. Emin misiniz?",
-  
-  // "submission.general.discard.confirm.submit": "Yes, I'm sure",
-  "submission.general.discard.confirm.submit": "Evet eminim",
-  
-  // "submission.general.discard.confirm.title": "Discard submission",
-  "submission.general.discard.confirm.title": "Teslimi İptal Et",
-  
-  // "submission.general.discard.submit": "Discard",
-  "submission.general.discard.submit": "İptal",
-  
-  // "submission.general.save": "Save",
-  "submission.general.save": "Kaydet",
-  
-  // "submission.general.save-later": "Save for later",
-  "submission.general.save-later": "Sonrası İçin Kaydet",
-  
-  
-  // "submission.import-external.page.title": "Import metadata from an external source",
-  "submission.import-external.page.title": "Harici bir kaynaktan metadataları içe aktarın",
-  
-  // "submission.import-external.title": "Import metadata from an external source",
-  "submission.import-external.title": "Harici bir kaynaktan metadataları içe aktarın",
-  
-  // "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.",
-  "submission.import-external.page.hint": "Web'den DSpace'e içe aktarılacak öğeleri bulmak için yukarıya bir sorgu girin.",
-  
-  // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
-  "submission.import-external.back-to-my-dspace": "MyDSpace'e Geri Dön",
-  
-  // "submission.import-external.search.placeholder": "Search the external source",
-  "submission.import-external.search.placeholder": "Dış Kaynaktan Ara",
-  
-  // "submission.import-external.search.button": "Search",
-  "submission.import-external.search.button": "Ara",
-  
-  // "submission.import-external.search.button.hint": "Write some words to search",
-  "submission.import-external.search.button.hint": "Aramak için Kelime Girin",
-  
-  // "submission.import-external.search.source.hint": "Pick an external source",
-  "submission.import-external.search.source.hint": "Dış Kaynak Seçin",
-  
-  // "submission.import-external.source.arxiv": "arXiv",
-  "submission.import-external.source.arxiv": "arXiv",
-  
-  // "submission.import-external.source.loading": "Loading ...",
-  "submission.import-external.source.loading": "Yükleniyor ...",
-  
-  // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-  "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-  
-  // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  
-  // "submission.import-external.source.orcid": "ORCID",
-  "submission.import-external.source.orcid": "ORCID",
-  
-  // "submission.import-external.source.pubmed": "Pubmed",
-  "submission.import-external.source.pubmed": "Pubmed",
-  
-  // "submission.import-external.source.lcname": "Library of Congress Names",
-  "submission.import-external.source.lcname": "Kongre İsimleri Kütüphanesi",
-  
-  // "submission.import-external.preview.title": "Item Preview",
-  "submission.import-external.preview.title": "Materyal Önizlenimi",
-  
-  // "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.",
-  "submission.import-external.preview.subtitle": "Aşağıdaki metadatalar harici bir kaynaktan içe aktarıldı. Gönderime başladığınızda önceden doldurulacaktır.",
-  
-  // "submission.import-external.preview.button.import": "Start submission",
-  "submission.import-external.preview.button.import": "Gönderimi Başlat",
-  
-  // "submission.import-external.preview.error.import.title": "Submission error",
-  "submission.import-external.preview.error.import.title": "Gönderim Sırasında Hata",
-  
-  // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
-  "submission.import-external.preview.error.import.body": "Dış kaynak girişi içe aktarma işlemi sırasında bir hata oluştu.",
-  
-  // "submission.sections.describe.relationship-lookup.close": "Close",
-  "submission.sections.describe.relationship-lookup.close": "Kapat",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
-  "submission.sections.describe.relationship-lookup.external-source.added": "Giriş seçime başarıyla eklendi",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Dış Kaynak Yazarı İçe Aktar",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Dış Kaynak Makaleyi İçe Aktar",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Dış Kaynak Makale Konusu İçe Aktar",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Dış Kaynak Makale Cilt Sayısı İçe Aktar",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Dış Kaynak Yazarı İçe Aktar",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Yazar seçime başarıyla eklendi",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Successfully imported and added external author to the selection",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Harici yazar başarıyla içe aktarıldı ve seçime eklendi",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Yetkili",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Yeni bir yerel yetkili girişi olarak içe aktar",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "İptal",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Select a collection to import new entries to",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Yeni girişleri içe aktarmak için bir koleksiyon seçin",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Varlıklar",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Yeni bir yerel varlık olarak içe aktar",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "LC Adına göre İçe Aktar",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "ORCID'den İçe Aktar",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Sherpa Journal'den İçe Aktar",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Sherpa Publisher'den İçe Aktar",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "PubMed'den İçe Aktar",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "arXiv'den İçe Aktar",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "İçe Aktar",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Makaleyi Dışardan İçe Aktar",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Successfully added local journal to the selection",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": " Makale seçime başarıyla eklendi",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Successfully imported and added external journal to the selection",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Harici makale başarıyla içe aktarıldı ve seçime eklendi",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Dış Kaynak Makale Konusu İçe Aktar",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Dış Kaynak Makale Konusu Başarıyla İçe Aktarıldı.",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Başarıyla içe aktarıldı ve seçime harici makale sayısı eklendi",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Dış Kaynak Makale Cilt Sayısı İçe Aktar",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Successfully added local journal volume to the selection",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Dış Kaynak Makale Cilt Sayısı Başarıyla İçe Aktarıldı.",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Successfully imported and added external journal volume to the selection",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Harici makale cilti başarıyla içe aktarıldı ve seçime eklendi",
-  
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Yerel Eşleşmeyi Seç",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Tümünü Seçmeyi Bırak",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Sayfa Seçimin Bırak",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
-  "submission.sections.describe.relationship-lookup.search-tab.loading": "Yükleniyor...",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
-  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Arama Sorgusu",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  "submission.sections.describe.relationship-lookup.search-tab.search": "Git",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
-  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Hepsini Seç",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
-  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Sayfa Seç",
-  
-  // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
-  "submission.sections.describe.relationship-lookup.selected": "{{ size }} boyutundaki Seçili Materyaller ",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": " Yerel Yazarlar({{ count }})",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Yerel Makaleler ({{ count }})",
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Yerel Projeler ({{ count }})",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Yerel Yayınlar ({{ count }})",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Yerel Yazarlar ({{ count }})",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Yerel Organizasyonlar({{ count }})",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Yerel Veri Paketleri ({{ count }})",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Yerel Veri Dosyaları ({{ count }})",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Yerel Makaleler ({{ count }})",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Yerel Makale Konuları ({{ count }})",
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Yerel Makale Konuları ({{ count }})",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Yerel Makale Cilt ({{ count }})",
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Yerel Makale Cilt ({{ count }})",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Adları ({{ count }})",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Finansman Kuruluşlarını Arama",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Finansman Arama",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Organizasyonları Arama",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
-  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Mevcut Seçim ({{ count }})",
-  
-  // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
-  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Makale Konuları",
-  // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
-  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Makale Konuları",
-  
-  // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
-  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Makale Ciltleri",
-  // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Makale Ciltleri",
-  
-  // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
-  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Makaleler",
-  
-  // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
-  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Yazarlar",
-  
-  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
-  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Finansman Kuruluşu",
-  // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-  "submission.sections.describe.relationship-lookup.title.Project": "Projeler",
-  
-  // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
-  "submission.sections.describe.relationship-lookup.title.Publication": "Yayınlar",
-  
-  // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-  "submission.sections.describe.relationship-lookup.title.Person": "Yazarlar",
-  
-  // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
-  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizasyonlar",
-  
-  // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-  "submission.sections.describe.relationship-lookup.title.DataPackage": "Veri Paketler",
-  
-  // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
-  "submission.sections.describe.relationship-lookup.title.DataFile": "Veri Dosyaları",
-  
-  // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
-  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Finansman Kuruluşu",
-  
-  // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Finansman",
-  
-  // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
-  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Ana Organizasyon",
-  
-  // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
-  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Açılır menüyü aç/kapat",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
-  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Ayarlar",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
-  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Mevcut seçiminiz boş. ",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Seçili Yazarlar",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Seçili Makaleler",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Seçili Makale Ciltleri",
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Seçili Projeler",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Seçili Yayınlar",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Seçili Yazarlar",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Seçili Organizasyonlar",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Seçili Veri Paketleri",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Seçili Veri Dosyaları",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Seçili Makaleler",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Seçili Makale Konuları",
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Seçili Makale Ciltleri",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Seçili Finansman Kuruluşu",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Seçili Finansman",
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Seçili Makale Konuları",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Seçili Organizasyonlar",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Sonuçları Ara",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Sonuçları Ara",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Sonuçları Ara",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Sonuçları Ara",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Sonuçları Ara",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Sonuçları Ara",
-  
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Sonuçları Ara",
-  
-  // "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don\'t you can still use it for this submission.",
-  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Bu kişi için \"{{ value }}\" ilerideki gönderilerde kullanılabilmek için Yeni İsim olarak kaydedilsin mi? Bunu yapmazsanız, yine de bu gönderim için kullanabilirsiniz .",
-  
-  // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
-  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Yeni İsim değişikliğini kaydet.",
-  
-  // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
-  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Sadece bu gönderim için kullan.",
-  
-  // "submission.sections.ccLicense.type": "License Type",
-  "submission.sections.ccLicense.type": "Lisans Türü",
-  
-  // "submission.sections.ccLicense.select": "Select a license type…",
-  "submission.sections.ccLicense.select": "Lisans Türünü Seç…",
-  
-  // "submission.sections.ccLicense.change": "Change your license type…",
-  "submission.sections.ccLicense.change": "Lisans Türünü Değiştir…",
-  
-  // "submission.sections.ccLicense.none": "No licenses available",
-  "submission.sections.ccLicense.none": "Lisans Mevcut Değil",
-  
-  // "submission.sections.ccLicense.option.select": "Select an option…",
-  "submission.sections.ccLicense.option.select": "Seçenek Seç…",
-  
-  // "submission.sections.ccLicense.link": "You’ve selected the following license:",
-  "submission.sections.ccLicense.link": "Seçtiğiniz Lisans Türü:",
-  
-  // "submission.sections.ccLicense.confirmation": "I grant the license above",
-  "submission.sections.ccLicense.confirmation": "Yukarıdaki lisansı veriyorum",
-  
-  // "submission.sections.general.add-more": "Add more",
-  "submission.sections.general.add-more": "Ekle",
-  
-  // "submission.sections.general.collection": "Collection",
-  "submission.sections.general.collection": "Koleksiyon",
-  
-  // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
-  "submission.sections.general.deposit_error_notice": "Öğe gönderilirken bir sorun oluştu, lütfen daha sonra tekrar deneyin.",
-  
-  // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
-  "submission.sections.general.deposit_success_notice": "Gönderim başarıyla yatırıldı.",
-  
-  // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
-  "submission.sections.general.discard_error_notice": "Öğe gönderilirken bir sorun oluştu, lütfen daha sonra tekrar deneyin.",
-  
-  // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
-  "submission.sections.general.discard_success_notice": "Gönderim başarıyla silindi.",
-  
-  // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
-  "submission.sections.general.metadata-extracted": "Yeni metadatalar çıkarıldı ve <strong>{{sectionId}}</strong> bölümüne eklendi.",
-  
-  // "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
-  "submission.sections.general.metadata-extracted-new-section": "Gönderime yeni <strong>{{sectionId}}</strong> bölümü eklendi.",
-  
-  // "submission.sections.general.no-collection": "No collection found",
-  "submission.sections.general.no-collection": "Koleksiyon bulunamadı",
-  
-  // "submission.sections.general.no-sections": "No options available",
-  "submission.sections.general.no-sections": "Seçenekler Bulunamadı.",
-  
-  // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
-  "submission.sections.general.save_error_notice": "Öğe kaydedilirken bir sorun oluştu, lütfen daha sonra tekrar deneyin.",
-  
-  // "submission.sections.general.save_success_notice": "Submission saved successfully.",
-  "submission.sections.general.save_success_notice": "Gönderim başarıyla kaydedildi.",
-  
-  // "submission.sections.general.search-collection": "Search for a collection",
-  "submission.sections.general.search-collection": "Koleksiyon ara",
-  
-  // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
-  "submission.sections.general.sections_not_valid": "Eksik bölümler var.",
-  
-  
-  
-  // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
-  "submission.sections.submit.progressbar.CClicense": "Yaratıcı Ortak Lisansları",
-  
-  // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
-  "submission.sections.submit.progressbar.describe.recycle": "Geri Dönüştür",
-  
-  // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
-  "submission.sections.submit.progressbar.describe.stepcustom": "Tanımla",
-  
-  // "submission.sections.submit.progressbar.describe.stepone": "Describe",
-  "submission.sections.submit.progressbar.describe.stepone": "Tanımla",
-  
-  // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
-  "submission.sections.submit.progressbar.describe.steptwo": "Tanımla",
-  
-  // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
-  "submission.sections.submit.progressbar.detect-duplicate": "Olası Kopyalar",
-  
-  // "submission.sections.submit.progressbar.license": "Deposit license",
-  "submission.sections.submit.progressbar.license": "Lisansı Yerleştir",
-  
-  // "submission.sections.submit.progressbar.upload": "Upload files",
-  "submission.sections.submit.progressbar.upload": "Dosyaları yükle",
-  
-  
-  
-  // "submission.sections.upload.delete.confirm.cancel": "Cancel",
-  "submission.sections.upload.delete.confirm.cancel": "İptal",
-  
-  // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
-  "submission.sections.upload.delete.confirm.info": "Bu işlem geri alınamaz. Emin misin?",
-  
-  // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
-  "submission.sections.upload.delete.confirm.submit": "Evet eminim.",
-  
-  // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
-  "submission.sections.upload.delete.confirm.title": "Bitstreamı Sil",
-  
-  // "submission.sections.upload.delete.submit": "Delete",
-  "submission.sections.upload.delete.submit": "Sil",
-  
-  // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
-  "submission.sections.upload.drop-message": "Öğeye eklemek için dosyaları bırakın",
-  
-  // "submission.sections.upload.form.access-condition-label": "Access condition type",
-  "submission.sections.upload.form.access-condition-label": "Erişim Koşulu Türü",
-  
-  // "submission.sections.upload.form.date-required": "Date is required.",
-  "submission.sections.upload.form.date-required": "Tarih gerekli.",
-  
-  // "submission.sections.upload.form.from-label": "Grant access from",
-  "submission.sections.upload.form.from-label": "Şuradan erişim izni ver:",
-  
-  // "submission.sections.upload.form.from-placeholder": "From",
-  "submission.sections.upload.form.from-placeholder": "İtibaren",
-  
-  // "submission.sections.upload.form.group-label": "Group",
-  "submission.sections.upload.form.group-label": "Grup",
-  
-  // "submission.sections.upload.form.group-required": "Group is required.",
-  "submission.sections.upload.form.group-required": "Grup gerekli.",
-  
-  // "submission.sections.upload.form.until-label": "Grant access until",
-  "submission.sections.upload.form.until-label": "Şu tarihe kadar erişim izni ver:",
-  
-  // "submission.sections.upload.form.until-placeholder": "Until",
-  "submission.sections.upload.form.until-placeholder": "Kadar",
-  
-  // "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
-  "submission.sections.upload.header.policy.default.nolist": "{{collectionName}} koleksiyonuna yüklenen dosyalara aşağıdaki gruplara göre erişilebilir:",
-  
-  // "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
-  "submission.sections.upload.header.policy.default.withlist": "{{collectionName}} koleksiyonuna yüklenen dosyalara, tek dosya için açıkça karar verilenlere ek olarak aşağıdaki gruplarla erişilebilir olacağını lütfen unutmayın:",
-  
-  // "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files just dragging & dropping them everywhere in the page</strong>",
-  "submission.sections.upload.info": "Burada, o anda öğede bulunan tüm dosyaları bulacaksınız. Dosya metadatalarını güncelleyebilir ve koşullara erişebilir veya <strong>sayfanın her yerine sürükleyip bırakarak ek dosyalar yükleyebilirsiniz</strong>",
-  
-  // "submission.sections.upload.no-entry": "No",
-  "submission.sections.upload.no-entry": "Hayır",
-  
-  // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
-  "submission.sections.upload.no-file-uploaded": "Henüz dosya yüklenmedi.",
-  
-  // "submission.sections.upload.save-metadata": "Save metadata",
-  "submission.sections.upload.save-metadata": "Metadataları kaydet",
-  
-  // "submission.sections.upload.undo": "Cancel",
-  "submission.sections.upload.undo": "İptal",
-  
-  // "submission.sections.upload.upload-failed": "Upload failed",
-  "submission.sections.upload.upload-failed": "Yükleme Başarısız",
-  
-  // "submission.sections.upload.upload-successful": "Upload successful",
-  "submission.sections.upload.upload-successful": "Yükleme Başarılı",
-  
-  
-  
-  // "submission.submit.title": "Submission",
-  "submission.submit.title": "Gönder",
-  
-  
-  
-  // "submission.workflow.generic.delete": "Delete",
-  "submission.workflow.generic.delete": "Sil",
-  
-  // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
-  "submission.workflow.generic.delete-help": "Bu öğeyi atmak istiyorsanız, \"Sil\" öğesini seçin. Daha sonra onaylamanız istenecektir.",
-  
-  // "submission.workflow.generic.edit": "Edit",
-  "submission.workflow.generic.edit": "Değiştir",
-  
-  // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
-  "submission.workflow.generic.edit-help": "Öğenin metadatalarını değiştirmek için bu seçeneği belirleyin.",
-  
-  // "submission.workflow.generic.view": "View",
-  "submission.workflow.generic.view": "Göster",
-  
-  // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
-  "submission.workflow.generic.view-help": "Öğenin metadatalarını görüntülemek için bu seçeneği belirleyin.",
-  
-  
-  
-  // "submission.workflow.tasks.claimed.approve": "Approve",
-  "submission.workflow.tasks.claimed.approve": "Kabul Et.",
-  
-  // "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the item and it is suitable for inclusion in the collection, select \"Approve\".",
-  "submission.workflow.tasks.claimed.approve_help": "Öğeyi incelediyseniz ve koleksiyona dahil edilmeye uygunsa, \"Onayla\"yı seçin.",
-  
-  // "submission.workflow.tasks.claimed.edit": "Edit",
-  "submission.workflow.tasks.claimed.edit": "Değiştir",
-  
-  // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
-  "submission.workflow.tasks.claimed.edit_help": "Öğenin metadatalarını değiştirmek için bu seçeneği belirleyin.",
-  
-  // "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
-  "submission.workflow.tasks.claimed.reject.reason.info": "Lütfen gönderiyi reddetme nedeninizi aşağıdaki kutuya, gönderenin bir sorunu çözüp yeniden gönderip gönderemeyeceğini belirterek girin.",
-  
-  // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
-  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Reddetme nedenini açıklayın",
-  
-  // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
-  "submission.workflow.tasks.claimed.reject.reason.submit": "Materyali Reddet",
-  
-  // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
-  "submission.workflow.tasks.claimed.reject.reason.title": "Neden",
-  
-  // "submission.workflow.tasks.claimed.reject.submit": "Reject",
-  "submission.workflow.tasks.claimed.reject.submit": "Kabul Etme",
-  
-  // "submission.workflow.tasks.claimed.reject_help": "If you have reviewed the item and found it is <strong>not</strong> suitable for inclusion in the collection, select \"Reject\".  You will then be asked to enter a message indicating why the item is unsuitable, and whether the submitter should change something and resubmit.",
-  "submission.workflow.tasks.claimed.reject_help": "Öğeyi incelediyseniz ve koleksiyona dahil edilmeye <strong>uygun olmadığını</strong> bulduysanız, \"Reddet\"i seçin. Ardından, öğenin neden uygun olmadığını ve gönderenin bir şeyi değiştirip yeniden göndermesi gerekip gerekmediğini belirten bir mesaj girmeniz istenecektir.",
-  
-  // "submission.workflow.tasks.claimed.return": "Return to pool",
-  "submission.workflow.tasks.claimed.return": "Havuza Dön",
-  
-  // "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
-  "submission.workflow.tasks.claimed.return_help": "Başka bir kullanıcının görevi gerçekleştirebilmesi için görevi havuza geri döndürün.",
-  
-  
-  
-  // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
-  "submission.workflow.tasks.generic.error": "İşlem sırasında hata oluştu...",
-  
-  // "submission.workflow.tasks.generic.processing": "Processing...",
-  "submission.workflow.tasks.generic.processing": "İşleniyor...",
-  
-  // "submission.workflow.tasks.generic.submitter": "Submitter",
-  "submission.workflow.tasks.generic.submitter": "Gönderen",
-  
-  // "submission.workflow.tasks.generic.success": "Operation successful",
-  "submission.workflow.tasks.generic.success": "İşlem Başarılı",
-  
-  
-  
-  // "submission.workflow.tasks.pool.claim": "Claim",
-  "submission.workflow.tasks.pool.claim": "Talep Et",
-  
-  // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
-  "submission.workflow.tasks.pool.claim_help": "Bu görevi kendinize atayın.",
-  
-  // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
-  "submission.workflow.tasks.pool.hide-detail": "Detayları gizle",
-  
-  // "submission.workflow.tasks.pool.show-detail": "Show detail",
-  "submission.workflow.tasks.pool.show-detail": "Detayaları göster",
-  
-  
-  
-  // "title": "DSpace",
-  "title": "DSpace",
-  
-  
-  
-  // "vocabulary-treeview.header": "Hierarchical tree view",
-  "vocabulary-treeview.header": "Hiyerarşik ağaç görünümü",
-  
-  // "vocabulary-treeview.load-more": "Load more",
-  "vocabulary-treeview.load-more": "Daha Fazla Yükle",
-  
-  // "vocabulary-treeview.search.form.reset": "Reset",
-  "vocabulary-treeview.search.form.reset": "Sıfırla",
-  
-  // "vocabulary-treeview.search.form.search": "Search",
-  "vocabulary-treeview.search.form.search": "Ara",
-  
-  // "vocabulary-treeview.search.no-result": "There were no items to show",
-  "vocabulary-treeview.search.no-result": "Gösterilecek öğe yok",
-  
-  // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
-  "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
-  
-  // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
-  "vocabulary-treeview.tree.description.srsc": "Araştırma Konusu Kategorileri",
-  
-  
-  
-  // "uploader.browse": "browse",
-  "uploader.browse": "Tara",
-  
-  // "uploader.drag-message": "Drag & Drop your files here",
-  "uploader.drag-message": "Dosyalarınızı buraya sürükleyip bırakın",
-  
-  // "uploader.or": ", or ",
-  "uploader.or": ", veya",
-  
-  // "uploader.processing": "Processing",
-  "uploader.processing": "İşleniyor",
-  
-  // "uploader.queue-length": "Queue length",
-  "uploader.queue-length": "Sıra Uzunluğu",
-  
-  // "virtual-metadata.delete-item.info": "Select the types for which you want to save the virtual metadata as real metadata",
-  "virtual-metadata.delete-item.info": "Sanal metadataları gerçek metadatalar olarak kaydetmek istediğiniz türleri seçin",
-  
-  // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
-  "virtual-metadata.delete-item.modal-head": "Bu ilişkinin sanal metadataları",
-  
-  // "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
-  "virtual-metadata.delete-relationship.modal-head": "Sanal metadatalarını gerçek metadatalar olarak kaydetmek istediğiniz öğeleri seçin",
-  
-  
-  
-  // "workflowAdmin.search.results.head": "Administer Workflow",
-  "workflowAdmin.search.results.head": "İş Akışını Yönet",
-  
-  
-  
-  // "workflow-item.delete.notification.success.title": "Deleted",
-  "workflow-item.delete.notification.success.title": "Silindi",
-  
-  // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
-  "workflow-item.delete.notification.success.content": "Bu iş akışı öğesi başarıyla silindi",
-  
-  // "workflow-item.delete.notification.error.title": "Something went wrong",
-  "workflow-item.delete.notification.error.title": "Bir şeyler yanlış gitti",
-  
-  // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
-  "workflow-item.delete.notification.error.content": "İş akışı öğesi silinemedi",
-  
-  // "workflow-item.delete.title": "Delete workflow item",
-  "workflow-item.delete.title": "İş akışı öğesini sil",
-  
-  // "workflow-item.delete.header": "Delete workflow item",
-  "workflow-item.delete.header": "İş akışı öğesini sil",
-  
-  // "workflow-item.delete.button.cancel": "Cancel",
-  "workflow-item.delete.button.cancel": "İptal",
-  
-  // "workflow-item.delete.button.confirm": "Delete",
-  "workflow-item.delete.button.confirm": "Sil",
-  
-  
-  // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
-  "workflow-item.send-back.notification.success.title": "Gönderene geri gönderildi",
-  
-  // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
-  "workflow-item.send-back.notification.success.content": "Bu iş akışı öğesi, gönderene başarıyla geri gönderildi",
-  
-  // "workflow-item.send-back.notification.error.title": "Something went wrong",
-  "workflow-item.send-back.notification.error.title": "Bir şeyler yanlış gitti",
-  
-  // "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter",
-  "workflow-item.send-back.notification.error.content": "İş akışı öğesi, gönderene geri gönderilemedi",
-  
-  // "workflow-item.send-back.title": "Send workflow item back to submitter",
-  "workflow-item.send-back.title": "İş akışı öğesini gönderene geri gönder",
-  
-  // "workflow-item.send-back.header": "Send workflow item back to submitter",
-  "workflow-item.send-back.header": "İş akışı öğesini gönderene geri gönder",
-  
-  // "workflow-item.send-back.button.cancel": "Cancel",
-  "workflow-item.send-back.button.cancel": "İptal",
-  
-  // "workflow-item.send-back.button.confirm": "Send back"
-  "workflow-item.send-back.button.confirm": "Geri Gönder"
-
-}
+{
+  
+  // "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
+  "401.help": "Bu sayfaya erişim yetkiniz bulunmamaktadır. Ana sayfaya dönmek için aşağıdaki butonu kullanabilirsiniz.",
+  
+  // "401.link.home-page": "Take me to the home page",
+  "401.link.home-page": "Beni ana sayfaya götür",
+  
+  // "401.unauthorized": "unauthorized",
+  "401.unauthorized": "yetkisiz",
+  
+  
+  
+  // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
+  "403.help": "Bu sayfaya erişim yetkiniz bulunmamaktadır. Ana sayfaya dönmek için aşağıdaki butonu kullanabilirsiniz.",
+  
+  // "403.link.home-page": "Take me to the home page",
+  "403.link.home-page": "Beni ana sayfaya götür",
+  
+  // "403.forbidden": "forbidden",
+  "403.forbidden": "yasaklı",
+  
+  
+  
+  // "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
+  "404.help": "Aradığınız sayfayı bulamıyoruz. Sayfa taşınmış veya silinmiş olabilir. Ana sayfaya geri dönmek için aşağıdaki butonu kullanabilirsiniz. ",
+  
+  // "404.link.home-page": "Take me to the home page",
+  "404.link.home-page": "Beni ana sayfaya götür",
+  
+  // "404.page-not-found": "page not found",
+  "404.page-not-found": "sayfa bulunamadı",
+  
+  // "admin.curation-tasks.breadcrumbs": "System curation tasks",
+  "admin.curation-tasks.breadcrumbs": "Sistem iyileştirme görevleri",
+  
+  // "admin.curation-tasks.title": "System curation tasks",
+  "admin.curation-tasks.title": "Sistem iyileştirme görevleri",
+  
+  // "admin.curation-tasks.header": "System curation tasks",
+  "admin.curation-tasks.header": "Sistem iyileştirme görevleri",
+  
+  // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
+  "admin.registries.bitstream-formats.breadcrumbs": "Kayıt defterini biçimlendir",
+  
+  // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream biçimi",
+  
+  // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
+  "admin.registries.bitstream-formats.create.failure.content": "Yeni bitstream biçimi oluşturulurken bir hata oluştu.",
+  
+  // "admin.registries.bitstream-formats.create.failure.head": "Failure",
+  "admin.registries.bitstream-formats.create.failure.head": "Aksama",
+  
+  // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  "admin.registries.bitstream-formats.create.head": "Vit akışı biçimi oluştur",
+  
+  // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
+  "admin.registries.bitstream-formats.create.new": "Yeni bir bitstream biçimi ekleyin",
+  
+  // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
+  "admin.registries.bitstream-formats.create.success.content": "Yeni bitstream biçimi başarıyla oluşturuldu.",
+  
+  // "admin.registries.bitstream-formats.create.success.head": "Success",
+  "admin.registries.bitstream-formats.create.success.head": "Başarılı",
+  
+  // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.failure.amount": "{{ amount }} biçim(ler) kaldırılamadı",
+  
+  // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
+  "admin.registries.bitstream-formats.delete.failure.head": "Aksama",
+  
+  // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.success.amount": "{{ amount }} biçim(ler) başarıyla kaldırıldı",
+  
+  // "admin.registries.bitstream-formats.delete.success.head": "Success",
+  "admin.registries.bitstream-formats.delete.success.head": "Başarılı",
+  
+  // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
+  "admin.registries.bitstream-formats.description": "Bu bitstream biçimleri listesi, bilinen biçimler ve destek düzeyleri hakkında bilgi sağlar.",
+  
+  // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream biçimi",
+  
+  // "admin.registries.bitstream-formats.edit.description.hint": "",
+  "admin.registries.bitstream-formats.edit.description.hint": "",
+  
+  // "admin.registries.bitstream-formats.edit.description.label": "Description",
+  "admin.registries.bitstream-formats.edit.description.label": "Tanımlama",
+  
+  // "admin.registries.bitstream-formats.edit.extensions.hint": "Extensions are file extensions that are used to automatically identify the format of uploaded files. You can enter several extensions for each format.",
+  "admin.registries.bitstream-formats.edit.extensions.hint": "Uzantılar, yüklenen dosyaların biçimini otomatik olarak tanımlamak için kullanılan dosya uzantılarıdır. Her biçim için birkaç uzantı girebilirsiniz.",
+  
+  // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
+  "admin.registries.bitstream-formats.edit.extensions.label": "Dosya uzantıları",
+  
+  // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Nokta olmadan bir dosya uzantısı girin",
+  
+  // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
+  "admin.registries.bitstream-formats.edit.failure.content": "Bitstream biçimi düzenlenirken bir hata oluştu.",
+  
+  // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
+  "admin.registries.bitstream-formats.edit.failure.head": "Aksama",
+  
+  // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
+  "admin.registries.bitstream-formats.edit.head": "Bitstream biçimi: {{ format }}",
+  
+  // "admin.registries.bitstream-formats.edit.internal.hint": "Formats marked as internal are hidden from the user, and used for administrative purposes.",
+  "admin.registries.bitstream-formats.edit.internal.hint": "Dahili olarak işaretlenen biçimler, kullanıcıdan gizlenir ve yönetim amacıyla kullanılır.",
+  
+  // "admin.registries.bitstream-formats.edit.internal.label": "Internal",
+  "admin.registries.bitstream-formats.edit.internal.label": "Dahili",
+  
+  // "admin.registries.bitstream-formats.edit.mimetype.hint": "The MIME type associated with this format, does not have to be unique.",
+  "admin.registries.bitstream-formats.edit.mimetype.hint": "Bu biçimle ilişkili MIME biçimi benzersiz olması gerekmez.",
+  
+  // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Biçimi",
+  
+  // "admin.registries.bitstream-formats.edit.shortDescription.hint": "A unique name for this format, (e.g. Microsoft Word XP or Microsoft Word 2000)",
+  "admin.registries.bitstream-formats.edit.shortDescription.hint": "Bu biçim için benzersiz bir ad (ör. Microsoft Word XP veya Microsoft Word 2000)",
+  
+  // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
+  "admin.registries.bitstream-formats.edit.shortDescription.label": "İsim",
+  
+  // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
+  "admin.registries.bitstream-formats.edit.success.content": "Bitstream biçimi başarıyla düzenlendi.",
+  
+  // "admin.registries.bitstream-formats.edit.success.head": "Success",
+  "admin.registries.bitstream-formats.edit.success.head": "Başarılı",
+  
+  // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "Kurumunuzun bu biçim için taahhüt ettiği destek düzeyi.",
+  
+  // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
+  "admin.registries.bitstream-formats.edit.supportLevel.label": "Destek seviyesi",
+  
+  // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.head": "Bitstream Biçimi Kayıt Defteri",
+  
+  // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
+  "admin.registries.bitstream-formats.no-items": "Gösterilecek bitstream biçimi yok.",
+  
+  // "admin.registries.bitstream-formats.table.delete": "Delete selected",
+  "admin.registries.bitstream-formats.table.delete": "Silme seçildi",
+  
+  // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
+  "admin.registries.bitstream-formats.table.deselect-all": "Tüm seçimleri kaldır",
+  
+  // "admin.registries.bitstream-formats.table.internal": "internal",
+  "admin.registries.bitstream-formats.table.internal": "dahili",
+  
+  // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
+  "admin.registries.bitstream-formats.table.mimetype": "MIME Biçimi",
+  
+  // "admin.registries.bitstream-formats.table.name": "Name",
+  "admin.registries.bitstream-formats.table.name": "İsim",
+  
+  // "admin.registries.bitstream-formats.table.return": "Return",
+  "admin.registries.bitstream-formats.table.return": "Geri Dön",
+  
+  // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
+  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Biliniyor",
+  
+  // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Destekleniyor",
+  
+  // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Bilinmiyor",
+  
+  // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
+  "admin.registries.bitstream-formats.table.supportLevel.head": "Destek Seviyesi",
+  
+  // "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
+  "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Biçimi Kayıt Defteri ",
+  
+  
+  
+  // "admin.registries.metadata.breadcrumbs": "Metadata registry",
+  "admin.registries.metadata.breadcrumbs": "Metadata kayıt defteri",
+  
+  // "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.",
+  "admin.registries.metadata.description": "Metadata kayıt defteri, veri havuzda bulunan tüm metadata alanlarının bir listesini tutar. Bu alanlar birden çok şema arasında bölünebilir. Ancak, DSpace nitelikli Dublin Core şemasını gerektirir.",
+  
+  // "admin.registries.metadata.form.create": "Create metadata schema",
+  "admin.registries.metadata.form.create": "Metadata şeması oluştur",
+  
+  // "admin.registries.metadata.form.edit": "Edit metadata schema",
+  "admin.registries.metadata.form.edit": "Metadata şemasını düzenle",
+  
+  // "admin.registries.metadata.form.name": "Name",
+  "admin.registries.metadata.form.name": "İsim",
+  
+  // "admin.registries.metadata.form.namespace": "Namespace",
+  "admin.registries.metadata.form.namespace": "Ad Alanı",
+  
+  // "admin.registries.metadata.head": "Metadata Registry",
+  "admin.registries.metadata.head": "Metadata Kayıt Defteri",
+  
+  // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
+  "admin.registries.metadata.schemas.no-items": "Gösterilecek metadata alanı yok.",
+  
+  // "admin.registries.metadata.schemas.table.delete": "Delete selected",
+  "admin.registries.metadata.schemas.table.delete": "Silme Seçildi",
+  
+  // "admin.registries.metadata.schemas.table.id": "ID",
+  "admin.registries.metadata.schemas.table.id": "Kimlik",
+  
+  // "admin.registries.metadata.schemas.table.name": "Name",
+  "admin.registries.metadata.schemas.table.name": "İsim",
+  
+  // "admin.registries.metadata.schemas.table.namespace": "Namespace",
+  "admin.registries.metadata.schemas.table.namespace": "Ad Alanı",
+  
+  // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
+  "admin.registries.metadata.title": "DSpace Angular :: Metadata Kayıt Defteri",
+  
+  
+  
+  // "admin.registries.schema.breadcrumbs": "Metadata schema",
+  "admin.registries.schema.breadcrumbs": "Metadata şeması",
+  
+  // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
+  "admin.registries.schema.description": "Bu, \"{{namesapce}}\" için metadata şemasıdır.",
+  
+  // "admin.registries.schema.fields.head": "Schema metadata fields",
+  "admin.registries.schema.fields.head": "Şema metadata alanları",
+  
+  // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
+  "admin.registries.schema.fields.no-items": "Gösterilecek metadata alanı yok.",
+  
+  // "admin.registries.schema.fields.table.delete": "Delete selected",
+  "admin.registries.schema.fields.table.delete": "Silme Seçildi",
+  
+  // "admin.registries.schema.fields.table.field": "Field",
+  "admin.registries.schema.fields.table.field": "Alan",
+  
+  // "admin.registries.schema.fields.table.scopenote": "Scope Note",
+  "admin.registries.schema.fields.table.scopenote": "Kapsam Notu",
+  
+  // "admin.registries.schema.form.create": "Create metadata field",
+  "admin.registries.schema.form.create": "Metadata alanı oluştur",
+  
+  // "admin.registries.schema.form.edit": "Edit metadata field",
+  "admin.registries.schema.form.edit": "Metadata alanını düzenle",
+  
+  // "admin.registries.schema.form.element": "Element",
+  "admin.registries.schema.form.element": "Element",
+  
+  // "admin.registries.schema.form.qualifier": "Qualifier",
+  "admin.registries.schema.form.qualifier": "Niteleyici",
+  
+  // "admin.registries.schema.form.scopenote": "Scope Note",
+  "admin.registries.schema.form.scopenote": "Kapsam Notu",
+  
+  // "admin.registries.schema.head": "Metadata Schema",
+  "admin.registries.schema.head": "Metadata Şeması",
+  
+  // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.created": "Metadata şeması \"{{prefix}}\" başarıyla oluşturuldu",
+  
+  // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.failure": "{{amount}} metadata şeması silinemedi",
+  
+  // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.success": "{{amount}} metadata şeması başarıyla silindi",
+  
+  // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.edited": "Metadata şeması \"{{prefix}}\" başarıyla düzenlendi",
+  
+  // "admin.registries.schema.notification.failure": "Error",
+  "admin.registries.schema.notification.failure": "Hata",
+  
+  // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.created": "\"{{field}}\" metadata alanı başarıyla oluşturuldu",
+  
+  // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.failure": "{{amount}} metadata alanı silinemedi",
+  
+  // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.success": "{{amount}} metadata alanı başarıyla silindi",
+  
+  // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.edited": "Metadata alanı \"{{field}}\" başarıyla düzenlendi",
+  
+  // "admin.registries.schema.notification.success": "Success",
+  "admin.registries.schema.notification.success": "Başarılı",
+  
+  // "admin.registries.schema.return": "Return",
+  "admin.registries.schema.return": "Geri Dön",
+  
+  // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
+  "admin.registries.schema.title": "DSpace Angular :: Metadata Şeması Kayıt Defteri",
+  
+  
+  
+  // "admin.access-control.epeople.actions.delete": "Delete EPerson",
+  "admin.access-control.epeople.actions.delete": "E-Kişiyi Sil",
+  
+  // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
+  "admin.access-control.epeople.actions.impersonate": "E-Kişinin Kimliğine Bürün",
+  
+  // "admin.access-control.epeople.actions.reset": "Reset password",
+  "admin.access-control.epeople.actions.reset": "Parolayı sıfırla",
+  
+  // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
+  "admin.access-control.epeople.actions.stop-impersonating": "E-Kişilerin kimliğine bürünmeyi durdurun",
+  
+  // "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
+  "admin.access-control.epeople.title": "DSpace Angular :: E-kişiler",
+  
+  // "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.head": "E-Kişiler",
+  
+  // "admin.access-control.epeople.search.head": "Search",
+  "admin.access-control.epeople.search.head": "Ara",
+  
+  // "admin.access-control.epeople.button.see-all": "Tümüne Gözat",
+  "admin.access-control.epeople.button.see-all": "Browse All",
+  
+  // "admin.access-control.epeople.search.scope.metadata": "Metadata",
+  "admin.access-control.epeople.search.scope.metadata": "Metadata",
+  
+  // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  "admin.access-control.epeople.search.scope.email": "E-posta (tam)",
+  
+  // "admin.access-control.epeople.search.button": "Search",
+  "admin.access-control.epeople.search.button": "Ara",
+  
+  // "admin.access-control.epeople.button.add": "Add EPerson",
+  "admin.access-control.epeople.button.add": "E-Kişi Ekle",
+  
+  // "admin.access-control.epeople.table.id": "ID",
+  "admin.access-control.epeople.table.id": "Kimlik",
+  
+  // "admin.access-control.epeople.table.name": "Name",
+  "admin.access-control.epeople.table.name": "İsim",
+  
+  // "admin.access-control.epeople.table.email": "E-mail (exact)",
+  "admin.access-control.epeople.table.email": "E-posta (tam)",
+  
+  // "admin.access-control.epeople.table.edit": "Edit",
+  "admin.access-control.epeople.table.edit": "Düzenle",
+  
+  // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.edit": "Düzenle \"{{name}}\"",
+  
+  // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.remove": "Sil \"{{name}}\"",
+  
+  // "admin.access-control.epeople.no-items": "No EPeople to show.",
+  "admin.access-control.epeople.no-items": "Gösterilecek E-Kişiler yok.",
+  
+  // "admin.access-control.epeople.form.create": "Create EPerson",
+  "admin.access-control.epeople.form.create": "E-Kişi Oluştur",
+  
+  // "admin.access-control.epeople.form.edit": "Edit EPerson",
+  "admin.access-control.epeople.form.edit": "E-Kişiyi Düzenle",
+  
+  // "admin.access-control.epeople.form.firstName": "First name",
+  "admin.access-control.epeople.form.firstName": "İsim",
+  
+  // "admin.access-control.epeople.form.lastName": "Last name",
+  "admin.access-control.epeople.form.lastName": "Soyadı",
+  
+  // "admin.access-control.epeople.form.email": "E-mail",
+  "admin.access-control.epeople.form.email": "E-posta",
+  
+  // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  "admin.access-control.epeople.form.emailHint": "Geçerli bir e-posta adresi olmalı",
+  
+  // "admin.access-control.epeople.form.canLogIn": "Can log in",
+  "admin.access-control.epeople.form.canLogIn": "Giriş yapabilir",
+  
+  // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
+  "admin.access-control.epeople.form.requireCertificate": "Sertifika gerektirir",
+  
+  // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.success": "E-Kişi \"{{name}}\" başarıyla oluşturuldu",
+  
+  // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure": "E-Kişi \"{{name}}\" oluşturulamadı",
+  
+  // "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Failed to create EPerson \"{{name}}\", email \"{{email}}\" already in use.",
+  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "E-Kişi \"{{name}}\" oluşturulamadı, e-posta \"{{email}}\" zaten kullanımda.",
+  
+  // "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Failed to edit EPerson \"{{name}}\", email \"{{email}}\" already in use.",
+  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "E-Kişi \"{{name}}\" düzenlenemedi, e-posta \"{{email}}\" zaten kullanımda.",
+  
+  // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.success": "E-kişi \"{{name}}\" başarıyla düzenlendi",
+  
+  // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "E-Kişi \"{{name}}\" düzenlenemedi",
+  
+  // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.success": "E-Kişi \"{{name}}\" başarıyla silindi",
+  
+  // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "E-Kişi \"{{name}}\" silinemedi",
+  
+  // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Bu grupların üyesi:",
+  
+  // "admin.access-control.epeople.form.table.id": "ID",
+  "admin.access-control.epeople.form.table.id": "Kimlik",
+  
+  // "admin.access-control.epeople.form.table.name": "Name",
+  "admin.access-control.epeople.form.table.name": "İsim",
+  
+  // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
+  "admin.access-control.epeople.form.memberOfNoGroups": "Bu E-Kişi herhangi bir grubun üyesi değil",
+  
+  // "admin.access-control.epeople.form.goToGroups": "Add to groups",
+  "admin.access-control.epeople.form.goToGroups": "Gruplar ekle",
+  
+  // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "E-Kişi silinemedi: \"{{name}}\"",
+  
+  // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "E-Kişiler başarıyla silindi: \"{{name}}\"",
+  
+  
+  
+  // "admin.access-control.groups.title": "DSpace Angular :: Groups",
+  "admin.access-control.groups.title": "DSpace Angular :: Gruplar",
+  
+  // "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
+  "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Grubu Düzenle",
+  
+  // "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
+  "admin.access-control.groups.title.addGroup": "DSpace Angular :: Yeni Grup",
+  
+  // "admin.access-control.groups.head": "Groups",
+  "admin.access-control.groups.head": "Gruplar",
+  
+  // "admin.access-control.groups.button.add": "Add group",
+  "admin.access-control.groups.button.add": "Grup ekle",
+  
+  // "admin.access-control.groups.search.head": "Search groups",
+  "admin.access-control.groups.search.head": "Grupları ara",
+  
+  // "admin.access-control.groups.button.see-all": "Browse all",
+  "admin.access-control.groups.button.see-all": "Tümüne göz at",
+  
+  // "admin.access-control.groups.search.button": "Search",
+  "admin.access-control.groups.search.button": "Ara",
+  
+  // "admin.access-control.groups.table.id": "ID",
+  "admin.access-control.groups.table.id": "Kimlik",
+  
+  // "admin.access-control.groups.table.name": "Name",
+  "admin.access-control.groups.table.name": "İsim",
+  
+  // "admin.access-control.groups.table.members": "Members",
+  "admin.access-control.groups.table.members": "Üyeler",
+  
+  // "admin.access-control.groups.table.edit": "Edit",
+  "admin.access-control.groups.table.edit": "Düzenle",
+  
+  // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.edit": "Düzenle \"{{name}}\"",
+  
+  // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.remove": "Sil \"{{name}}\"",
+  
+  // "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
+  "admin.access-control.groups.no-items": "Bu adla veya bu UUID olarak hiçbir grup bulunamadı",
+  
+  // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.success": "\"{{name}}\" grubu başarıyla silindi",
+  
+  // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "\"{{name}}\" grubu silinemedi",
+  
+  // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
+  "admin.access-control.groups.notification.deleted.failure.content": "Sorun: \"{{cause}}\"",
+  
+  
+  
+  // "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
+  "admin.access-control.groups.form.alert.permanent": "Bu grup kalıcıdır, bu nedenle düzenlenemez veya silinemez. Yine de bu sayfayı kullanarak grup üyeleri ekleyip kaldırabilirsiniz.",
+  
+  // "admin.access-control.groups.form.alert.workflowGroup": "This group can’t be modified or deleted because it corresponds to a role in the submission and workflow process in the \"{{name}}\" {{comcol}}. You can delete it from the <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> tab on the edit {{comcol}} page. You can still add and remove group members using this page.",
+  "admin.access-control.groups.form.alert.workflowGroup": "Bu grup, \"{{name}}\" {{comcol}} içindeki gönderim ve iş akışı sürecindeki bir role karşılık geldiği için değiştirilemez veya silinemez. Bunu, {{comcol}} düzenleme sayfasındaki <a href='{{comcolEditRolesRoute}}'>\"rol ata\"</a> sekmesinden silebilirsiniz. Yine de bu sayfayı kullanarak grup üyeleri ekleyip kaldırabilirsiniz.",
+  
+  // "admin.access-control.groups.form.head.create": "Create group",
+  "admin.access-control.groups.form.head.create": "Grup oluştur",
+  
+  // "admin.access-control.groups.form.head.edit": "Edit group",
+  "admin.access-control.groups.form.head.edit": "Grubu düzenle",
+  
+  // "admin.access-control.groups.form.groupName": "Group name",
+  "admin.access-control.groups.form.groupName": "Grup adı",
+  
+  // "admin.access-control.groups.form.groupDescription": "Description",
+  "admin.access-control.groups.form.groupDescription": "Açıklama",
+  
+  // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.success": "Grup \"{{name}}\" başarıyla oluşturuldu",
+  
+  // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure": "\"{{name}}\" Grubu oluşturulamadı",
+  
+  // "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Failed to create Group with name: \"{{name}}\", make sure the name is not already in use.",
+  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Şu ada sahip Grup oluşturulamadı: \"{{name}}\", adın halihazırda kullanımda olmadığından emin olun.",
+  
+  // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.failure": "\"{{name}}\" Grubu düzenlenemedi",
+  
+  // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "\"{{name}}\" adı zaten kullanılıyor!",
+  
+  // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.success": "\"{{name}}\" Grubu başarıyla düzenlendi",
+  
+  // "admin.access-control.groups.form.actions.delete": "Delete Group",
+  "admin.access-control.groups.form.actions.delete": "Grubu Sil",
+  
+  // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.header": "\"{{ dsoName }}\" Grubunu Sil",
+  
+  // "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.info": "\"{{ dsoName }}\" Grubunu silmek istediğinizden emin misiniz?",
+  
+  // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
+  "admin.access-control.groups.form.delete-group.modal.cancel": "İptal",
+  
+  // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
+  "admin.access-control.groups.form.delete-group.modal.confirm": "Sil",
+  
+  // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.success": "\"{{ name }}\" grubu başarıyla silindi",
+  
+  // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "\"{{ name }}\" grubu silinemedi",
+  
+  // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.content": "Sorun: \"{{ cause }}\"",
+  
+  // "admin.access-control.groups.form.members-list.head": "EPeople",
+  "admin.access-control.groups.form.members-list.head": "E-Kişiler",
+  
+  // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
+  "admin.access-control.groups.form.members-list.search.head": "E-Kişiler Ekle",
+  
+  // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.members-list.button.see-all": "Tümüne Gözat",
+  
+  // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
+  "admin.access-control.groups.form.members-list.headMembers": "Mevcut Üyeler",
+  
+  // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
+  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
+  
+  // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
+  "admin.access-control.groups.form.members-list.search.scope.email": "E-posta (tam)",
+  
+  // "admin.access-control.groups.form.members-list.search.button": "Search",
+  "admin.access-control.groups.form.members-list.search.button": "Ara",
+  
+  // "admin.access-control.groups.form.members-list.table.id": "ID",
+  "admin.access-control.groups.form.members-list.table.id": "Kimlik",
+  
+  // "admin.access-control.groups.form.members-list.table.name": "Name",
+  "admin.access-control.groups.form.members-list.table.name": "İsim",
+  
+  // "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
+  "admin.access-control.groups.form.members-list.table.edit": "Kaldır / Ekle",
+  
+  // "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "\"{{name}}\" adlı üyeyi kaldırın",
+  
+  // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "Üye başarıyla eklendi: \"{{name}}\"",
+  
+  // "admin.access-control.groups.form.members-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.addMember": "Üye eklenemedi: \"{{name}}\"",
+  
+  // "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Üye başarıyla silindi: \"{{name}}\"",
+  
+  // "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Üye silinemedi: \"{{name}}\"",
+  
+  // "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "\"{{name}}\" adlı üye ekleyin",
+  
+  // "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "Mevcut aktif grup yok, önce bir isim gönderin.",
+  
+  // "admin.access-control.groups.form.members-list.no-members-yet": "No members in group yet, search and add.",
+  "admin.access-control.groups.form.members-list.no-members-yet": "Henüz grupta üye yok, arayın ve ekleyin.",
+  
+  // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
+  "admin.access-control.groups.form.members-list.no-items": "Bu aramada E-Kişiler bulunamadı",
+  
+  // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "Bir şeyler yanlış gitti: \"{{cause}}\"",
+  
+  // "admin.access-control.groups.form.subgroups-list.head": "Groups",
+  "admin.access-control.groups.form.subgroups-list.head": "Gruplar",
+  
+  // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
+  "admin.access-control.groups.form.subgroups-list.search.head": "Alt Grup Ekle",
+  
+  // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Tümüne Gözat",
+  
+  // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Mevcut Alt Gruplar",
+  
+  // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
+  "admin.access-control.groups.form.subgroups-list.search.button": "Ara",
+  
+  // "admin.access-control.groups.form.subgroups-list.table.id": "ID",
+  "admin.access-control.groups.form.subgroups-list.table.id": "Kimlik",
+  
+  // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
+  "admin.access-control.groups.form.subgroups-list.table.name": "İsim",
+  
+  // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
+  "admin.access-control.groups.form.subgroups-list.table.edit": "Kaldır / Ekle",
+  
+  // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "\"{{name}}\" adlı alt grubu kaldırın",
+  
+  // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "\"{{name}}\" adlı alt grup ekleyin",
+  
+  // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
+  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Mevcut grup",
+  
+  // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Alt grup başarıyla eklendi: \"{{name}}\"",
+  
+  // "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Alt grup eklenemedi: \"{{name}}\"",
+  
+  // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Alt grup başarıyla silindi: \"{{name}}\"",
+  
+  // "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Alt grup silinemedi: \"{{name}}\"",
+  
+  // "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "Aktif grup mevcut değil, önce bir isim gönderin.",
+  
+  // "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "This is the current group, can't be added.",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "Bu grup mevcut, eklenemez.",
+  
+  // "admin.access-control.groups.form.subgroups-list.no-items": "No groups found with this in their name or this as UUID",
+  "admin.access-control.groups.form.subgroups-list.no-items": "Bu adla veya bu UUID olarak hiçbir grup bulunamadı",
+  
+  // "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
+  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Henüz grupta alt grup yok.",
+  
+  // "admin.access-control.groups.form.return": "Return to groups",
+  "admin.access-control.groups.form.return": "Gruplara dön",
+  
+  
+  
+  // "admin.search.breadcrumbs": "Administrative Search",
+  "admin.search.breadcrumbs": "Yönetimsel Arama",
+  
+  // "admin.search.collection.edit": "Edit",
+  "admin.search.collection.edit": "Düzenle",
+  
+  // "admin.search.community.edit": "Edit",
+  "admin.search.community.edit": "Düzenle",
+  
+  // "admin.search.item.delete": "Delete",
+  "admin.search.item.delete": "Sil",
+  
+  // "admin.search.item.edit": "Edit",
+  "admin.search.item.edit": "Düzenle",
+  
+  // "admin.search.item.make-private": "Make Private",
+  "admin.search.item.make-private": "Özel yap",
+  
+  // "admin.search.item.make-public": "Make Public",
+  "admin.search.item.make-public": "Ortak yap",
+  
+  // "admin.search.item.move": "Move",
+  "admin.search.item.move": "Taşı",
+  
+  // "admin.search.item.reinstate": "Reinstate",
+  "admin.search.item.reinstate": "Eski durumuna getir",
+  
+  // "admin.search.item.withdraw": "Withdraw",
+  "admin.search.item.withdraw": "Çekil",
+  
+  // "admin.search.title": "Administrative Search",
+  "admin.search.title": "Yönetimsel Arama",
+  
+  // "administrativeView.search.results.head": "Administrative Search",
+  "administrativeView.search.results.head": "Yönetimsel Arama",
+  
+  
+  
+  
+  // "admin.workflow.breadcrumbs": "Administer Workflow",
+  "admin.workflow.breadcrumbs": "İş Akışını Yönet",
+  
+  // "admin.workflow.title": "Administer Workflow",
+  "admin.workflow.title": "İş Akışını Yönet",
+  
+  // "admin.workflow.item.workflow": "Workflow",
+  "admin.workflow.item.workflow": "İş akışı",
+  
+  // "admin.workflow.item.delete": "Delete",
+  "admin.workflow.item.delete": "Sil",
+  
+  // "admin.workflow.item.send-back": "Send back",
+  "admin.workflow.item.send-back": "Geri gönder",
+  
+  
+  
+  // "admin.metadata-import.breadcrumbs": "Import Metadata",
+  "admin.metadata-import.breadcrumbs": "Metadataları İçe Aktar",
+  
+  // "admin.metadata-import.title": "Import Metadata",
+  "admin.metadata-import.title": "Metadataları İçe Aktar",
+  
+  // "admin.metadata-import.page.header": "Import Metadata",
+  "admin.metadata-import.page.header": "Metadataları İçe Aktar",
+  
+  // "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
+  "admin.metadata-import.page.help": "Dosyalarda toplu metadata işlemleri içeren CSV dosyalarını buraya bırakabilir veya bunlara göz atabilirsiniz.",
+  
+  // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
+  "admin.metadata-import.page.dropMsg": "İçe aktarmak için bir metadata CSV'si bırakın",
+  
+  // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
+  "admin.metadata-import.page.dropMsgReplace": "İçe aktarılacak CSV metadatalarını değiştirmek için bırakın",
+  
+  // "admin.metadata-import.page.button.return": "Return",
+  "admin.metadata-import.page.button.return": "Geri Dön",
+  
+  // "admin.metadata-import.page.button.proceed": "Proceed",
+  "admin.metadata-import.page.button.proceed": "Devam Et",
+  
+  // "admin.metadata-import.page.error.addFile": "Select file first!",
+  "admin.metadata-import.page.error.addFile": "Önce dosyayı seçin!",
+  
+  
+  
+  
+  // "auth.errors.invalid-user": "Invalid email address or password.",
+  "auth.errors.invalid-user": "Geçersiz e-posta adresi veya parola.",
+  
+  // "auth.messages.expired": "Your session has expired. Please log in again.",
+  "auth.messages.expired": "Oturumunuz sona erdi. Lütfen tekrar giriş yapın.",
+  
+  
+  
+  // "bitstream.edit.bitstream": "Bitstream: ",
+  "bitstream.edit.bitstream": "Bitstream: ",
+  
+  // "bitstream.edit.form.description.hint": "Optionally, provide a brief description of the file, for example \"<i>Main article</i>\" or \"<i>Experiment data readings</i>\".",
+  "bitstream.edit.form.description.hint": "İsteğe bağlı olarak, dosyanın kısa bir açıklamasını sağlayın, örneğin \"<i>Ana makale</i>\" veya \"<i>Deneme veri okumaları</i>\".",
+  
+  // "bitstream.edit.form.description.label": "Description",
+  "bitstream.edit.form.description.label": "Açıklama",
+  
+  // "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. <b>This date cannot be modified on this form.</b> To set an embargo date for a bitstream, go to the <i>Item Status</i> tab, click <i>Authorizations...</i>, create or edit the bitstream's <i>READ</i> policy, and set the <i>Start Date</i> as desired.",
+  "bitstream.edit.form.embargo.hint": "Erişime izin verilen ilk gün. <b>Bu tarih bu formda değiştirilemez.</b> Bir bitstream için bir ambargo tarihi ayarlamak için <i>Öğe Durumu</i> sekmesine gidin, <i>Yetkiler...</i>'i tıklayın., bitstreamın <i>OKU</i> politikasını oluşturun veya düzenleyin ve <i>Başlangıç ​​Tarihi</i>'ni istediğiniz gibi ayarlayın.",
+  
+  // "bitstream.edit.form.embargo.label": "Embargo until specific date",
+  "bitstream.edit.form.embargo.label": "Belirli bir tarihe kadar ambargo",
+  
+  // "bitstream.edit.form.fileName.hint": "Change the filename for the bitstream. Note that this will change the display bitstream URL, but old links will still resolve as long as the sequence ID does not change.",
+  "bitstream.edit.form.fileName.hint": "Bitstreamın dosya adını değiştirin. Bunun görünen bitstream URL'sini değiştireceğini, ancak dizi kimliği değişmediği sürece eski bağlantıların çözüleceğini unutmayın.",
+  
+  // "bitstream.edit.form.fileName.label": "Filename",
+  "bitstream.edit.form.fileName.label": "Dosya adı",
+  
+  // "bitstream.edit.form.newFormat.label": "Describe new format",
+  "bitstream.edit.form.newFormat.label": "Yeni biçimi tanımla",
+  
+  // "bitstream.edit.form.newFormat.hint": "The application you used to create the file, and the version number (for example, \"<i>ACMESoft SuperApp version 1.5</i>\").",
+  "bitstream.edit.form.newFormat.hint": "Dosyayı oluşturmak için kullandığınız uygulama ve sürüm numarası (örneğin, \"<i>ACMESoft SuperApp versiyon 1.5</i>\").",
+  
+  // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
+  "bitstream.edit.form.primaryBitstream.label": "Birincil bitstream",
+  
+  // "bitstream.edit.form.selectedFormat.hint": "If the format is not in the above list, <b>select \"format not in list\" above</b> and describe it under \"Describe new format\".",
+  "bitstream.edit.form.selectedFormat.hint": "Biçim yukarıdaki listede yoksa, <b>select \"listede olmayan biçim\"i above</b> ve \"Yeni biçimi tanımla\" altında açıklayın.",
+  
+  // "bitstream.edit.form.selectedFormat.label": "Selected Format",
+  "bitstream.edit.form.selectedFormat.label": "Seçilen Biçim",
+  
+  // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
+  "bitstream.edit.form.selectedFormat.unknown": "Listede olmayan biçim",
+  
+  // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
+  "bitstream.edit.notifications.error.format.title": "Bitstreamın biçimi kaydedilirken bir hata oluştu",
+  
+  // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
+  "bitstream.edit.notifications.saved.content": "Bu bitstreamda yaptığınız değişiklikler kaydedildi.",
+  
+  // "bitstream.edit.notifications.saved.title": "Bitstream saved",
+  "bitstream.edit.notifications.saved.title": "Bitstream kaydedildi",
+  
+  // "bitstream.edit.title": "Edit bitstream",
+  "bitstream.edit.title": "Bitstreamı düzenle",
+  
+  
+  
+  // "browse.comcol.by.author": "By Author",
+  "browse.comcol.by.author": "Yazara Göre",
+  
+  // "browse.comcol.by.dateissued": "By Issue Date",
+  "browse.comcol.by.dateissued": "Yayın Tarihine Göre",
+  
+  // "browse.comcol.by.subject": "By Subject",
+  "browse.comcol.by.subject": "Konuya Göre",
+  
+  // "browse.comcol.by.title": "By Title",
+  "browse.comcol.by.title": "Başlığa Göre",
+  
+  // "browse.comcol.head": "Browse",
+  "browse.comcol.head": "Gözat",
+  
+  // "browse.empty": "No items to show.",
+  "browse.empty": "Gösterilecek öğe yok.",
+  
+  // "browse.metadata.author": "Author",
+  "browse.metadata.author": "Yazar",
+  
+  // "browse.metadata.dateissued": "Issue Date",
+  "browse.metadata.dateissued": "Yayın Tarihi",
+  
+  // "browse.metadata.subject": "Subject",
+  "browse.metadata.subject": "Konu",
+  
+  // "browse.metadata.title": "Title",
+  "browse.metadata.title": "Başlık",
+  
+  // "browse.metadata.author.breadcrumbs": "Browse by Author",
+  "browse.metadata.author.breadcrumbs": "Yazara Göre Gözat",
+  
+  // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
+  "browse.metadata.dateissued.breadcrumbs": "Tarihe Göre Gözat",
+  
+  // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
+  "browse.metadata.subject.breadcrumbs": "Konuya Göre Gözat",
+  
+  // "browse.metadata.title.breadcrumbs": "Browse by Title",
+  "browse.metadata.title.breadcrumbs": "Başlığa göre göz atın",
+  
+  // "browse.startsWith.choose_start": "(Choose start)",
+  "browse.startsWith.choose_start": "(Başlangıç seç)",
+  
+  // "browse.startsWith.choose_year": "(Choose year)",
+  "browse.startsWith.choose_year": "(Yıl seç)",
+  
+  // "browse.startsWith.jump": "Jump to a point in the index:",
+  "browse.startsWith.jump": "Dizinde bir noktaya atla:",
+  
+  // "browse.startsWith.months.april": "April",
+  "browse.startsWith.months.april": "Nisan",
+  
+  // "browse.startsWith.months.august": "August",
+  "browse.startsWith.months.august": "Ağustos",
+  
+  // "browse.startsWith.months.december": "December",
+  "browse.startsWith.months.december": "Aralık",
+  
+  // "browse.startsWith.months.february": "February",
+  "browse.startsWith.months.february": "Şubat",
+  
+  // "browse.startsWith.months.january": "January",
+  "browse.startsWith.months.january": "Ocak",
+  
+  // "browse.startsWith.months.july": "July",
+  "browse.startsWith.months.july": "Temmuz",
+  
+  // "browse.startsWith.months.june": "June",
+  "browse.startsWith.months.june": "Haziran",
+  
+  // "browse.startsWith.months.march": "March",
+  "browse.startsWith.months.march": "Mart",
+  
+  // "browse.startsWith.months.may": "May",
+  "browse.startsWith.months.may": "Mayıs",
+  
+  // "browse.startsWith.months.none": "(Choose month)",
+  "browse.startsWith.months.none": "(Ay seçin)",
+  
+  // "browse.startsWith.months.november": "November",
+  "browse.startsWith.months.november": "Kasım",
+  
+  // "browse.startsWith.months.october": "October",
+  "browse.startsWith.months.october": "Ekim",
+  
+  // "browse.startsWith.months.september": "September",
+  "browse.startsWith.months.september": "Eylül",
+  
+  // "browse.startsWith.submit": "Go",
+  "browse.startsWith.submit": "Git",
+  
+  // "browse.startsWith.type_date": "Or type in a date (year-month):",
+  "browse.startsWith.type_date": "Veya bir tarih yazın (yıl-ay):",
+  
+  // "browse.startsWith.type_text": "Or enter first few letters:",
+  "browse.startsWith.type_text": "Veya ilk birkaç harfi girin:",
+  
+  // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  "browse.title": "{{ field }} {{ value }} ile {{ collection }}'a göz atma",
+  
+  
+  // "chips.remove": "Remove chip",
+  "chips.remove": "Çipi kaldır",
+  
+  
+  
+  // "collection.create.head": "Create a Collection",
+  "collection.create.head": "Koleksiyon Oluştur",
+  
+  // "collection.create.notifications.success": "Successfully created the Collection",
+  "collection.create.notifications.success": "Koleksiyon başarıyla oluşturuldu",
+  
+  // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
+  "collection.create.sub-head": "Komünite için Koleksiyon Oluşturun {{ parent }}",
+  
+  // "collection.curate.header": "Curate Collection: {{collection}}",
+  "collection.curate.header": "Koleksiyonu Düzenle: {{collection}}",
+  
+  // "collection.delete.cancel": "Cancel",
+  "collection.delete.cancel": "İptal",
+  
+  // "collection.delete.confirm": "Confirm",
+  "collection.delete.confirm": "Onayla",
+  
+  // "collection.delete.head": "Delete Collection",
+  "collection.delete.head": "Koleksiyonu sil",
+  
+  // "collection.delete.notification.fail": "Collection could not be deleted",
+  "collection.delete.notification.fail": "Koleksiyon silinemedi",
+  
+  // "collection.delete.notification.success": "Successfully deleted collection",
+  "collection.delete.notification.success": "Koleksiyon başarıyla silindi",
+  
+  // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
+  "collection.delete.text": "\"{{ dso }}\" koleksiyonunu silmek istediğinizden emin misiniz?",
+  
+  
+  
+  // "collection.edit.delete": "Delete this collection",
+  "collection.edit.delete": "Bu koleksiyonu sil",
+  
+  // "collection.edit.head": "Edit Collection",
+  "collection.edit.head": "Koleksiyonu Düzenle",
+  
+  // "collection.edit.breadcrumbs": "Edit Collection",
+  "collection.edit.breadcrumbs": "Koleksiyonu Düzenle",
+  
+  
+  
+  // "collection.edit.tabs.mapper.head": "Item Mapper",
+  "collection.edit.tabs.mapper.head": "Öğe eşleştirici",
+  
+  // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
+  "collection.edit.tabs.item-mapper.title": "Koleksiyon Düzenleme - Öğe Eşleştirici",
+  
+  // "collection.edit.item-mapper.cancel": "Cancel",
+  "collection.edit.item-mapper.cancel": "İptal",
+  
+  // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
+  "collection.edit.item-mapper.collection": "Koleksiyon: \"<b>{{name}}</b>\"",
+  
+  // "collection.edit.item-mapper.confirm": "Map selected items",
+  "collection.edit.item-mapper.confirm": "Seçilen öğeleri eşle",
+  
+  // "collection.edit.item-mapper.description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.",
+  "collection.edit.item-mapper.description": "Bu, koleksiyon yöneticilerinin diğer koleksiyonlardaki öğeleri bu koleksiyona eşlemelerine olanak tanıyan öğe eşleyici aracıdır. Diğer koleksiyonlardaki öğeleri arayabilir ve bunları eşleyebilir veya şu anda eşlenmiş öğelerin listesine göz atabilirsiniz.",
+  
+  // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
+  "collection.edit.item-mapper.head": "Öğe Eşleştirici - Diğer Koleksiyonlardaki Öğeleri Eşle",
+  
+  // "collection.edit.item-mapper.no-search": "Please enter a query to search",
+  "collection.edit.item-mapper.no-search": "Lütfen aramak için bir sorgu girin",
+  
+  // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.error.content": "{{amount}} öğenin eşlenmesinde hatalar oluştu.",
+  
+  // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
+  "collection.edit.item-mapper.notifications.map.error.head": "Eşleme hataları",
+  
+  // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.success.content": "{{amount}} öğe başarıyla eşlendi.",
+  
+  // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
+  "collection.edit.item-mapper.notifications.map.success.head": "Eşleme tamamlandı",
+  
+  // "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.error.content": "{{amount}} öğenin eşlemeleri kaldırılırken hatalar oluştu.",
+  
+  // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
+  "collection.edit.item-mapper.notifications.unmap.error.head": "Eşleme hatalarını kaldır",
+  
+  // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "{{amount}} öğenin eşlemeleri başarıyla kaldırıldı.",
+  
+  // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
+  "collection.edit.item-mapper.notifications.unmap.success.head": "Eşlemeyi kaldır tamamlandı",
+  
+  // "collection.edit.item-mapper.remove": "Remove selected item mappings",
+  "collection.edit.item-mapper.remove": "Seçili öğe eşlemelerini kaldır",
+  
+  // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
+  "collection.edit.item-mapper.tabs.browse": "Eşlenen öğelere göz atın",
+  
+  // "collection.edit.item-mapper.tabs.map": "Map new items",
+  "collection.edit.item-mapper.tabs.map": "Yeni öğeleri işle",
+  
+  
+  
+  // "collection.edit.logo.label": "Collection logo",
+  "collection.edit.logo.label": "Koleksiyon logosu",
+
+  // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
+  "collection.edit.logo.notifications.add.error": "Koleksiyon logosu yüklemesi başarısız. Lütfen yeniden denemeden önce içeriği doğrulayın.",
+  
+  // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
+  "collection.edit.logo.notifications.add.success": "Koleksiyon logosu yüklemesi başarılı.",
+  
+  // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "collection.edit.logo.notifications.delete.success.title": "Logo silindi",
+  
+  // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
+  "collection.edit.logo.notifications.delete.success.content": "Koleksiyonun logosunu başarıyla silindi",
+  
+  // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
+  "collection.edit.logo.notifications.delete.error.title": "Logo silinirken hata",
+  
+  // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
+  "collection.edit.logo.upload": "Yüklenecek bir koleksiyon logosu bırakın",
+  
+  
+  
+  // "collection.edit.notifications.success": "Successfully edited the Collection",
+  "collection.edit.notifications.success": "Koleksiyon başarıyla düzenlendi.",
+  
+  // "collection.edit.return": "Return",
+  "collection.edit.return": "Dönüş",
+  
+  
+  
+  // "collection.edit.tabs.curate.head": "Curate",
+  "collection.edit.tabs.curate.head": "Kuratör",
+  
+  // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
+  "collection.edit.tabs.curate.title": "Koleksiyon düzenleme - Küratör",
+  
+  // "collection.edit.tabs.authorizations.head": "Authorizations",
+  "collection.edit.tabs.authorizations.head": "Yetkilendirmeler",
+  
+  // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
+  "collection.edit.tabs.authorizations.title": "Koleksiyon düzenleme - Yetkilendirmeler",
+  
+  // "collection.edit.tabs.metadata.head": "Edit Metadata",
+  "collection.edit.tabs.metadata.head": "Metadataları Düzenle",
+  
+  // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
+  "collection.edit.tabs.metadata.title": "Koleksiyon Düzenle - Metadatalar",
+  
+  // "collection.edit.tabs.roles.head": "Assign Roles",
+  "collection.edit.tabs.roles.head": "Rol atamak",
+  
+  // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
+  "collection.edit.tabs.roles.title": "Koleksiyon düzenleme - Roller",
+  
+  // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
+  "collection.edit.tabs.source.external": "Bu koleksiyon içeriğini harici bir kaynaktan toplar",
+  
+  // "collection.edit.tabs.source.form.errors.oaiSource.required": "You must provide a set id of the target collection.",
+  "collection.edit.tabs.source.form.errors.oaiSource.required": "Hedef koleksiyonuna bir set kimliği sağlamalısınız.",
+  
+  // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
+  "collection.edit.tabs.source.form.harvestType": "İçerik harmanlanıyor",
+  
+  // "collection.edit.tabs.source.form.head": "Configure an external source",
+  "collection.edit.tabs.source.form.head": "Harici bir kaynak yapılandır",
+  
+  // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
+  "collection.edit.tabs.source.form.metadataConfigId": "Metadata formatı",
+  
+  // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
+  "collection.edit.tabs.source.form.oaiSetId": "OAI'ya Özel Set Kimliği",
+  
+  // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
+  "collection.edit.tabs.source.form.oaiSource": "OAI Sağlayıcısı",
+  
+  // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadata and bitstreams (requires ORE support)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Metadatalarını ve bitstreamı topla (ORE desteği gerektirir)",
+  
+  // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest metadata and references to bitstreams (ORE desteği gerektirir)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Metadatalarını ve referansları topla (ORE desteği gerektirir)",
+  
+  // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Sadece metadatalarını topla",
+  
+  // "collection.edit.tabs.source.head": "Content Source",
+  "collection.edit.tabs.source.head": "İçerik Kaynağı",
+  
+  // "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "collection.edit.tabs.source.notifications.discarded.content": "Değişiklikleriniz silindi. Değişikliklerinizi eski haline getirmek için 'Geri Al' düğmesine tıklayın.",
+  
+  // "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
+  "collection.edit.tabs.source.notifications.discarded.title": "Silinenler değiştirildi.",
+  
+  // "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
+  "collection.edit.tabs.source.notifications.invalid.content": "Değişiklikleriniz kaydedilmedi. Lütfen kaydetmeden önce tüm alanların geçerli olduğundan emin olun.",
+  
+  // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
+  "collection.edit.tabs.source.notifications.invalid.title": "Metadata geçersiz",
+  
+  // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
+  "collection.edit.tabs.source.notifications.saved.content": "Bu koleksiyonun içerik kaynağındaki değişiklikleriniz kaydedildi.",
+  
+  // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
+  "collection.edit.tabs.source.notifications.saved.title": "İçerik Kaynağı kaydedildi",
+  
+  // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
+  "collection.edit.tabs.source.title": "Koleksiyon düzenleme - İçerik Kaynağı",
+  
+  
+  
+  // "collection.edit.template.add-button": "Add",
+  "collection.edit.template.add-button": "Ekle",
+  
+  // "collection.edit.template.breadcrumbs": "Item template",
+  "collection.edit.template.breadcrumbs": "Öğe şablonu",
+  
+  // "collection.edit.template.cancel": "Cancel",
+  "collection.edit.template.cancel": "İptal",
+  
+  // "collection.edit.template.delete-button": "Delete",
+  "collection.edit.template.delete-button": "Sil",
+  
+  // "collection.edit.template.edit-button": "Edit",
+  "collection.edit.template.edit-button": "Düzenle",
+  
+  // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
+  "collection.edit.template.head": "Koleksiyon için Sablon Öğesini Düzenleyin \"{{ collection }}\"",
+  
+  // "collection.edit.template.label": "Template item",
+  "collection.edit.template.label": "Şablon öğe",
+  
+  // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
+  "collection.edit.template.notifications.delete.error": "Öğe şablonu silme başarısız",
+  
+  // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
+  "collection.edit.template.notifications.delete.success": "Öğe şablonu başarıyla silindi",
+  
+  // "collection.edit.template.title": "Edit Template Item",
+  "collection.edit.template.title": "Şablon Öğesini Düzenle",
+  
+  
+  
+  // "collection.form.abstract": "Short Description",
+  "collection.form.abstract": "Kısa Açıklama",
+  
+  // "collection.form.description": "Introductory text (HTML)",
+  "collection.form.description": "Tanıtım metni (HTML)",
+  
+  // "collection.form.errors.title.required": "Please enter a collection name",
+  "collection.form.errors.title.required": "Lütfen bir koleksiyon adı girin",
+  
+  // "collection.form.license": "License",
+  "collection.form.license": "Lisans",
+  
+  // "collection.form.provenance": "Provenance",
+  "collection.form.provenance": "Menşei",
+  
+  // "collection.form.rights": "Copyright text (HTML)",
+  "collection.form.rights": "Telif hakkı metni (HTML)",
+  
+  // "collection.form.tableofcontents": "News (HTML)",
+  "collection.form.tableofcontents": "Haberler (HTML)",
+  
+  // "collection.form.title": "Name",
+  "collection.form.title": "İsim",
+  
+  
+  
+  // "collection.listelement.badge": "Collection",
+  "collection.listelement.badge": "Koleksiyon",
+  
+  
+  
+  // "collection.page.browse.recent.head": "Recent Submissions",
+  "collection.page.browse.recent.head": "Son Başvurular",
+  
+  // "collection.page.browse.recent.empty": "No items to show",
+  "collection.page.browse.recent.empty": "Gösterilecek öğe yok",
+  
+  // "collection.page.edit": "Edit this collection",
+  "collection.page.edit": "Bu koleksiyonu düzenleyin",
+  
+  // "collection.page.handle": "Permanent URI for this collection",
+  "collection.page.handle": "Bu koleksiyon için kalıcı URI",
+  
+  // "collection.page.license": "License",
+  "collection.page.license": "Lisans",
+  
+  // "collection.page.news": "News",
+  "collection.page.news": "Haberler",
+  
+  
+  
+  // "collection.select.confirm": "Confirm selected",
+  "collection.select.confirm": "Seçilileri onayla",
+  
+  // "collection.select.empty": "No collections to show",
+  "collection.select.empty": "Gösterilecek koleksiyon yok",
+  
+  // "collection.select.table.title": "Title",
+  "collection.select.table.title": "Başlık",
+  
+  
+  
+  // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
+  "collection.source.update.notifications.error.content": "Sağlanan ayarlar test edildi ve işe yaramadı.",
+  
+  // "collection.source.update.notifications.error.title": "Server Error",
+  "collection.source.update.notifications.error.title": "Sunucu Hatası",
+  
+  
+  
+  // "communityList.tabTitle": "DSpace - Community List",
+  "communityList.tabTitle": "DSpace - Komünite Listesi",
+  
+  // "communityList.title": "List of Communities",
+  "communityList.title": "Komünitelerin Listesi",
+  
+  // "communityList.showMore": "Show More",
+  "communityList.showMore": "Daha fazla göster",
+  
+  
+  
+  // "community.create.head": "Create a Community",
+  "community.create.head": "Bir komünite oluştur",
+  
+  // "community.create.notifications.success": "Successfully created the Community",
+  "community.create.notifications.success": "Komünite başarıyla yaratıldı",
+  
+  // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
+  "community.create.sub-head": "Komünite için bir alt komünite oluşturun {{ parent }}",
+  
+  // "community.curate.header": "Curate Community: {{community}}",
+  "community.curate.header": "Kuratör komünitesi: {{community}}",
+  
+  // "community.delete.cancel": "Cancel",
+  "community.delete.cancel": "İptal",
+  
+  // "community.delete.confirm": "Confirm",
+  "community.delete.confirm": "Onayla",
+  
+  // "community.delete.head": "Delete Community",
+  "community.delete.head": "Komüniteyi sil",
+  
+  // "community.delete.notification.fail": "Community could not be deleted",
+  "community.delete.notification.fail": "Komünite silinemedi",
+  
+  // "community.delete.notification.success": "Successfully deleted community",
+  "community.delete.notification.success": "Komünite başarıyla silindi",
+  
+  // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
+  "community.delete.text": "Komüniteyi silmek istediğinize emin misiniz \"{{ dso }}\"",
+  
+  // "community.edit.delete": "Delete this community",
+  "community.edit.delete": "Bu komüniteyi sil",
+  
+  // "community.edit.head": "Edit Community",
+  "community.edit.head": "Komüniteyi düzenle",
+  
+  // "community.edit.breadcrumbs": "Edit Community",
+  "community.edit.breadcrumbs": "Komüniteyi düzenle",
+  
+  
+  // "community.edit.logo.label": "Community logo",
+  "community.edit.logo.label": "Komünite logosu",
+  
+  // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  "community.edit.logo.notifications.add.error": "Komünite logosu yüklemesi başarısız. Lütfen yeniden denemeden önce içeriği doğrulayın.",
+  
+  // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
+  "community.edit.logo.notifications.add.success": "Komünite logosunu başarılı yükle.",
+  
+  // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "community.edit.logo.notifications.delete.success.title": "Logo silindi",
+  
+  // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
+  "community.edit.logo.notifications.delete.success.content": "Komünite logosu başarıyla silindi",
+  
+  // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
+  "community.edit.logo.notifications.delete.error.title": "Logo silme hatası",
+  
+  // "community.edit.logo.upload": "Drop a Community Logo to upload",
+  "community.edit.logo.upload": "Yüklenecek bir komünite logosu bırak",
+  
+  
+  
+  // "community.edit.notifications.success": "Successfully edited the Community",
+  "community.edit.notifications.success": "Komünite başarıyla düzenlendi",
+  
+  // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
+  "community.edit.notifications.unauthorized": "Bu değişikliği yapmak için ayrıcalıklarınız yok",
+  
+  // "community.edit.notifications.error": "An error occured while editing the Community",
+  "community.edit.notifications.error": "Komüniteyi düzenlerken bir hata oluştu",
+  
+  // "community.edit.return": "Return",
+  "community.edit.return": "Dönüş",
+  
+  
+  
+  // "community.edit.tabs.curate.head": "Curate",
+  "community.edit.tabs.curate.head": "Kuratör",
+  
+  // "community.edit.tabs.curate.title": "Community Edit - Curate",
+  "community.edit.tabs.curate.title": "Komünite Düzenle - Küratör",
+  
+  // "community.edit.tabs.metadata.head": "Edit Metadata",
+  "community.edit.tabs.metadata.head": "Metadataları Düzenle",
+  
+  // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
+  "community.edit.tabs.metadata.title": "Komünite Düzenle - Metadatalar",
+  
+  // "community.edit.tabs.roles.head": "Assign Roles",
+  "community.edit.tabs.roles.head": "Rol atamak",
+  
+  // "community.edit.tabs.roles.title": "Community Edit - Roles",
+  "community.edit.tabs.roles.title": "Komünite Düzenle - Roller",
+  
+  // "community.edit.tabs.authorizations.head": "Authorizations",
+  "community.edit.tabs.authorizations.head": "Yetkilendirmeler",
+  
+  // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
+  "community.edit.tabs.authorizations.title": "Komünite Düzenle - Yetkilendirmeler",
+  
+  
+  
+  // "community.listelement.badge": "Community",
+  "community.listelement.badge": "Komünite",
+  
+  
+  
+  // "comcol-role.edit.no-group": "None",
+  "comcol-role.edit.no-group": "Hiçbiri",
+  
+  // "comcol-role.edit.create": "Create",
+  "comcol-role.edit.create": "Oluştur",
+  
+  // "comcol-role.edit.restrict": "Restrict",
+  "comcol-role.edit.restrict": "Kısıtla",
+  
+  // "comcol-role.edit.delete": "Delete",
+  "comcol-role.edit.delete": "Sil",
+  
+  
+  // "comcol-role.edit.community-admin.name": "Yöneticiler",
+  "comcol-role.edit.community-admin.name": "Administrators",
+  
+  // "comcol-role.edit.collection-admin.name": "Administrators",
+  "comcol-role.edit.collection-admin.name": "Yöneticiler",
+  
+  
+  // "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
+  "comcol-role.edit.community-admin.description": "Komünite yöneticileri alt komüniteler veya koleksiyonlar oluşturabilir ve bu alt komüniteler veya koleksiyonlar için yönetimi yönetebilir veya atayabilir. Ek olarak, kimsenin herhangi bir alt koleksiyona kimin gönderebileceğine, madde metadatalarını (sunulduktan sonra) düzenleyebileceğine karar verirler ve mevcut eşyaları diğer koleksiyonlardan (yetkilendirmeye tabi) ekleyin.",
+  
+  // "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).",
+  "comcol-role.edit.collection-admin.description": "Koleksiyon yöneticileri, eşyaları koleksiyona kimin gönderebileceğine, öğe metadatalarını (gönderimden sonra) düzenleyebileceğine karar verir ve mevcut eşyaları diğer koleksiyonlardan (bu koleksiyon için yetkilendirmeye tabi) ekleyin.",
+  
+  
+  // "comcol-role.edit.submitters.name": "Submitters",
+  "comcol-role.edit.submitters.name": "Göndericiler",
+  
+  // "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.",
+  "comcol-role.edit.submitters.description": "Bu koleksiyona yeni eşya gönderme iznine sahip olan E-insanlar ve gruplar.",
+  
+  
+  // "comcol-role.edit.item_read.name": "Default item read access",
+  "comcol-role.edit.item_read.name": "Varsayılan öğe okuma erişimi",
+  
+  // "comcol-role.edit.item_read.description": "E-People and Groups that can read new items submitted to this collection. Changes to this role are not retroactive. Existing items in the system will still be viewable by those who had read access at the time of their addition.",
+  "comcol-role.edit.item_read.description": "Bu koleksiyona sunulan yeni eşyaları okuyabilen E-insanlar ve gruplar. Bu roldeki değişiklikler geriye dönük değildir. Sistemdeki mevcut eşyalar, eklemeleri sırasında erişimi okuyanlar tarafından görülebilir.",
+  
+  // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
+  "comcol-role.edit.item_read.anonymous-group": "Gelen öğeler için varsayılan okuma şu anda isimsiz olarak ayarlanmıştır.",
+  
+  
+  // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
+  "comcol-role.edit.bitstream_read.name": "Varsayılan bitstream okuma erişimi",
+  
+  // "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
+  "comcol-role.edit.bitstream_read.description": "Komünite yöneticileri alt komüniteler veya koleksiyonlar oluşturabilir ve bu alt komüniteler veya koleksiyonlar için yönetimi yönetebilir veya atayabilirler. Ek olarak, eşyaları herhangi bir alt koleksiyona kimin gönderebileceğine, öğe metadatalarını (sunulduktan sonra) düzenleyebilir ve harita) Diğer koleksiyonlardan gelen mevcut eşyalar (yetkilendirmeye tabi).",
+  
+  // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
+  "comcol-role.edit.bitstream_read.anonymous-group": "Gelen bitstream için varsayılan okuma şu anda anonim olarak ayarlanmıştır.",
+  
+  
+  // "comcol-role.edit.editor.name": "Editors",
+  "comcol-role.edit.editor.name": "Editörler",
+  
+  // "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
+  "comcol-role.edit.editor.description": "Editörler, gelen gönderilerin metadatalarını düzenleyebilir ve ardından onları kabul edebilir veya reddedebilir.",
+  
+  
+  // "comcol-role.edit.finaleditor.name": "Final editors",
+  "comcol-role.edit.finaleditor.name": "Son editörler",
+  
+  // "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
+  "comcol-role.edit.finaleditor.description": "Nihai editörler gelen başvuruların metadatalarını düzenleyebilir, ancak onları reddedebilir.",
+  
+  
+  // "comcol-role.edit.reviewer.name": "Reviewers",
+  "comcol-role.edit.reviewer.name": "Yorumcular",
+  
+  // "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.",
+  "comcol-role.edit.reviewer.description": "Yorumcular gelen başvuruları kabul edebilir veya reddedebilirler. Ancak, gönderimin metadatalarını düzenleyemezler.",
+  
+  
+  
+  // "community.form.abstract": "Short Description",
+  "community.form.abstract": "Kısa Açıklama",
+  
+  // "community.form.description": "Introductory text (HTML)",
+  "community.form.description": "Tanıtım metni (HTML)",
+  
+  // "community.form.errors.title.required": "Please enter a community name",
+  "community.form.errors.title.required": "Lütfen bir komünite adı girin",
+  
+  // "community.form.rights": "Copyright text (HTML)",
+  "community.form.rights": "Telif Hakkı Metni (HTML)",
+  
+  // "community.form.tableofcontents": "News (HTML)",
+  "community.form.tableofcontents": "Haberler (HTML)",
+  
+  // "community.form.title": "Name",
+  "community.form.title": "İsim",
+  
+  // "community.page.edit": "Edit this community",
+  "community.page.edit": "Bu komüniteyi düzenle",
+  
+  // "community.page.handle": "Permanent URI for this community",
+  "community.page.handle": "Bu komünite için Kalıcı Uri",
+  
+  // "community.page.license": "License",
+  "community.page.license": "Lisans",
+  
+  // "community.page.news": "News",
+  "community.page.news": "Haberler",
+  
+  // "community.all-lists.head": "Subcommunities and Collections",
+  "community.all-lists.head": "Alt komüniteler ve koleksiyonlar",
+  
+  // "community.sub-collection-list.head": "Collections of this Community",
+  "community.sub-collection-list.head": "Bu komünitenin koleksiyonları",
+  
+  // "community.sub-community-list.head": "Communities of this Community",
+  "community.sub-community-list.head": "Bu komünitenin koleksiyonları",
+  
+  
+  
+  // "cookies.consent.accept-all": "Accept all",
+  "cookies.consent.accept-all": "Hepsini kabul et",
+  
+  // "cookies.consent.accept-selected": "Accept selected",
+  "cookies.consent.accept-selected": "Seçiliyi kabul et",
+  
+  // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
+  "cookies.consent.app.opt-out.description": "Bu uygulama varsayılan olarak yüklenir (ancak vazgeçebilirsiniz)",
+  
+  // "cookies.consent.app.opt-out.title": "(opt-out)",
+  "cookies.consent.app.opt-out.title": "(vazgeç)",
+  
+  // "cookies.consent.app.purpose": "purpose",
+  "cookies.consent.app.purpose": "amaç",
+  
+  // "cookies.consent.app.required.description": "This application is always required",
+  "cookies.consent.app.required.description": "Bu uygulama her zaman gereklidir",
+  
+  // "cookies.consent.app.required.title": "(always required)",
+  "cookies.consent.app.required.title": "(her zaman gerekli)",
+  
+  // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
+  "cookies.consent.update": "Son ziyaretinizden bu yana değişiklikler vardı, lütfen onayınızı güncelleyin.",
+  
+  // "cookies.consent.close": "Close",
+  "cookies.consent.close": "Kapat",
+  
+  // "cookies.consent.decline": "Decline",
+  "cookies.consent.decline": "Reddet",
+  
+  // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
+  "cookies.consent.content-notice.description": "Kişisel bilgilerinizi aşağıdaki amaçlarla topluyor ve işleriz: <strong>Kimlik Doğrulama, Tercihler, Onay ve İstatistikler</strong>. <br/> Daha fazla bilgi için, lütfen okuyun {privacyPolicy}.",
+  
+  // "cookies.consent.content-notice.learnMore": "Customize",
+  "cookies.consent.content-notice.learnMore": "Özelleştir",
+  
+  // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
+  "cookies.consent.content-modal.description": "Burada, sizin hakkınızda topladığımız bilgileri görebilir ve özelleştirebilirsiniz.",
+  
+  // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
+  "cookies.consent.content-modal.privacy-policy.name": "Gizlilik Politikası",
+  
+  // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
+  "cookies.consent.content-modal.privacy-policy.text": "Daha fazla bilgi için, lütfen okuyun {privacyPolicy}.",
+  
+  // "cookies.consent.content-modal.title": "Information that we collect",
+  "cookies.consent.content-modal.title": "Topladığımız bilgiler",
+  
+  
+  
+  // "cookies.consent.app.title.authentication": "Authentication",
+  "cookies.consent.app.title.authentication": "Kimlik doğrulama",
+  
+  // "cookies.consent.app.description.authentication": "Required for signing you in",
+  "cookies.consent.app.description.authentication": "Kayıt olmak için gerekli",
+  
+  
+  // "cookies.consent.app.title.preferences": "Preferences",
+  "cookies.consent.app.title.preferences": "Tercihler",
+  
+  // "cookies.consent.app.description.preferences": "Required for saving your preferences",
+  "cookies.consent.app.description.preferences": "Tercihlerinizi kaydetmek için gerekli",
+  
+  
+  
+  // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
+  "cookies.consent.app.title.acknowledgement": "Onaylama",
+  
+  // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
+  "cookies.consent.app.description.acknowledgement": "Teşekkürlerinizi ve onayları kurtarmak için gerekli",
+  
+  
+  
+  // "cookies.consent.app.title.google-analytics": "Google Analytics",
+  "cookies.consent.app.title.google-analytics": "Google Analitiği",
+  
+  // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
+  "cookies.consent.app.description.google-analytics": "İstatistiksel verileri izlememize izin verir",
+  
+  
+  
+  // "cookies.consent.purpose.functional": "Functional",
+  "cookies.consent.purpose.functional": "Fonksiyonel",
+  
+  // "cookies.consent.purpose.statistical": "Statistical",
+  "cookies.consent.purpose.statistical": "İstatistiksel",
+  
+  
+  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
+  "curation-task.task.checklinks.label":  "Metadatalardaki Bağlantıları Kontrol Et",
+  
+  // "curation-task.task.noop.label": "NOOP",
+  "curation-task.task.noop.label": "NOOP",
+  
+  // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
+  "curation-task.task.profileformats.label": "Profil Bitstream Formatları",
+  
+  // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
+  "curation-task.task.requiredmetadata.label": "Gerekli metadataları kontrol edin",
+  
+  // "curation-task.task.translate.label": "Microsoft Translator",
+  "curation-task.task.translate.label": "Microsoft Tercüman",
+  
+  // "curation-task.task.vscan.label": "Virus Scan",
+  "curation-task.task.vscan.label": "Virüs Taraması",
+  
+  
+  
+  // "curation.form.task-select.label": "Task:",
+  "curation.form.task-select.label": "Görev:",
+  
+  // "curation.form.submit": "Start",
+  "curation.form.submit": "Başlangıç",
+  
+  // "curation.form.submit.success.head": "The curation task has been started successfully",
+  "curation.form.submit.success.head": "Küratör görevi başarıyla başlatıldı",
+  
+  // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
+  "curation.form.submit.success.content": "İlgili işlem sayfasına yönlendirileceksiniz.",
+  
+  // "curation.form.submit.error.head": "Running the curation task failed",
+  "curation.form.submit.error.head": "Küratörlük görevi başarısız oldu",
+  
+  // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+  "curation.form.submit.error.content": "Küratörlük görevi başlatmaya çalışırken bir hata oluştu.",
+  
+  // "curation.form.handle.label": "Handle:",
+  "curation.form.handle.label": "Ele al:",
+  
+  // "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
+  "curation.form.handle.hint": "İpucu: Gir [your-handle-prefix]/0 tüm sitede bir görevi çalıştırmak için (tüm görevler bu özelliği destekleyemez)",
+  
+  
+  
+  // "dso-selector.create.collection.head": "New collection",
+  "dso-selector.create.collection.head": "Yeni koleksiyon",
+  
+  // "dso-selector.create.collection.sub-level": "Create a new collection in",
+  "dso-selector.create.collection.sub-level": "Yeni bir koleksiyon oluşturun",
+  
+  // "dso-selector.create.community.head": "New community",
+  "dso-selector.create.community.head": "Yeni komünite",
+  
+  // "dso-selector.create.community.sub-level": "Create a new community in",
+  "dso-selector.create.community.sub-level": "Yeni bir komünite oluştur",
+  
+  // "dso-selector.create.community.top-level": "Create a new top-level community",
+  "dso-selector.create.community.top-level": "Yeni bir üst düzey komünite oluştur",
+  
+  // "dso-selector.create.item.head": "New item",
+  "dso-selector.create.item.head": "Yeni öğe",
+  
+  // "dso-selector.create.item.sub-level": "Create a new item in",
+  "dso-selector.create.item.sub-level": "İçinde yeni bir öğe oluşturun",
+  
+  // "dso-selector.create.submission.head": "New submission",
+  "dso-selector.create.submission.head": "Yeni başvuru",
+  
+  // "dso-selector.edit.collection.head": "Edit collection",
+  "dso-selector.edit.collection.head": "Koleksiyonu Düzenle",
+  
+  // "dso-selector.edit.community.head": "Edit community",
+  "dso-selector.edit.community.head": "Topluluğu Düzenle",
+  
+  // "dso-selector.edit.item.head": "Edit item",
+  "dso-selector.edit.item.head": "Ögeyi düzenle",
+  
+  // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
+  "dso-selector.export-metadata.dspaceobject.head": "Metadatalarını dışa aktar",
+  
+  // "dso-selector.no-results": "No {{ type }} found ",
+  "dso-selector.no-results": "Bulunamadı {{ type }} ",
+  
+  // "dso-selector.placeholder": "Search for a {{ type }}",
+  "dso-selector.placeholder": " Ara {{ type }}",
+  
+  
+  
+  // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
+  "confirmation-modal.export-metadata.header": "Metadatalarını dışa aktar {{ dsoName }}",
+  
+  // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
+  "confirmation-modal.export-metadata.info": "Metadataları dışarı aktarmak istediğinizden emin misiniz {{ dsoName }}",
+  
+  // "confirmation-modal.export-metadata.cancel": "Cancel",
+  "confirmation-modal.export-metadata.cancel": "İptal",
+  
+  // "confirmation-modal.export-metadata.confirm": "Export",
+  "confirmation-modal.export-metadata.confirm": "Dışarı aktar",
+  
+  // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.header": "EPerson'ı sil \"{{ dsoName }}\"",
+  
+  // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "Eperson'u silmek istediğinize emin misiniz? \"{{ dsoName }}\"",
+  
+  // "confirmation-modal.delete-eperson.cancel": "Cancel",
+  "confirmation-modal.delete-eperson.cancel": "İptal",
+  
+  // "confirmation-modal.delete-eperson.confirm": "Delete",
+  "confirmation-modal.delete-eperson.confirm": "Sil",
+  
+  
+  // "error.bitstream": "Error fetching bitstream",
+  "error.bitstream": "Alınan bitstream hatası",
+  
+  // "error.browse-by": "Error fetching items",
+  "error.browse-by": "Alınan öğeler hatası",
+  
+  // "error.collection": "Error fetching collection",
+  "error.collection": "Alınan koleksiyon hatası",
+  
+  // "error.collections": "Error fetching collections",
+  "error.collections": "Alınan koleksiyonlar hatası",
+  
+  // "error.community": "Error fetching community",
+  "error.community": "Alınan komünite hatası",
+  
+  // "error.identifier": "No item found for the identifier",
+  "error.identifier": "Tanımlayıcı için ürün bulunamadı",
+  
+  // "error.default": "Error",
+  "error.default": "Hata",
+  
+  // "error.item": "Error fetching item",
+  "error.item": "Alınan öğe hatası",
+  
+  // "error.items": "Error fetching items",
+  "error.items": "Alınan öğeler hatası",
+  
+  // "error.objects": "Error fetching objects",
+  "error.objects": "Alınan nesneler hatası",
+  
+  // "error.recent-submissions": "Error fetching recent submissions",
+  "error.recent-submissions": "Son başvuruları alma hatası",
+  
+  // "error.search-results": "Error fetching search results",
+  "error.search-results": "Arama sonuçlarını alma hatası",
+  
+  // "error.sub-collections": "Error fetching sub-collections",
+  "error.sub-collections": "Alt koleksiyonları alma hatası",
+  
+  // "error.sub-communities": "Error fetching sub-communities",
+  "error.sub-communities": "Alt komüniteleri alma hatası",
+  
+  // "error.submission.sections.init-form-error": "An error occurred during section initialize, please check your input-form configuration. Details are below : <br> <br>",
+  "error.submission.sections.init-form-error": "Bölüm başlatma sırasında bir hata oluştu, lütfen giriş formu yapılandırmanızı kontrol edin. Detaylar aşağıdadır : <br> <br>",
+  
+  // "error.top-level-communities": "Error fetching top-level communities",
+  "error.top-level-communities": "Üst düzey komüniteleri alma hatası",
+  
+  // "error.validation.license.notgranted": "You must grant this license to complete your submission. If you are unable to grant this license at this time you may save your work and return later or remove the submission.",
+  "error.validation.license.notgranted": "Gönderinizi tamamlamak için bu lisansı vermelisiniz. Bu lisansı şu anda veremiyorsanız, çalışmanızı kaydedebilir ve daha sonra geri gönderebilir veya gönderimi kaldırabilirsiniz.",
+  
+  // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
+  "error.validation.pattern": "Bu giriş mevcut modelle sınırlandırılmıştır.: {{ pattern }}.",
+  
+  // "error.validation.filerequired": "The file upload is mandatory",
+  "error.validation.filerequired": "Dosya yükleme zorunludur",
+  
+  
+  
+  // "file-section.error.header": "Error obtaining files for this item",
+  "file-section.error.header": "Bu öğe için dosyaları elde etme hatası",
+  
+  
+  
+  // "footer.copyright": "copyright © 2002-{{ year }}",
+  "footer.copyright": "telif hakkı © 2002-{{ year }}",
+  
+  // "footer.link.dspace": "DSpace software",
+  "footer.link.dspace": "DSpace yazılım",
+  
+  // "footer.link.lyrasis": "LYRASIS",
+  "footer.link.lyrasis": "LYRASIS",
+  
+  // "footer.link.cookies": "Cookie settings",
+  "footer.link.cookies": "Çerez Ayarları",
+  
+  // "footer.link.privacy-policy": "Privacy policy",
+  "footer.link.privacy-policy": "Gizlilik Politikası",
+  
+  // "footer.link.end-user-agreement":"End User Agreement",
+  "footer.link.end-user-agreement":"Son Kullanıcı Sözleşmesi",
+  
+  
+  
+  // "forgot-email.form.header": "Forgot Password",
+  "forgot-email.form.header": "Parolanızı mı unuttunuz",
+  
+  // "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+  "forgot-email.form.info": "E-posta güncellemeleri için koleksiyonlara abone olmak için bir hesap kaydedin ve DSPace'e yeni öğeler gönderin.",
+  
+  // "forgot-email.form.email": "Email Address *",
+  "forgot-email.form.email": "Eposta Adresi *",
+  
+  // "forgot-email.form.email.error.required": "Please fill in an email address",
+  "forgot-email.form.email.error.required": "Lütfen bir e-posta adresi giriniz",
+  
+  // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
+  "forgot-email.form.email.error.pattern": "Lütfen bir e-posta adresi giriniz",
+  
+  // "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
+  "forgot-email.form.email.hint": "Bu adres, giriş adınız olarak doğrulanacak ve kullanılacaktır.",
+  
+  // "forgot-email.form.submit": "Submit",
+  "forgot-email.form.submit": "Kaydet",
+  
+  // "forgot-email.form.success.head": "Verification email sent",
+  "forgot-email.form.success.head": "Doğrulama e-postası gönderildi",
+  
+  // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "forgot-email.form.success.content": "Özel bir URL ve daha fazla talimat içeren bir e posta bu {{ email }} mail adresin gönderildi. ",
+  
+  // "forgot-email.form.error.head": "Error when trying to register email",
+  "forgot-email.form.error.head": "E-postayı kaydetmeye çalışırken hata oluştu",
+  
+  // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
+  "forgot-email.form.error.content": "E-posta adresini kaydederken bir hata oluştu: {{ email }}",
+  
+  
+  
+  // "forgot-password.title": "Forgot Password",
+  "forgot-password.title": "Parolanızı mı unuttunuz",
+  
+  // "forgot-password.form.head": "Forgot Password",
+  "forgot-password.form.head": "Parolanızı mı unuttunuz",
+  
+  // "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": "Aşağıdaki kutuya yeni bir parola girin ve tekrar ikinci kutuya yazarak onaylayın. En az altı karakter uzunluğunda olmalıdır.",
+  
+  // "forgot-password.form.card.security": "Security",
+  "forgot-password.form.card.security": "Güvenlik",
+  
+  // "forgot-password.form.identification.header": "Identify",
+  "forgot-password.form.identification.header": "Kimlik",
+  
+  // "forgot-password.form.identification.email": "Email address: ",
+  "forgot-password.form.identification.email": "E-posta adresi: ",
+  
+  // "forgot-password.form.label.password": "Password",
+  "forgot-password.form.label.password": "Parola",
+  
+  // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
+  "forgot-password.form.label.passwordrepeat": "Doğrulamak için yeniden yazınız",
+  
+  // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+  "forgot-password.form.error.empty-password": "Lütfen aşağıdaki kutuya bir parola girin.",
+  
+  // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
+  "forgot-password.form.error.matching-passwords": "Parolalar eşleşmiyor.",
+  
+  // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
+  "forgot-password.form.error.password-length": "Parola en az 6 karakter uzunluğunda olmalıdır.",
+  
+  // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
+  "forgot-password.form.notification.error.title": "Yeni parola göndermeye çalışırken hata oluştu",
+  
+  // "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.",
+  "forgot-password.form.notification.success.content": "Parola sıfırlama başarılı oldu. Oluşturulan kullanıcı olarak giriş yaptınız.",
+  
+  // "forgot-password.form.notification.success.title": "Password reset completed",
+  "forgot-password.form.notification.success.title": "Parola sıfırlama tamamlandı",
+  
+  // "forgot-password.form.submit": "Submit password",
+  "forgot-password.form.submit": "Parolayı kaydet",
+  
+  
+  
+  // "form.add": "Add",
+  "form.add": "Ekle",
+  
+  // "form.add-help": "Click here to add the current entry and to add another one",
+  "form.add-help": "Geçerli girişi eklemek ve bir tane daha eklemek için buraya tıklayın.",
+  
+  // "form.cancel": "Cancel",
+  "form.cancel": "İptal",
+  
+  // "form.clear": "Clear",
+  "form.clear": "Temizle",
+  
+  // "form.clear-help": "Click here to remove the selected value",
+  "form.clear-help": "Seçilen değeri kaldırmak için buraya tıklayın",
+  
+  // "form.edit": "Edit",
+  "form.edit": "Düzenle",
+  
+  // "form.edit-help": "Click here to edit the selected value",
+  "form.edit-help": "Seçilen değeri düzenlemek için buraya tıklayın",
+  
+  // "form.first-name": "First name",
+  "form.first-name": "İlk adı",
+  
+  // "form.group-collapse": "Collapse",
+  "form.group-collapse": "Yığmak",
+  
+  // "form.group-collapse-help": "Click here to collapse",
+  "form.group-collapse-help": "Yığmak için buraya tıklayın",
+  
+  // "form.group-expand": "Expand",
+  "form.group-expand": "Uzat",
+  
+  // "form.group-expand-help": "Click here to expand and add more elements",
+  "form.group-expand-help": "Genişletmek ve daha fazla öğe eklemek için buraya tıklayın",
+  
+  // "form.last-name": "Last name",
+  "form.last-name": "Soyadı",
+  
+  // "form.loading": "Loading...",
+  "form.loading": "Yükleniyor...",
+  
+  // "form.lookup": "Lookup",
+  "form.lookup": "Yukarı Bak",
+  
+  // "form.lookup-help": "Click here to look up an existing relation",
+  "form.lookup-help": "Mevcut bir bağlantı aramak için buraya tıklayın",
+  
+  // "form.no-results": "No results found",
+  "form.no-results": "Sonuç bulunamadı",
+  
+  // "form.no-value": "No value entered",
+  "form.no-value": "Değer girilmez",
+  
+  // "form.other-information": {},
+  "form.other-information": {},
+  
+  // "form.remove": "Remove",
+  "form.remove": "Kaldır",
+  
+  // "form.save": "Save",
+  "form.save": "Kaydet",
+  
+  // "form.save-help": "Save changes",
+  "form.save-help": "Değişiklikleri kaydet",
+  
+  // "form.search": "Search",
+  "form.search": "Ara",
+  
+  // "form.search-help": "Click here to look for an existing correspondence",
+  "form.search-help": "Mevcut bir yazışma aramak için buraya tıklayın",
+  
+  // "form.submit": "Submit",
+  "form.submit": "Gönder",
+  
+  
+  
+  // "home.description": "",
+  "home.description": "",
+  
+  // "home.breadcrumbs": "Home",
+  "home.breadcrumbs": "Anasayfa",
+  
+  // "home.title": "DSpace Angular :: Home",
+  "home.title": "DSpace Açısal :: Anasayfa",
+  
+  // "home.top-level-communities.head": "Communities in DSpace",
+  "home.top-level-communities.head": "Dspace'deki Komüniteler",
+  
+  // "home.top-level-communities.help": "Select a community to browse its collections.",
+  "home.top-level-communities.help": "Koleksiyonlarına göz atmak için bir komünite seçin.",
+ 
+  // "home.search-form.placeholder": "Search the repository ...", 
+  "home.search-form.placeholder": "Depoda ara ...", 
+  
+  
+  // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
+  "info.end-user-agreement.accept": "Okudum ve son kullanıcı sözleşmesini kabul ediyorum",
+  
+  // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
+  "info.end-user-agreement.accept.error": "Son kullanıcı sözleşmesini kabul eden bir hata oluştu",
+  
+  // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
+  "info.end-user-agreement.accept.success": "Son Kullanıcı Sözleşmesini başarıyla güncelledi",
+  
+  // "info.end-user-agreement.breadcrumbs": "End User Agreement",
+  "info.end-user-agreement.breadcrumbs": "Son Kullanıcı Sözleşmesi",
+  
+  // "info.end-user-agreement.buttons.cancel": "Cancel",
+  "info.end-user-agreement.buttons.cancel": "İptal",
+  
+  // "info.end-user-agreement.buttons.save": "Save",
+  "info.end-user-agreement.buttons.save": "Kaydet",
+  
+  // "info.end-user-agreement.head": "End User Agreement",
+  "info.end-user-agreement.head": "Son Kullanıcı Sözleşmesi",
+  
+  // "info.end-user-agreement.title": "End User Agreement",
+  "info.end-user-agreement.title": "Son Kullanıcı Sözleşmesi",
+  
+  // "info.privacy.breadcrumbs": "Privacy Statement",
+  "info.privacy.breadcrumbs": "Gizlilik bildirimi",
+  
+  // "info.privacy.head": "Privacy Statement",
+  "info.privacy.head": "Gizlilik bildirimi",
+  
+  // "info.privacy.title": "Privacy Statement",
+  "info.privacy.title": "Gizlilik bildirimi",
+  
+  
+  
+  // "item.alerts.private": "This item is private",
+  "item.alerts.private": "Bu öğe özel",
+  
+  // "item.alerts.withdrawn": "This item has been withdrawn",
+  "item.alerts.withdrawn": "Bu ürün geri çekildi",
+  
+  
+  
+  // "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
+  "item.edit.authorizations.heading": "Bu editör ile bir öğenin politikalarını görüntüleyebilir ve değiştirebilirsiniz, ayrıca bireysel ürün bileşenlerinin politikalarını değiştirebilirsiniz: Paketler ve Bitstream. Kısaca, bir öğe bir paket konteynırıdır ve paketler bitstream konteynırıdır. Konteynerler genellikle, bitstream yalnızca okuma / yazma politikalarına sahip olur.",
+  
+  // "item.edit.authorizations.title": "Edit item's Policies",
+  "item.edit.authorizations.title": "Edit item's Politikalar",
+  
+  
+  
+  // "item.badge.private": "Private",
+  "item.badge.private": "Özel",
+  
+  // "item.badge.withdrawn": "Withdrawn",
+  "item.badge.withdrawn": "Çekilmiş",
+  
+  
+  
+  // "item.bitstreams.upload.bundle": "Bundle",
+  "item.bitstreams.upload.bundle": "Paket",
+  
+  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
+  "item.bitstreams.upload.bundle.placeholder": "Bir paket seçin",
+  
+  // "item.bitstreams.upload.bundle.new": "Create bundle",
+  "item.bitstreams.upload.bundle.new": "Paket oluştur",
+  
+  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+  "item.bitstreams.upload.bundles.empty": "Bu öğe, bir bitstream yüklemek için herhangi bir paket içermiyor.",
+  
+  // "item.bitstreams.upload.cancel": "Cancel",
+  "item.bitstreams.upload.cancel": "İptal",
+  
+  // "item.bitstreams.upload.drop-message": "Drop a file to upload",
+  "item.bitstreams.upload.drop-message": "Yüklenecek bir dosya bırak",
+  
+  // "item.bitstreams.upload.item": "Item: ",
+  "item.bitstreams.upload.item": "Öğe: ",
+  
+  // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
+  "item.bitstreams.upload.notifications.bundle.created.content": "Başarıyla yeni paket oluşturuldu.",
+  
+  // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
+  "item.bitstreams.upload.notifications.bundle.created.title": "Paket oluşturdu",
+  
+  // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
+  "item.bitstreams.upload.notifications.upload.failed": "Yükleme başarısız. Lütfen yeniden denemeden önce içeriği doğrulayın.",
+  
+  // "item.bitstreams.upload.title": "Upload bitstream",
+  "item.bitstreams.upload.title": "Bitstream yükle",
+  
+  
+  
+  // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "Yükle",
+  
+  // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
+  "item.edit.bitstreams.bundle.displaying": "Şu anda görüntülenen {{ amount }} bitstream {{ total }}.",
+  
+  // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
+  "item.edit.bitstreams.bundle.load.all": "Hepsini yükle ({{ total }})",
+  
+  // "item.edit.bitstreams.bundle.load.more": "Load more",
+  "item.edit.bitstreams.bundle.load.more": "Daha fazla yükle",
+  
+  // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
+  "item.edit.bitstreams.bundle.name": "PAKET: {{ name }}",
+  
+  // "item.edit.bitstreams.discard-button": "Discard",
+  "item.edit.bitstreams.discard-button": "Yoksay",
+  
+  // "item.edit.bitstreams.edit.buttons.download": "Download",
+  "item.edit.bitstreams.edit.buttons.download": "İndir",
+  
+  // "item.edit.bitstreams.edit.buttons.drag": "Drag",
+  "item.edit.bitstreams.edit.buttons.drag": "Sürükle",
+  
+  // "item.edit.bitstreams.edit.buttons.edit": "Edit",
+  "item.edit.bitstreams.edit.buttons.edit": "Düzenle",
+  
+  // "item.edit.bitstreams.edit.buttons.remove": "Remove",
+  "item.edit.bitstreams.edit.buttons.remove": "Kaldır",
+
+  // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
+  "item.edit.bitstreams.edit.buttons.undo": "Değişiklikleri geri al",
+  
+  // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
+  "item.edit.bitstreams.empty": "Bu öge herhangi bir veri içermiyor. Bir tane oluşturmak için yükle düğmesini tıklayınız.",
+  
+  // "item.edit.bitstreams.headers.actions": "Actions",
+  "item.edit.bitstreams.headers.actions": "İşlemler",
+  
+  // "item.edit.bitstreams.headers.bundle": "Bundle",
+  "item.edit.bitstreams.headers.bundle": "Seri",
+  
+  // "item.edit.bitstreams.headers.description": "Description",
+  "item.edit.bitstreams.headers.description": "Açıklama",
+  
+  // "item.edit.bitstreams.headers.format": "Format",
+  "item.edit.bitstreams.headers.format": "Format",
+  
+  // "item.edit.bitstreams.headers.name": "Name",
+  "item.edit.bitstreams.headers.name": "Ad",
+  
+  // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.bitstreams.notifications.discarded.content": "Yaptığınız değişiklikler silindi.Yaptığınız değişiklikleri geri yüklemek için 'Geri al' butonuna tıklayınız.",
+  
+  // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
+  "item.edit.bitstreams.notifications.discarded.title": "Değişiklikler silindi.",
+  
+  // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
+  "item.edit.bitstreams.notifications.move.failed.title": "Veri taşınırken bir hata oluştu.",
+  
+  // "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this item's bitstreams and bundles have been saved.",
+  "item.edit.bitstreams.notifications.move.saved.content": "Bu öğenin bitstreamda ve paketlerinde yaptığınız değişiklikler kaydedildi.",
+  
+  // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
+  "item.edit.bitstreams.notifications.move.saved.title": "Değişiklikler kaydedildi.",
+  
+  // "item.edit.bitstreams.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "item.edit.bitstreams.notifications.outdated.content": "Şu anda üzerinde çalıştığınız öğe başka bir kullanıcı tarafından değiştirildi.Mevcut değişiklikleriniz çakışma olmasını önlemek için silindi. ",
+  
+  // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
+  "item.edit.bitstreams.notifications.outdated.title": "Değişiklikler zaman aşımına uğradı.",
+  
+  // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
+  "item.edit.bitstreams.notifications.remove.failed.title": "Bitstream silinirken bir hata oluştu",
+  
+  // "item.edit.bitstreams.notifications.remove.saved.content": "Your removal changes to this item's bitstreams have been saved.",
+  "item.edit.bitstreams.notifications.remove.saved.content": "Bu öğenin bitstreamda yaptığınız kaldırma değişiklikleri kaydedildi.",
+  
+  // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
+  "item.edit.bitstreams.notifications.remove.saved.title": "Kaldırma değişiklikleri kaydedildi.",
+  
+  // "item.edit.bitstreams.reinstate-button": "Undo",
+  "item.edit.bitstreams.reinstate-button": "Geri al",
+  
+  // "item.edit.bitstreams.save-button": "Save",
+  "item.edit.bitstreams.save-button": "Kaydet",
+  
+  // "item.edit.bitstreams.upload-button": "Upload",
+  "item.edit.bitstreams.upload-button": "Yükle",
+  
+  
+  
+  // "item.edit.delete.cancel": "Cancel",
+  "item.edit.delete.cancel": "İptal et",
+  
+  // "item.edit.delete.confirm": "Delete",
+  "item.edit.delete.confirm": "Sil",
+  
+  // "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.",
+  "item.edit.delete.description": "Bu öğeyi kalıcı olarak silmek istedğinizden emin misiniz? Silme işlemi gerçekleştikten sonra geri alınamaz. ",
+  
+  // "item.edit.delete.error": "An error occurred while deleting the item",
+  "item.edit.delete.error": "Silme işlemi sırasında bir hata oluştu.",
+  
+  // "item.edit.delete.header": "Delete item: {{ id }}",
+  "item.edit.delete.header": "Silinecek öğeler: {{ id }}",
+  
+  // "item.edit.delete.success": "The item has been deleted",
+  "item.edit.delete.success": "Öğe silindi.",
+  
+  // "item.edit.head": "Edit Item",
+  "item.edit.head": "Ögeleri düzenle",
+  
+  // "item.edit.breadcrumbs": "Edit Item",
+  "item.edit.breadcrumbs": "Ögeleri düzenle",
+  
+  
+  // "item.edit.tabs.mapper.head": "Collection Mapper",
+  "item.edit.tabs.mapper.head": "Koleksiyon eşleştiricisi",
+  
+  // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
+  "item.edit.tabs.item-mapper.title": "Öge düzenle- Koleksiyon eşleştiricisi",
+  
+  // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
+  "item.edit.item-mapper.buttons.add": "Ögeyi seçili koleksiyonlarla eşleştir",
+  
+  // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
+  "item.edit.item-mapper.buttons.remove": "Seçili koleksiyonların öge eşleştirmelerini kaldır",
+  
+  // "item.edit.item-mapper.cancel": "Cancel",
+  "item.edit.item-mapper.cancel": "İptal et",
+  
+  // "item.edit.item-mapper.description": "This is the item mapper tool that allows administrators to map this item to other collections. You can search for collections and map them, or browse the list of collections the item is currently mapped to.",
+  "item.edit.item-mapper.description": "Öge eşleme aracı, yöneticilerin bu öğeyi diğer koleksiyonlarla eşleştirmesini ögeleri eşleştirmesini sağlar. Koleksiyonları arayabilir ve bunları eşleyebilir veya öğenin şu anda eşlendiği koleksiyonların listesine göz atabilirsiniz.",
+  
+  // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
+  "item.edit.item-mapper.head": "Öge eşleştirici - Ögeleri koleksiyonlarla eşleştirir",
+  
+  // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
+  "item.edit.item-mapper.item": "Öge: \"<b>{{name}}</b>\"",
+  
+  // "item.edit.item-mapper.no-search": "Please enter a query to search",
+  "item.edit.item-mapper.no-search": "Lütfen arama yapmak için bir soru giriniz.",
+  
+  // "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.add.error.content": "Ögelerin {{amount}} koleksiyonlarla eşleştirirken bir hata oluştu.",
+  
+  // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
+  "item.edit.item-mapper.notifications.add.error.head": "Eşleştirme hataları",
+  
+  // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.add.success.content": "Ögeler {{amount}} koleksiyonlarla başarıyla eşleştirildi.",
+  
+  // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
+  "item.edit.item-mapper.notifications.add.success.head": "Eşleştirme tamamlandı.",
+  
+  // "item.edit.item-mapper.notifications.remove.error.content": "Errors occurred for the removal of the mapping to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.error.content": "Ögelerin {{amount}} koleksiyonlarla eşleştirmeleri kaldırılırken bir hata oluştu.",
+  
+  // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
+  "item.edit.item-mapper.notifications.remove.error.head": "Eşleştirme hatalarının kaldırılması",
+  
+  // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.success.content": "Ögeler {{amount}} koleksiyonlarla eşleştirmeleri başarıyla kaldırıldı.",
+  
+  // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
+  "item.edit.item-mapper.notifications.remove.success.head": "Eşleştirmelerin kaldırılması tamamlandı.",
+  
+  // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
+  "item.edit.item-mapper.tabs.browse": "Eşleştirilen koleksiyonları ara",
+  
+  // "item.edit.item-mapper.tabs.map": "Map new collections",
+  "item.edit.item-mapper.tabs.map": "Yeni koleksiyonları eşleştir",
+  
+  
+  
+  // "item.edit.metadata.add-button": "Add",
+  "item.edit.metadata.add-button": "Ekle",
+  
+  // "item.edit.metadata.discard-button": "Discard",
+  "item.edit.metadata.discard-button": "Sil",
+  
+  // "item.edit.metadata.edit.buttons.edit": "Edit",
+  "item.edit.metadata.edit.buttons.edit": "Düzenle",
+  
+  // "item.edit.metadata.edit.buttons.remove": "Remove",
+  "item.edit.metadata.edit.buttons.remove": "Kaldır",
+  
+  // "item.edit.metadata.edit.buttons.undo": "Undo changes",
+  "item.edit.metadata.edit.buttons.undo": "Değişiklikleri geri al",
+  
+  // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "item.edit.metadata.edit.buttons.unedit": "Düzenlemeyi bitir",
+  
+  // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "item.edit.metadata.empty": "Öğe şu anda herhangi bir metadata içermiyor. Bir metadata değeri eklemeye başlamak için Ekle'ye tıklayın.",
+  
+  // "item.edit.metadata.headers.edit": "Edit",
+  "item.edit.metadata.headers.edit": "Düzenle",
+  
+  // "item.edit.metadata.headers.field": "Field",
+  "item.edit.metadata.headers.field": "Alan",
+  
+  // "item.edit.metadata.headers.language": "Lang",
+  "item.edit.metadata.headers.language": "Dil",
+  
+  // "item.edit.metadata.headers.value": "Value",
+  "item.edit.metadata.headers.value": "Değer",
+  
+  // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "item.edit.metadata.metadatafield.invalid": "Lütfen geçerli bir metadata alanı seçin",
+  
+  // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.metadata.notifications.discarded.content": "Yaptığınız değişiklikler silindi.Yaptığınız değişiklikleri geri yüklemek için 'Geri al' butonuna tıklayınız.",
+  
+  // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
+  "item.edit.metadata.notifications.discarded.title": "Değişiklikler silindi",
+  
+  // "item.edit.metadata.notifications.error.title": "An error occurred",
+  "item.edit.metadata.notifications.error.title": "Bir hata oluştu",
+  
+  // "item.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
+  "item.edit.metadata.notifications.invalid.content": "Değişiklikleriniz kaydedilmedi. Lütfen kaydetmeden önce tüm alanların geçerli olduğundan emin olun.",
+  
+  // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "item.edit.metadata.notifications.invalid.title": "Metadata geçersiz",
+  
+  // "item.edit.metadata.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "item.edit.metadata.notifications.outdated.content": "Şu anda üzerinde çalıştığınız öge başka bir kullanıcı tarafından değiştirildi.Mevcut değişiklikleriniz çakışma olmasını önlemek için silindi.",
+  
+  // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
+  "item.edit.metadata.notifications.outdated.title": "Değişiklikler zaman aşımına uğradı.",
+  
+  // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
+  "item.edit.metadata.notifications.saved.content": "Ögenin metadatalarında yaptığınız değişiklikler kaydedildi.",
+  
+  // "item.edit.metadata.notifications.saved.title": "Metadata saved",
+  "item.edit.metadata.notifications.saved.title": "Metadatalar kaydedildi",
+  
+  // "item.edit.metadata.reinstate-button": "Undo",
+  "item.edit.metadata.reinstate-button": "Geri al",
+  
+  // "item.edit.metadata.save-button": "Save",
+  "item.edit.metadata.save-button": "Kaydet",
+  
+  
+  
+  // "item.edit.modify.overview.field": "Field",
+  "item.edit.modify.overview.field": "Alan",
+  
+  // "item.edit.modify.overview.language": "Language",
+  "item.edit.modify.overview.language": "Dil",
+  
+  // "item.edit.modify.overview.value": "Value",
+  "item.edit.modify.overview.value": "Değer",
+  
+  
+  
+  // "item.edit.move.cancel": "Cancel",
+  "item.edit.move.cancel": "İptal et",
+  
+  // "item.edit.move.description": "Select the collection you wish to move this item to. To narrow down the list of displayed collections, you can enter a search query in the box.",
+  "item.edit.move.description": "Bu öğeyi taşımak istediğiniz koleksiyonu seçin. Görüntülenen koleksiyonların listesini daraltmak için arama kısmına bir arama sorgusu girebilirsiniz.",
+  
+  // "item.edit.move.error": "An error occurred when attempting to move the item",
+  "item.edit.move.error": "Öğeyi taşımaya çalışırken bir hata oluştu",
+  
+  // "item.edit.move.head": "Move item: {{id}}",
+  "item.edit.move.head": "Kaldırılacak öge: {{id}}",
+  
+  // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
+  "item.edit.move.inheritpolicies.checkbox": "Poliçeyi devral",
+  
+  // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
+  "item.edit.move.inheritpolicies.description": "Hedef koleksiyonun varsayılan poliçelerini devral",
+  
+  // "item.edit.move.move": "Move",
+  "item.edit.move.move": "Taşı",
+  
+  // "item.edit.move.processing": "Moving...",
+  "item.edit.move.processing": "Taşınıyor...",
+  
+  // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
+  "item.edit.move.search.placeholder": "Lütfen koleksiyonları aramak için bir arama sorgusu giriniz.",
+  
+  // "item.edit.move.success": "The item has been moved successfully",
+  "item.edit.move.success": "Öge başarıyla taşındı",
+  
+  // "item.edit.move.title": "Move item",
+  "item.edit.move.title": "Ögeleri taşı",
+  
+  
+  
+  // "item.edit.private.cancel": "Cancel",
+  "item.edit.private.cancel": "İptal et",
+  
+  // "item.edit.private.confirm": "Make it Private",
+  "item.edit.private.confirm": "Gizli yap",
+  
+  // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
+  "item.edit.private.description": "Bu öğenin arşivde gizli yapılması gerektiğinden emin misiniz?",
+  
+  // "item.edit.private.error": "An error occurred while making the item private",
+  "item.edit.private.error": "Öge gizli yapılırken bir hata oluştu",
+  
+  // "item.edit.private.header": "Make item private: {{ id }}",
+  "item.edit.private.header": "Ögeyi gizli yap: {{ id }}",
+  
+  // "item.edit.private.success": "The item is now private",
+  "item.edit.private.success": "Öge gizlendi",
+  
+  
+  
+  // "item.edit.public.cancel": "Cancel",
+  "item.edit.public.cancel": "İptal et",
+  
+  // "item.edit.public.confirm": "Make it Public",
+  "item.edit.public.confirm": "Ögeyi herkese açık yap",
+  
+  // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
+  "item.edit.public.description": "Bu öğenin arşivde herkese açık yapılması gerektiğinden emin misiniz?",
+  
+  // "item.edit.public.error": "An error occurred while making the item public",
+  "item.edit.public.error": "Öge herkese açık yapılırken bir hata oluştu",
+  
+  // "item.edit.public.header": "Make item public: {{ id }}",
+  "item.edit.public.header": "Herkese açık yapılacak öge: {{ id }}",
+  
+  // "item.edit.public.success": "The item is now public",
+  "item.edit.public.success": "Öge herkese açık yapıldı",
+  
+  
+  
+  // "item.edit.reinstate.cancel": "Cancel",
+  "item.edit.reinstate.cancel": "İptal et",
+  
+  // "item.edit.reinstate.confirm": "Reinstate",
+  "item.edit.reinstate.confirm": "Getir yükle",
+  
+  // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
+  "item.edit.reinstate.description": "Bu öğenin arşive geri yüklenmesi gerektiğinden emin misiniz?",
+  
+  // "item.edit.reinstate.error": "An error occurred while reinstating the item",
+  "item.edit.reinstate.error": "Öğe geri yüklenirken bir hata oluştu",
+  
+  // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
+  "item.edit.reinstate.header": "Geri yüklenecek öge: {{ id  }}",
+  
+  // "item.edit.reinstate.success": "The item was reinstated successfully",
+  "item.edit.reinstate.success": "Öge başarıyla geri yüklendi",
+  
+  
+  
+  // "item.edit.relationships.discard-button": "Discard",
+  "item.edit.relationships.discard-button": "Sil",
+  
+  // "item.edit.relationships.edit.buttons.add": "Add",
+  "item.edit.relationships.edit.buttons.add": "Ekle",
+  
+  // "item.edit.relationships.edit.buttons.remove": "Remove",
+  "item.edit.relationships.edit.buttons.remove": "Kaldır",
+  
+  // "item.edit.relationships.edit.buttons.undo": "Undo changes",
+  "item.edit.relationships.edit.buttons.undo": "Değişiklikleri geri al",
+  
+  // "item.edit.relationships.no-relationships": "No relationships",
+  "item.edit.relationships.no-relationships": "İlişki yok",
+  
+  // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.relationships.notifications.discarded.content": "Yaptığınız değişiklikler silindi.Yaptığınız değişiklikleri geri yüklemek için 'Geri al' butonuna tıklayınız.",
+  
+  // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
+  "item.edit.relationships.notifications.discarded.title": "Değişiklikler silindi",
+  
+  // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
+  "item.edit.relationships.notifications.failed.title": "İlişkileri düzenlemede hata",
+  
+  // "item.edit.relationships.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "item.edit.relationships.notifications.outdated.content": "Şu anda üzerinde çalıştığınız öge başka bir kullanıcı tarafından değiştirildi.Mevcut değişiklikleriniz çakışma olmasını önlemek için silindi.",
+  
+  // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
+  "item.edit.relationships.notifications.outdated.title": "Değişiklikler zaman aşımına uğradı.",
+  
+  // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
+  "item.edit.relationships.notifications.saved.content": "Bu öğenin ilişkilerinde yaptığınız değişiklikler kaydedildi.",
+  
+  // "item.edit.relationships.notifications.saved.title": "Relationships saved",
+  "item.edit.relationships.notifications.saved.title": "İlişkiler kaydedildi",
+  
+  // "item.edit.relationships.reinstate-button": "Undo",
+  "item.edit.relationships.reinstate-button": "Geri al",
+  
+  // "item.edit.relationships.save-button": "Save",
+  "item.edit.relationships.save-button": "Kaydet",
+  
+  // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
+  "item.edit.relationships.no-entity-type": "Bu öğe için ilişkileri etkinleştirmek için 'dspace.entity.type' metadatalarını ekleyin",
+  
+  
+  
+  // "item.edit.tabs.bitstreams.head": "Bitstreams",
+  "item.edit.tabs.bitstreams.head": "Bitstreamlar",
+  
+  // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
+  "item.edit.tabs.bitstreams.title": "Öge düzenle - Bitstreamlar",
+  
+  // "item.edit.tabs.curate.head": "Curate",
+  "item.edit.tabs.curate.head": "Düzenleme",
+  
+  // "item.edit.tabs.curate.title": "Item Edit - Curate",
+  "item.edit.tabs.curate.title": "Öge düzenle  - Düzenleme",
+  
+  // "item.edit.tabs.metadata.head": "Metadata",
+  "item.edit.tabs.metadata.head": "Metadata",
+  
+  // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
+  "item.edit.tabs.metadata.title": "Öge düzenle -  Metadata",
+  
+  // "item.edit.tabs.relationships.head": "Relationships",
+  "item.edit.tabs.relationships.head": "İlişkiler",
+  
+  // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
+  "item.edit.tabs.relationships.title": "Öge düzenle - İlişkiler",
+  
+  // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
+  "item.edit.tabs.status.buttons.authorizations.button": "Yetkilendiriliyor...",
+  
+  // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
+  "item.edit.tabs.status.buttons.authorizations.label": "Öğenin yetkilendirme politikalarını düzenle",
+  
+  // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
+  "item.edit.tabs.status.buttons.delete.button": "Kalıcı olarak sil",
+  
+  // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
+  "item.edit.tabs.status.buttons.delete.label": "Ögeyi kalıcı olarak sil",
+  
+  // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "Eşleştirilmiş koleksiyonlar",
+  
+  // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.label": "Eşlenen koleksiyonları yönetin",
+  
+  // "item.edit.tabs.status.buttons.move.button": "Move...",
+  "item.edit.tabs.status.buttons.move.button": "Taşınıyor...",
+  
+  // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
+  "item.edit.tabs.status.buttons.move.label": "Öğeyi başka bir koleksiyona taşı",
+  
+  // "item.edit.tabs.status.buttons.private.button": "Make it private...",
+  "item.edit.tabs.status.buttons.private.button": "Gizleniyor...",
+  
+  // "item.edit.tabs.status.buttons.private.label": "Make item private",
+  "item.edit.tabs.status.buttons.private.label": "Ögeyi gizle",
+  
+  // "item.edit.tabs.status.buttons.public.button": "Make it public...",
+  "item.edit.tabs.status.buttons.public.button": "Öge herkese açık yapılıyor...",
+  
+  // "item.edit.tabs.status.buttons.public.label": "Make item public",
+  "item.edit.tabs.status.buttons.public.label": "Herkese açık yap",
+  
+  // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
+  "item.edit.tabs.status.buttons.reinstate.button": "Geri yükleniyor...",
+  
+  // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
+  "item.edit.tabs.status.buttons.reinstate.label": "Öğeyi depoya geri yükle",
+  
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
+  "item.edit.tabs.status.buttons.withdraw.button": "Çıkar...",
+  
+  // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
+  "item.edit.tabs.status.buttons.withdraw.label": "Depodan öğeyi çıkar",
+  
+  // "item.edit.tabs.status.description": "Welcome to the item management page. From here you can withdraw, reinstate, move or delete the item. You may also update or add new metadata / bitstreams on the other tabs.",
+  "item.edit.tabs.status.description": "Öğe yönetimi sayfasına hoş geldiniz. Buradan öğeyi  çıkarabilir, geri yükleyebilir, taşıyabilir veya silebilirsiniz. Diğer sekmelerde de güncelleyebilir veya yeni metadata / bit akışları ekleyebilirsiniz.",
+  
+  // "item.edit.tabs.status.head": "Status",
+  "item.edit.tabs.status.head": "Durum",
+  
+  // "item.edit.tabs.status.labels.handle": "Handle",
+  "item.edit.tabs.status.labels.handle": "Handle",
+  
+  // "item.edit.tabs.status.labels.id": "Item Internal ID",
+  "item.edit.tabs.status.labels.id": "Öge Dahili Kimliğ",
+  
+  // "item.edit.tabs.status.labels.itemPage": "Item Page",
+  "item.edit.tabs.status.labels.itemPage": "Öge sayfası",
+  
+  // "item.edit.tabs.status.labels.lastModified": "Last Modified",
+  "item.edit.tabs.status.labels.lastModified": "Son düzenleme",
+  
+  // "item.edit.tabs.status.title": "Item Edit -  Status",
+  "item.edit.tabs.status.title": "Öge düzenle -  Durum",
+  
+  // "item.edit.tabs.versionhistory.head": "Version History",
+  "item.edit.tabs.versionhistory.head": "Sürüm Geçmişi",
+  
+  // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
+  "item.edit.tabs.versionhistory.title": "Öge düzenle - Sürüm Geçmişi",
+  
+  // "item.edit.tabs.versionhistory.under-construction": "Editing or adding new versions is not yet possible in this user interface.",
+  "item.edit.tabs.versionhistory.under-construction": "Bu kullanıcı arayüzünde henüz yeni sürümleri düzenlemek veya eklemek mümkün değil.",
+  
+  // "item.edit.tabs.view.head": "View Item",
+  "item.edit.tabs.view.head": "Ürünü incele",
+  
+  // "item.edit.tabs.view.title": "Item Edit -  View",
+  "item.edit.tabs.view.title": "Öge düzenle -  incele",
+  
+  
+  
+  // "item.edit.withdraw.cancel": "Cancel",
+  "item.edit.withdraw.cancel": "İptal et",
+  
+  // "item.edit.withdraw.confirm": "Withdraw",
+  "item.edit.withdraw.confirm": "Çıkar",
+  
+  // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
+  "item.edit.withdraw.description": "Bu öğenin arşivden çıkartılması gerektiğinden emin misiniz?",
+  
+  // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
+  "item.edit.withdraw.error": "Öğe çıkartılırken bir hata oluştu",
+  
+  // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
+  "item.edit.withdraw.header": "Çıkarılan öge: {{ id }}",
+  
+  // "item.edit.withdraw.success": "The item was withdrawn successfully",
+  "item.edit.withdraw.success": "Öğe başarıyla çıkartıldı",
+  
+  
+  
+  // "item.listelement.badge": "Item",
+  "item.listelement.badge": "Öge",
+  
+  // "item.page.description": "Description",
+  "item.page.description": "Açıklama",
+  
+  // "item.page.edit": "Edit this item",
+  "item.page.edit": "Bu ögeyi düzenle",
+  
+  // "item.page.journal-issn": "Journal ISSN",
+  "item.page.journal-issn": "Süreli Yayın ISSN",
+  
+  // "item.page.journal-title": "Journal Title",
+  "item.page.journal-title": "Süreli Yayın başlığı",
+  
+  // "item.page.publisher": "Publisher",
+  "item.page.publisher": "Yayınevi",
+  
+  // "item.page.titleprefix": "Item: ",
+  "item.page.titleprefix": "Öge: ",
+  
+  // "item.page.volume-title": "Volume Title",
+  "item.page.volume-title": "Cilt Başlığı",
+  
+  // "item.search.results.head": "Item Search Results",
+  "item.search.results.head": "Öge Arama Sonuçları",
+  
+  // "item.search.title": "DSpace Angular :: Item Search",
+  "item.search.title": "DSpace Angular :: Öge Arama",
+  
+  
+  // "item.page.abstract": "Abstract",
+  "item.page.abstract": "Özet",
+  
+  // "item.page.author": "Authors",
+  "item.page.author": "Yazarlar",
+  
+  // "item.page.citation": "Citation",
+  "item.page.citation": "Alıntı",
+  
+  // "item.page.collections": "Collections",
+  "item.page.collections": "Koleksiyonlar",
+  
+  // "item.page.date": "Date",
+  "item.page.date": "Tarih",
+  
+  // "item.page.edit": "Edit this item",
+  "item.page.edit": "Bu öğeyi düzenle",
+  
+  // "item.page.files": "Files",
+  "item.page.files": "Dosyalar",
+  
+  // "item.page.filesection.description": "Description:",
+  "item.page.filesection.description": "Açıklama",
+  
+  // "item.page.filesection.download": "Download",
+  "item.page.filesection.download": "İndir",
+  
+  // "item.page.filesection.format": "Format:",
+  "item.page.filesection.format": "Format:",
+  
+  // "item.page.filesection.name": "Name:",
+  "item.page.filesection.name": "Ad:",
+  
+  // "item.page.filesection.size": "Size:",
+  "item.page.filesection.size": "Boyut:",
+  
+  // "item.page.journal.search.title": "Articles in this journal",
+  "item.page.journal.search.title": "Bu süreli yayındaki makaleler",
+  
+  // "item.page.link.full": "Full item page",
+  "item.page.link.full": "Tam öğe sayfası",
+  
+  // "item.page.link.simple": "Simple item page",
+  "item.page.link.simple": "Sadeleştirilmiş öğe sayfası",
+  
+  // "item.page.person.search.title": "Articles by this author",
+  "item.page.person.search.title": "Bu yazarın makaleleri",
+  
+  // "item.page.related-items.view-more": "Show {{ amount }} more",
+  "item.page.related-items.view-more": "Daha fazla göster {{ amount }}",
+  
+  // "item.page.related-items.view-less": "Hide last {{ amount }}",
+  "item.page.related-items.view-less": "Sonuncuyu gizle {{ amount }}",
+  
+  // "item.page.relationships.isAuthorOfPublication": "Publications",
+  "item.page.relationships.isAuthorOfPublication": "Yayınlar",
+  
+  // "item.page.relationships.isJournalOfPublication": "Publications",
+  "item.page.relationships.isJournalOfPublication": "Yayınlar",
+  
+  // "item.page.relationships.isOrgUnitOfPerson": "Authors",
+  "item.page.relationships.isOrgUnitOfPerson": "Yazarlar",
+  
+  // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
+  "item.page.relationships.isOrgUnitOfProject": "Araştırma projeleri",
+  
+  // "item.page.subject": "Keywords",
+  "item.page.subject": "Anahtar kelimeler",
+  
+  // "item.page.uri": "URI",
+  "item.page.uri": "URI",
+  
+  // "item.page.bitstreams.view-more": "Show more",
+  "item.page.bitstreams.view-more": "Daha fazla göster",
+  
+  // "item.page.bitstreams.collapse": "Collapse",
+  "item.page.bitstreams.collapse": "Daralt",
+  
+  // "item.page.filesection.original.bundle" : "Original bundle",
+  "item.page.filesection.original.bundle" : "Orijinal seri",
+  
+  // "item.page.filesection.license.bundle" : "License bundle",
+  "item.page.filesection.license.bundle" : "Lisanslı seri",
+  
+  // "item.preview.dc.identifier.uri": "Identifier:",
+  "item.preview.dc.identifier.uri": "Belirteç:",
+  
+  // "item.preview.dc.contributor.author": "Authors:",
+  "item.preview.dc.contributor.author": "Yazarlar:",
+  
+  // "item.preview.dc.date.issued": "Published date:",
+  "item.preview.dc.date.issued": "Yayınlanma tarihi:",
+  
+  // "item.preview.dc.description.abstract": "Abstract:",
+  "item.preview.dc.description.abstract": "Özet:",
+  
+  // "item.preview.dc.identifier.other": "Other identifier:",
+  "item.preview.dc.identifier.other": "Diğer Belirteçler:",
+  
+  // "item.preview.dc.language.iso": "Language:",
+  "item.preview.dc.language.iso": "Dil:",
+  
+  // "item.preview.dc.subject": "Subjects:",
+  "item.preview.dc.subject": "Konular:",
+  
+  // "item.preview.dc.title": "Title:",
+  "item.preview.dc.title": "Başlık:",
+  
+  // "item.preview.person.familyName": "Surname:",
+  "item.preview.person.familyName": "Soyad:",
+  
+  // "item.preview.person.givenName": "Name:",
+  "item.preview.person.givenName": "Ad:",
+  
+  // "item.preview.person.identifier.orcid": "ORCID:",
+  "item.preview.person.identifier.orcid": "ORCID:",
+  
+  
+  // "item.select.confirm": "Confirm selected",
+  "item.select.confirm": "Seçileni onayla",
+  
+  // "item.select.empty": "No items to show",
+  "item.select.empty": "Gösterilecek öğe yok",
+  
+  // "item.select.table.author": "Author",
+  "item.select.table.author": "Yazar",
+  
+  // "item.select.table.collection": "Collection",
+  "item.select.table.collection": "Koleksiyon",
+  
+  // "item.select.table.title": "Title",
+  "item.select.table.title": "Başlık",
+  
+  
+  // "item.version.history.empty": "There are no other versions for this item yet.",
+  "item.version.history.empty": "Bu öğe için henüz başka sürüm yok.",
+  
+  // "item.version.history.head": "Version History",
+  "item.version.history.head": "Sürüm Geçmişi",
+  
+  // "item.version.history.return": "Return",
+  "item.version.history.return": "Geri dön",
+  
+  // "item.version.history.selected": "Selected version",
+  "item.version.history.selected": "Seçilen sürüm",
+  
+  // "item.version.history.table.version": "Version",
+  "item.version.history.table.version": "Sürüm",
+  
+  // "item.version.history.table.item": "Item",
+  "item.version.history.table.item": "Öge",
+  
+  // "item.version.history.table.editor": "Editor",
+  "item.version.history.table.editor": "Editör",
+  
+  // "item.version.history.table.date": "Date",
+  "item.version.history.table.date": "Tarih",
+  
+  // "item.version.history.table.summary": "Summary",
+  "item.version.history.table.summary": "Özet",
+  
+  
+  
+  // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
+  "item.version.notice": "Bu, bu öğenin en son sürümü değil. En son sürüm <a href='{{destination}}'>burada</a> bulunabilir.", 
+  
+  
+  
+  // "journal.listelement.badge": "Journal",
+  "journal.listelement.badge": "Süreli yayın",
+  
+  // "journal.page.description": "Description",
+  "journal.page.description": "Açıklama",
+  
+  // "journal.page.edit": "Edit this item",
+  "journal.page.edit": "Bu öğeyi düzenle",
+  
+  // "journal.page.editor": "Editor-in-Chief",
+  "journal.page.editor": "Genel Yayın Yönetmeni",
+  
+  // "journal.page.issn": "ISSN",
+  "journal.page.issn": "ISSN",
+  
+  // "journal.page.publisher": "Publisher",
+  "journal.page.publisher": "Yayınevi",
+  
+  // "journal.page.titleprefix": "Journal: ",
+  "journal.page.titleprefix": "Süreli yayın: ",
+  
+  // "journal.search.results.head": "Journal Search Results",
+  "journal.search.results.head": "Süreli Yayın Arama Sonuçları",
+  
+  // "journal.search.title": "DSpace Angular :: Journal Search",
+  "journal.search.title": "DSpace Angular :: Süreli Yayın Arama",
+  
+  
+  
+  // "journalissue.listelement.badge": "Journal Issue",
+  "journalissue.listelement.badge": "Süreli Yayın Sayısı",
+  
+  // "journalissue.page.description": "Description",
+  "journalissue.page.description": "Açıklama",
+  
+  // "journalissue.page.edit": "Edit this item",
+  "journalissue.page.edit": "Bu öğeyi düzenle",
+  
+  // "journalissue.page.issuedate": "Issue Date",
+  "journalissue.page.issuedate": "Yayın tarihi",
+  
+  // "journalissue.page.journal-issn": "Journal ISSN",
+  "journalissue.page.journal-issn": "Süreli yayın ISSN",
+  
+  // "journalissue.page.journal-title": "Journal Title",
+  "journalissue.page.journal-title": "Süreli yayın Başlığı",
+  
+  // "journalissue.page.keyword": "Keywords",
+  "journalissue.page.keyword": "Anahtar kelimeler",
+  
+  // "journalissue.page.number": "Number",
+  "journalissue.page.number": "Sayı",
+  
+  // "journalissue.page.titleprefix": "Journal Issue: ",
+  "journalissue.page.titleprefix": "Süreli yayın sayısı: ",
+  
+  
+  
+  // "journalvolume.listelement.badge": "Journal Volume",
+  "journalvolume.listelement.badge": "Süreli yayın cilti",
+  
+  // "journalvolume.page.description": "Description",
+  "journalvolume.page.description": "Açıklama",
+  
+  // "journalvolume.page.edit": "Edit this item",
+  "journalvolume.page.edit": "Bu öğeyi düzenle",
+  
+  // "journalvolume.page.issuedate": "Issue Date",
+  "journalvolume.page.issuedate": "Yayın tarihi",
+  
+  // "journalvolume.page.titleprefix": "Journal Volume: ",
+  "journalvolume.page.titleprefix": "Süreli yayın cilti: ",
+  
+  // "journalvolume.page.volume": "Volume",
+  "journalvolume.page.volume": "Cilt",
+  
+  
+  
+  // "loading.bitstream": "Loading bitstream...",
+  "loading.bitstream": "Bitstream yükleniyor...",
+  
+  // "loading.bitstreams": "Loading bitstreams...",
+  "loading.bitstreams": "Bitstream yükleniyor...",
+  
+  // "loading.browse-by": "Loading items...",
+  "loading.browse-by": "Bitstream yükleniyor...",
+  
+  // "loading.browse-by-page": "Loading page...",
+  "loading.browse-by-page": "Yükleme sayfası...",
+  
+  // "loading.collection": "Loading collection...",
+  "loading.collection": "Koleksiyon yükleniyor...",
+  
+  // "loading.collections": "Loading collections...",
+  "loading.collections": "Koleksiyon yükleniyor...",
+  
+  // "loading.content-source": "Loading content source...",
+  "loading.content-source": "İçerik kaynağı yükleniyor...",
+  
+  // "loading.community": "Loading community...",
+  "loading.community": "Komünite yükleniyor...",
+  
+  // "loading.default": "Loading...",
+  "loading.default": "Yükleniyor...",
+  
+  // "loading.item": "Loading item...",
+  "loading.item": "Ögeler yükleniyor...",
+  
+  // "loading.items": "Loading items...",
+  "loading.items": "Ögeler yükleniyor...",
+  
+  // "loading.mydspace-results": "Loading items...",
+  "loading.mydspace-results": "Ögeler yükleniyor...",
+  
+  // "loading.objects": "Loading...",
+  "loading.objects": "Yükleniyor...",
+  
+  // "loading.recent-submissions": "Loading recent submissions...",
+  "loading.recent-submissions": "Son gönderiler yükleniyor...",
+  
+  // "loading.search-results": "Loading search results...",
+  "loading.search-results": "Arama sonuçları yükleniyor...",
+  
+  // "loading.sub-collections": "Loading sub-collections...",
+  "loading.sub-collections": "Alt koleksiyonlar yükleniyor...",
+  
+  // "loading.sub-communities": "Loading sub-communities...",
+  "loading.sub-communities": "Alt komüniteler yükleniyor...",
+  
+  // "loading.top-level-communities": "Loading top-level communities...",
+  "loading.top-level-communities": "Üst düzey komüniteler yükleniyor...",
+  
+  
+  
+  // "login.form.email": "Email address",
+  "login.form.email": "E-posta adresi",
+  
+  // "login.form.forgot-password": "Have you forgotten your password?",
+  "login.form.forgot-password": "Parolanızı unuttunuz mu?",
+  
+  // "login.form.header": "Please log in to DSpace",
+  "login.form.header": "Lütfen DSpace'e giriş yapın",
+  
+  // "login.form.new-user": "New user? Click here to register.",
+  "login.form.new-user": "Yeni kullanıcı mısınız? Kayıt olmak için buraya tıklayın.",
+  
+  // "login.form.or-divider": "or",
+  "login.form.or-divider": "ya da",
+  
+  // "login.form.password": "Password",
+  "login.form.password": "Parola",
+  
+  // "login.form.shibboleth": "Log in with Shibboleth",
+  "login.form.shibboleth": "Shibboleth ile giriş yapın",
+  
+  // "login.form.submit": "Log in",
+  "login.form.submit": "Giriş yap",
+  
+  // "login.title": "Login",
+  "login.title": "Giriş",
+  
+  // "login.breadcrumbs": "Login",
+  "login.breadcrumbs": "Giriş",
+  
+  
+  
+  // "logout.form.header": "Log out from DSpace",
+  "logout.form.header": "DSpace'den çıkış yapın",
+  
+  // "logout.form.submit": "Log out",
+  "logout.form.submit": "Çıkış yap",
+  
+  // "logout.title": "Logout",
+  "logout.title": "Çıkış yap",
+  
+  
+  
+  // "menu.header.admin": "Admin",
+  "menu.header.admin": "Yönetici",
+  
+  // "menu.header.image.logo": "Repository logo",
+  "menu.header.image.logo": "Depo logosu",
+  
+  
+  
+  // "menu.section.access_control": "Access Control",
+  "menu.section.access_control": "Giriş kontrolü",
+  
+  // "menu.section.access_control_authorizations": "Authorizations",
+  "menu.section.access_control_authorizations": "Yetkilendirmeler",
+  
+  // "menu.section.access_control_groups": "Groups",
+  "menu.section.access_control_groups": "Gruplar",
+  
+  // "menu.section.access_control_people": "People",
+  "menu.section.access_control_people": "Kişiler",
+  
+  
+  
+  // "menu.section.admin_search": "Admin Search",
+  "menu.section.admin_search": "Yönetici araması",
+  
+  
+  
+  // "menu.section.browse_community": "This Community",
+  "menu.section.browse_community": "Bu Komünite",
+  
+  // "menu.section.browse_community_by_author": "By Author",
+  "menu.section.browse_community_by_author": "Yazara göre",
+  
+  // "menu.section.browse_community_by_issue_date": "By Issue Date",
+  "menu.section.browse_community_by_issue_date": "Yayın tarihine göre",
+  
+  // "menu.section.browse_community_by_title": "By Title",
+  "menu.section.browse_community_by_title": "Başlığa göre",
+  
+  // "menu.section.browse_global": "All of DSpace",
+  "menu.section.browse_global": "Tümü",
+  
+  // "menu.section.browse_global_by_author": "By Author",
+  "menu.section.browse_global_by_author": "Yazara göre",
+  
+  // "menu.section.browse_global_by_dateissued": "By Issue Date",
+  "menu.section.browse_global_by_dateissued": "Yayın tarihine göre",
+  
+  // "menu.section.browse_global_by_subject": "By Subject",
+  "menu.section.browse_global_by_subject": "Konuya göre",
+  
+  // "menu.section.browse_global_by_title": "By Title",
+  "menu.section.browse_global_by_title": "Başlığa göre",
+  
+  // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
+  "menu.section.browse_global_communities_and_collections": "Komüniteler ve Koleksiyonlar",
+  
+  
+  
+  // "menu.section.control_panel": "Control Panel",
+  "menu.section.control_panel": "Kontrol Paneli",
+  
+  // "menu.section.curation_task": "Curation Task",
+  "menu.section.curation_task": "Düzenleme görevi",
+  
+  
+  
+  // "menu.section.edit": "Edit",
+  "menu.section.edit": "Düzenle",
+  
+  // "menu.section.edit_collection": "Collection",
+  "menu.section.edit_collection": "Koleksiyon",
+  
+  // "menu.section.edit_community": "Community",
+  "menu.section.edit_community": "Komünite",
+  
+  // "menu.section.edit_item": "Item",
+  "menu.section.edit_item": "Öge",
+  
+  
+  
+  // "menu.section.export": "Export",
+  "menu.section.export": "Dışa aktar",
+  
+  // "menu.section.export_collection": "Collection",
+  "menu.section.export_collection": "Koleksiyon",
+  
+  // "menu.section.export_community": "Community",
+  "menu.section.export_community": "Komünite",
+  
+  // "menu.section.export_item": "Item",
+  "menu.section.export_item": "Öge",
+  
+  // "menu.section.export_metadata": "Metadata",
+  "menu.section.export_metadata": "Metadata",
+  
+  
+  
+  // "menu.section.icon.access_control": "Access Control menu section",
+  "menu.section.icon.access_control": "Erişim Kontrolü menüsü bölümü",
+  
+  // "menu.section.icon.admin_search": "Admin search menu section",
+  "menu.section.icon.admin_search": "Yönetici arama menüsü bölümü",
+  
+  // "menu.section.icon.control_panel": "Control Panel menu section",
+  "menu.section.icon.control_panel": "Kontrol Paneli menü bölümü",
+  
+  // "menu.section.icon.curation_task": "Curation Task menu section",
+  "menu.section.icon.curation_task": "Düzenleme Görevi menüsü bölümü",
+  
+  // "menu.section.icon.edit": "Edit menu section",
+  "menu.section.icon.edit": "Menü bölümünü düzenle",
+  
+  // "menu.section.icon.export": "Export menu section",
+  "menu.section.icon.export": "Menü bölümünü dışa aktar",
+  
+  // "menu.section.icon.find": "Find menu section",
+  "menu.section.icon.find": "Menü bölümünü bulun",
+  
+  // "menu.section.icon.import": "Import menu section",
+  "menu.section.icon.import": "Menü bölümünü içe aktar",
+  
+  // "menu.section.icon.new": "New menu section",
+  "menu.section.icon.new": "Yeni menü bölümü",
+  
+  // "menu.section.icon.pin": "Pin sidebar",
+  "menu.section.icon.pin": "Yan çubuğu sabitle",
+  
+  // "menu.section.icon.processes": "Processes menu section",
+  "menu.section.icon.processes": "İşlemler menüsü bölümü",
+  
+  // "menu.section.icon.registries": "Registries menu section",
+  "menu.section.icon.registries": "Kayıtlar menüsü bölümü",
+  
+  // "menu.section.icon.statistics_task": "Statistics Task menu section",
+  "menu.section.icon.statistics_task": "İstatistik Görev menüsü bölümü",
+  
+  // "menu.section.icon.unpin": "Unpin sidebar",
+  "menu.section.icon.unpin": "Kenar çubuğunu kaldır",
+  
+  
+  
+  // "menu.section.import": "Import",
+  "menu.section.import": "İçe aktar",
+  
+  // "menu.section.import_batch": "Batch Import (ZIP)",
+  "menu.section.import_batch": "Toplu İçe Aktarma (ZIP)",
+  
+  // "menu.section.import_metadata": "Metadata",
+  "menu.section.import_metadata": "Metadata",
+
+
+
+  // "menu.section.new": "New",
+  "menu.section.new": "Yeni",
+  
+  // "menu.section.new_collection": "Collection",
+  "menu.section.new_collection": "Koleksiyon",
+  
+  // "menu.section.new_community": "Community",
+  "menu.section.new_community": "Komünite",
+  
+  // "menu.section.new_item": "Item",
+  "menu.section.new_item": "Öğe",
+  
+  // "menu.section.new_item_version": "Item Version",
+  "menu.section.new_item_version": "Öğe Sürümü",
+  
+  // "menu.section.new_process": "Process",
+  "menu.section.new_process": "Süreç",
+  
+  
+  
+  // "menu.section.pin": "Pin sidebar",
+  "menu.section.pin": "Kenar çubuğunu sabitle",
+  
+  // "menu.section.unpin": "Unpin sidebar",
+  "menu.section.unpin": "Kenar çubuğunun sabitlemesini kaldır",
+  
+  
+  
+  // "menu.section.processes": "Processes",
+  "menu.section.processes": "Süreçler",
+  
+  
+  
+  // "menu.section.registries": "Registries",
+  "menu.section.registries": "Kayıt",
+  
+  // "menu.section.registries_format": "Format",
+  "menu.section.registries_format": "Format",
+  
+  // "menu.section.registries_metadata": "Metadata",
+  "menu.section.registries_metadata": "Metadata",
+  
+  
+  
+  // "menu.section.statistics": "Statistics",
+  "menu.section.statistics": "İstatistik",
+  
+  // "menu.section.statistics_task": "Statistics Task",
+  "menu.section.statistics_task": "İstatistiksel Görev",
+  
+  
+  
+  // "menu.section.toggle.access_control": "Toggle Access Control section",
+  "menu.section.toggle.access_control": "Erişim kontrolü bölümünü aç/kapat",
+  
+  // "menu.section.toggle.control_panel": "Toggle Control Panel section",
+  "menu.section.toggle.control_panel": "Kontrol Paneli bölümünü aç/kapat",
+  
+  // "menu.section.toggle.curation_task": "Toggle Curation Task section",
+  "menu.section.toggle.curation_task": "İyileştirme Görevi bölümünü aç/kapat",
+  
+  // "menu.section.toggle.edit": "Toggle Edit section",
+  "menu.section.toggle.edit": "Düzenleme bölümünü aç/kapat",
+  
+  // "menu.section.toggle.export": "Toggle Export section",
+  "menu.section.toggle.export": "Dışa Aktarma bölümünü aç/kapat",
+  
+  // "menu.section.toggle.find": "Toggle Find section",
+  "menu.section.toggle.find": "Arama bölümünü aç/kapat",
+  
+  // "menu.section.toggle.import": "Toggle Import section",
+  "menu.section.toggle.import": "İçe Aktarma bölümünü aç/kapat",
+  
+  // "menu.section.toggle.new": "Toggle New section",
+  "menu.section.toggle.new": "Yeni bölümü aç/kapat",
+  
+  // "menu.section.toggle.registries": "Toggle Registries section",
+  "menu.section.toggle.registries": "Kayıtlar bölümünü aç/kapat",
+  
+  // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
+  "menu.section.toggle.statistics_task": "İstatistik Görev bölümünü aç/kapat",
+  
+  
+  // "menu.section.workflow": "Administer Workflow",
+  "menu.section.workflow": "İş Akışını Yönet",
+  
+  
+  // "mydspace.description": "",
+  "mydspace.description": "",
+  
+  // "mydspace.general.text-here": "here",
+  "mydspace.general.text-here": "Burada",
+  
+  // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
+  "mydspace.messages.controller-help": "Öğeyi gönderene bir mesaj göndermek için bu seçeneği seçin.",
+  
+  // "mydspace.messages.description-placeholder": "Insert your message here...",
+  "mydspace.messages.description-placeholder": "Mesajınızı buraya ekleyin...",
+  
+  // "mydspace.messages.hide-msg": "Hide message",
+  "mydspace.messages.hide-msg": "Mesajı gizle",
+  
+  // "mydspace.messages.mark-as-read": "Mark as read",
+  "mydspace.messages.mark-as-read": "Okundu olarak işaretle",
+  
+  // "mydspace.messages.mark-as-unread": "Mark as unread",
+  "mydspace.messages.mark-as-unread": "Okunmamış olarak işaretle",
+  
+  // "mydspace.messages.no-content": "No content.",
+  "mydspace.messages.no-content": "İçerik yok.",
+  
+  // "mydspace.messages.no-messages": "No messages yet.",
+  "mydspace.messages.no-messages": "Henüz mesaj yok.",
+  
+  // "mydspace.messages.send-btn": "Send",
+  "mydspace.messages.send-btn": "Gönder",
+  
+  // "mydspace.messages.show-msg": "Show message",
+  "mydspace.messages.show-msg": "Mesajı göster",
+  
+  // "mydspace.messages.subject-placeholder": "Subject...",
+  "mydspace.messages.subject-placeholder": "Konu...",
+  
+  // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
+  "mydspace.messages.submitter-help": "Kontrolöre mesaj göndermek için bu seçeneği seçin.",
+  
+  // "mydspace.messages.title": "Messages",
+  "mydspace.messages.title": "Mesajlar",
+  
+  // "mydspace.messages.to": "To",
+  "mydspace.messages.to": "-e",
+  
+  // "mydspace.new-submission": "New submission",
+  "mydspace.new-submission": "Yeni talep",
+  
+  // "mydspace.new-submission-external": "Import metadata from external source",
+  "mydspace.new-submission-external": "Harici kaynaktan metadataları içe aktar",
+  
+  // "mydspace.new-submission-external-short": "Import metadata",
+  "mydspace.new-submission-external-short": "Metadataları içeri aktar.",
+  
+  // "mydspace.results.head": "Your submissions",
+  "mydspace.results.head": "Gönderimleriniz",
+  
+  // "mydspace.results.no-abstract": "No Abstract",
+  "mydspace.results.no-abstract": "Özet yok",
+  
+  // "mydspace.results.no-authors": "No Authors",
+  "mydspace.results.no-authors": "Yazar yok.",
+  
+  // "mydspace.results.no-collections": "No Collections",
+  "mydspace.results.no-collections": "Koleksiyon yok",
+  
+  // "mydspace.results.no-date": "No Date",
+  "mydspace.results.no-date": "Tarih yok",
+  
+  // "mydspace.results.no-files": "No Files",
+  "mydspace.results.no-files": "Dosya yok",
+  
+  // "mydspace.results.no-results": "There were no items to show",
+  "mydspace.results.no-results": "Gösterilecek öğe yok.",
+  
+  // "mydspace.results.no-title": "No title",
+  "mydspace.results.no-title": "Başlık yok",
+  
+  // "mydspace.results.no-uri": "No Uri",
+  "mydspace.results.no-uri": "Uri yok",
+  
+  // "mydspace.show.workflow": "All tasks",
+  "mydspace.show.workflow": "Tüm görevler",
+  
+  // "mydspace.show.workspace": "Your Submissions",
+  "mydspace.show.workspace": "Gönderimleriniz",
+  
+  // "mydspace.status.archived": "Archived",
+  "mydspace.status.archived": "Arşivlendi",
+  
+  // "mydspace.status.validation": "Validation",
+  "mydspace.status.validation": "Doğrulama",
+  
+  // "mydspace.status.waiting-for-controller": "Waiting for controller",
+  "mydspace.status.waiting-for-controller": "Kontrolör bekleniyor",
+  
+  // "mydspace.status.workflow": "Workflow",
+  "mydspace.status.workflow": "İş akışı",
+  
+  // "mydspace.status.workspace": "Workspace",
+  "mydspace.status.workspace": "Çalışma alanı",
+  
+  // "mydspace.title": "MyDSpace",
+  "mydspace.title": "MyDSpace",
+  
+  // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
+  "mydspace.upload.upload-failed": "Yeni çalışma alanı oluşturulurken hata oluştu. Lütfen yeniden denemeden önce yüklenen içeriği doğrulayın.",
+  
+  // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
+  "mydspace.upload.upload-failed-manyentries": "İşlenemeyen dosya. Çok fazla giriş algılandı fakat dosya için yalnızca bir girişe izin verildi.",
+  
+  // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
+  "mydspace.upload.upload-failed-moreonefile": "İşlenemeyen istek. Yalnızca bir dosyaya izin verilir.",
+  
+  // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
+  "mydspace.upload.upload-multiple-successful": "{{qty}} yeni çalışma alanı öğeleri oluşturuldu.",
+  
+  // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
+  "mydspace.upload.upload-successful": "Yeni çalışma alanı öğesi oluşturuldu. Düzenlemek için {{here}} tıklayın.",
+  
+  // "mydspace.view-btn": "View",
+  "mydspace.view-btn": "Görünüm",
+  
+  
+  
+  // "nav.browse.header": "All of DSpace",
+  "nav.browse.header": "DSpace'in tümü",
+  
+  // "nav.community-browse.header": "By Community",
+  "nav.community-browse.header": "Komünite tarafından",
+  
+  // "nav.language": "Language switch",
+  "nav.language": "Dil değiştirme",
+  
+  // "nav.login": "Log In",
+  "nav.login": "Giriş yap",
+  
+  // "nav.logout": "Log Out",
+  "nav.logout": "Çıkış yap",
+  
+  // "nav.mydspace": "MyDSpace",
+  "nav.mydspace": "BenimDSpace'im",
+  
+  // "nav.profile": "Profile",
+  "nav.profile": "Profil",
+  
+  // "nav.search": "Search",
+  "nav.search": "Arama",
+  
+  // "nav.statistics.header": "Statistics",
+  "nav.statistics.header": "İstatistik",
+  
+  // "nav.stop-impersonating": "Stop impersonating EPerson",
+  "nav.stop-impersonating": "EPerson'ı taklit etmeyi bırakın",
+  
+  
+  
+  // "orgunit.listelement.badge": "Organizational Unit",
+  "orgunit.listelement.badge": "Organizasyon Birimi",
+  
+  // "orgunit.page.city": "City",
+  "orgunit.page.city": "Şehir",
+  
+  // "orgunit.page.country": "Country",
+  "orgunit.page.country": "Ülke",
+  
+  // "orgunit.page.dateestablished": "Date established",
+  "orgunit.page.dateestablished": "Kuruluş tarihi",
+  
+  // "orgunit.page.description": "Description",
+  "orgunit.page.description": "Açıklama",
+  
+  // "orgunit.page.edit": "Edit this item",
+  "orgunit.page.edit": "Bu öğeyi düzenle",
+  
+  // "orgunit.page.id": "ID",
+  "orgunit.page.id": "Kimlik",
+  
+  // "orgunit.page.titleprefix": "Organizational Unit: ",
+  "orgunit.page.titleprefix": "Organizasyon Birimi: ",
+  
+  
+  
+  // "pagination.results-per-page": "Results Per Page",
+  "pagination.results-per-page": "Sayfa başına sonuç",
+  
+  // "pagination.showing.detail": "{{ range }} of {{ total }}",
+  "pagination.showing.detail": "{{ range }} / {{ total }}",
+  
+  // "pagination.showing.label": "Now showing ",
+  "pagination.showing.label": "Şimdi gösteriliyor ",
+  
+  // "pagination.sort-direction": "Sort Options",
+  "pagination.sort-direction": "Sıralama Seçenekleri",
+  
+  
+  
+  // "person.listelement.badge": "Person",
+  "person.listelement.badge": "Kişi",
+  
+  // "person.listelement.no-title": "No name found",
+  "person.listelement.no-title": "İsim bulunamadı",
+  
+  // "person.page.birthdate": "Birth Date",
+  "person.page.birthdate": "Doğum Tarihi",
+  
+  // "person.page.edit": "Edit this item",
+  "person.page.edit": "Bu öğeyi düzenle",
+  
+  // "person.page.email": "Email Address",
+  "person.page.email": "E-posta Adresi",
+  
+  // "person.page.firstname": "First Name",
+  "person.page.firstname": "Ad",
+  
+  // "person.page.jobtitle": "Job Title",
+  "person.page.jobtitle": "İş Adı",
+  
+  // "person.page.lastname": "Last Name",
+  "person.page.lastname": "Soyad",
+  
+  // "person.page.link.full": "Show all metadata",
+  "person.page.link.full": "Tüm metadata'yı göster",
+  
+  // "person.page.orcid": "ORCID",
+  "person.page.orcid": "ORCID",
+  
+  // "person.page.staffid": "Staff ID",
+  "person.page.staffid": "Personel Kimliği",
+  
+  // "person.page.titleprefix": "Person: ",
+  "person.page.titleprefix": "Kişi: ",
+  
+  // "person.search.results.head": "Person Search Results",
+  "person.search.results.head": "Kişi Arama Sonuçları",
+  
+  // "person.search.title": "DSpace Angular :: Person Search",
+  "person.search.title": "DSpace Angular :: Kişi Arama",
+  
+  
+  
+  // "process.new.select-parameters": "Parameters",
+  "process.new.select-parameters": "Parametreler",
+  
+  // "process.new.cancel": "Cancel",
+  "process.new.cancel": "İptal etmek",
+  
+  // "process.new.submit": "Submit",
+  "process.new.submit": "Göndermek",
+  
+  // "process.new.select-script": "Script",
+  "process.new.select-script": "Betik",
+  
+  // "process.new.select-script.placeholder": "Choose a script...",
+  "process.new.select-script.placeholder": "Betik Seçiniz...",
+  
+  // "process.new.select-script.required": "Script is required",
+  "process.new.select-script.required": "Betik gerekli",
+  
+  // "process.new.parameter.file.upload-button": "Select file...",
+  "process.new.parameter.file.upload-button": "Dosya seç...",
+  
+  // "process.new.parameter.file.required": "Please select a file",
+  "process.new.parameter.file.required": "Lütfen dosya seçiniz.",
+  
+  // "process.new.parameter.string.required": "Parameter value is required",
+  "process.new.parameter.string.required": "Parametre değeri gerekli",
+  
+  // "process.new.parameter.type.value": "value",
+  "process.new.parameter.type.value": "Değer",
+  
+  // "process.new.parameter.type.file": "file",
+  "process.new.parameter.type.file": "dosya",
+  
+  // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
+  "process.new.parameter.required.missing": "Aşağıdaki parametreler gerekli ancak yine de eksik:",
+  
+  // "process.new.notification.success.title": "Success",
+  "process.new.notification.success.title": "Başarı",
+  
+  // "process.new.notification.success.content": "The process was successfully created",
+  "process.new.notification.success.content": "Süreç başarıyla oluşturuldu",
+  
+  // "process.new.notification.error.title": "Error",
+  "process.new.notification.error.title": "Hata",
+  
+  // "process.new.notification.error.content": "An error occurred while creating this process",
+  "process.new.notification.error.content": "Bu süreç oluşturulurken bir hata oluştu",
+  
+  // "process.new.header": "Create a new process",
+  "process.new.header": "Yeni bir süreç oluştur",
+  
+  // "process.new.title": "Create a new process",
+  "process.new.title": "Yeni bir süreç oluştur",
+  
+  // "process.new.breadcrumbs": "Create a new process",
+  "process.new.breadcrumbs": "Yeni bir süreç oluştur",
+  
+  
+  
+  // "process.detail.arguments" : "Arguments",
+  "process.detail.arguments" : "Argümanlar",
+  
+  // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
+  "process.detail.arguments.empty" : "Bu süreç herhangi bir argüman içermiyor",
+  
+  // "process.detail.back" : "Back",
+  "process.detail.back" : "Geri",
+  
+  // "process.detail.output" : "Process Output",
+  "process.detail.output" : "Süreç Çıktısı",
+  
+  // "process.detail.logs.button": "Retrieve process output",
+  "process.detail.logs.button": "Süreç çıktısını geri al",
+  
+  // "process.detail.logs.loading": "Retrieving",
+  "process.detail.logs.loading": "Geri almak",
+  
+  // "process.detail.logs.none": "This process has no output",
+  "process.detail.logs.none": "Bu sürecin çıktısı yok",
+  
+  // "process.detail.output-files" : "Output Files",
+  "process.detail.output-files" : "Çıktı dosyaları",
+  
+  // "process.detail.output-files.empty" : "This process doesn't contain any output files",
+  "process.detail.output-files.empty" : "Bu süreç herhangi bir çıktı dosyası içermiyor",
+  
+  // "process.detail.script" : "Script",
+  "process.detail.script" : "Betik",
+  
+  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
+  "process.detail.title" : "Süreç: {{ id }} - {{ name }}",
+  
+  // "process.detail.start-time" : "Start time",
+  "process.detail.start-time" : "Başlangıç saati",
+  
+  // "process.detail.end-time" : "Finish time",
+  "process.detail.end-time" : "Bitiş zamanı",
+  
+  // "process.detail.status" : "Status",
+  "process.detail.status" : "Durum",
+  
+  // "process.detail.create" : "Create similar process",
+  "process.detail.create" : "Benzer süreç oluştur",
+  
+  
+  
+  // "process.overview.table.finish" : "Finish time",
+  "process.overview.table.finish" : "Bitiş zamanı",
+  
+  // "process.overview.table.id" : "Process ID",
+  "process.overview.table.id" : "Süreç kimliği",
+  
+  // "process.overview.table.name" : "Name",
+  "process.overview.table.name" : "Ad",
+  
+  // "process.overview.table.start" : "Start time",
+  "process.overview.table.start" : "Başlangıç zamanı",
+  
+  // "process.overview.table.status" : "Status",
+  "process.overview.table.status" : "Durum",
+  
+  // "process.overview.table.user" : "User",
+  "process.overview.table.user" : "Kullanıcı",
+  
+  // "process.overview.title": "Processes Overview",
+  "process.overview.title": "Süreçlere Genel Bakış",
+  
+  // "process.overview.breadcrumbs": "Processes Overview",
+  "process.overview.breadcrumbs": "Süreçlere Genel Bakış",
+  
+  // "process.overview.new": "New",
+  "process.overview.new": "Yeni",
+  
+  
+  // "profile.breadcrumbs": "Update Profile",
+  "profile.breadcrumbs": "Profili Güncelle",
+  
+  // "profile.card.identify": "Identify",
+  "profile.card.identify": "Kimlik",
+  
+  // "profile.card.security": "Security",
+  "profile.card.security": "Güvenlik",
+  
+  // "profile.form.submit": "Update Profile",
+  "profile.form.submit": "Profili Güncelle",
+  
+  // "profile.groups.head": "Authorization groups you belong to",
+  "profile.groups.head": "Ait olduğunuz yetkilendirme grupları",
+  
+  // "profile.head": "Update Profile",
+  "profile.head": "Profili Güncelle",
+  
+  // "profile.metadata.form.error.firstname.required": "First Name is required",
+  "profile.metadata.form.error.firstname.required": "Ad gereklidir",
+  
+  // "profile.metadata.form.error.lastname.required": "Last Name is required",
+  "profile.metadata.form.error.lastname.required": "Soyadı gerekli",
+  
+  // "profile.metadata.form.label.email": "Email Address",
+  "profile.metadata.form.label.email": "E-posta Adresi",
+  
+  // "profile.metadata.form.label.firstname": "First Name",
+  "profile.metadata.form.label.firstname": "Ad",
+  
+  // "profile.metadata.form.label.language": "Language",
+  "profile.metadata.form.label.language": "Dil",
+  
+  // "profile.metadata.form.label.lastname": "Last Name",
+  "profile.metadata.form.label.lastname": "Soyadı",
+  
+  // "profile.metadata.form.label.phone": "Contact Telephone",
+  "profile.metadata.form.label.phone": "İletişim telefonu",
+  
+  // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
+  "profile.metadata.form.notifications.success.content": "Profilde yaptığınız değişiklikler kaydedildi.",
+  
+  // "profile.metadata.form.notifications.success.title": "Profile saved",
+  "profile.metadata.form.notifications.success.title": "Profil kaydedildi",
+  
+  // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
+  "profile.notifications.warning.no-changes.content": "Profilde herhangi bir değişiklik yapılmadı.",
+  
+  // "profile.notifications.warning.no-changes.title": "No changes",
+  "profile.notifications.warning.no-changes.title": "Değişiklik yok",
+  
+  // "profile.security.form.error.matching-passwords": "The passwords do not match.",
+  "profile.security.form.error.matching-passwords": "Parolalar eşleşmiyor.",
+  
+  // "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
+  "profile.security.form.error.password-length": "Parola en az 6 karakter uzunluğunda olmalıdır.",
+  
+  // "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": "İsteğe bağlı olarak aşağıdaki kutucuğa yeni bir parola girebilir ve ikinci kutucuğa tekrar yazarak onaylayabilirsiniz. En az altı karakter uzunluğunda olmalıdır.",
+  
+  // "profile.security.form.label.password": "Password",
+  "profile.security.form.label.password": "Parola",
+  
+  // "profile.security.form.label.passwordrepeat": "Retype to confirm",
+  "profile.security.form.label.passwordrepeat": "Doğrulamak için yeniden yazınız",
+  
+  // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
+  "profile.security.form.notifications.success.content": "Parola değişiklikleriniz kaydedildi.",
+  
+  // "profile.security.form.notifications.success.title": "Password saved",
+  "profile.security.form.notifications.success.title": "Parola kaydedildi",
+  
+  // "profile.security.form.notifications.error.title": "Error changing passwords",
+  "profile.security.form.notifications.error.title": "Parolalar değiştirilirken hata oluştu",
+  
+  // "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": "Parola en az 6 karakter uzunluğunda olmalıdır.",
+  
+  // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
+  "profile.security.form.notifications.error.not-same": "Sağlanan parolalar aynı değil.",
+  
+  // "profile.title": "Update Profile",
+  "profile.title": "Profili Güncelle",
+  
+  
+  
+  // "project.listelement.badge": "Research Project",
+  "project.listelement.badge": "Araştırma projesi",
+  
+  // "project.page.contributor": "Contributors",
+  "project.page.contributor": "Katkıda Bulunanlar",
+  
+  // "project.page.description": "Description",
+  "project.page.description": "Açıklama",
+  
+  // "project.page.edit": "Edit this item",
+  "project.page.edit": "Bu öğeyi düzenle",
+  
+  // "project.page.expectedcompletion": "Expected Completion",
+  "project.page.expectedcompletion": "Beklenen Tamamlanma",
+  
+  // "project.page.funder": "Funders",
+  "project.page.funder": "Fon Sağlayıcılar",
+  
+  // "project.page.id": "ID",
+  "project.page.id": "Kimlik",
+  
+  // "project.page.keyword": "Keywords",
+  "project.page.keyword": "Anahtar kelimeler",
+  
+  // "project.page.status": "Status",
+  "project.page.status": "Durum",
+  
+  // "project.page.titleprefix": "Research Project: ",
+  "project.page.titleprefix": "Araştırma Projesi: ",
+  
+  // "project.search.results.head": "Project Search Results",
+  "project.search.results.head": "Proje Arama Sonuçları",
+  
+  
+  
+  // "publication.listelement.badge": "Publication",
+  "publication.listelement.badge": "Yayın",
+  
+  // "publication.page.description": "Description",
+  "publication.page.description": "Açıklama",
+  
+  // "publication.page.edit": "Edit this item",
+  "publication.page.edit": "Bu öğeyi düzenle",
+  
+  // "publication.page.journal-issn": "Journal ISSN",
+  "publication.page.journal-issn": "Dergi ISSN",
+  
+  // "publication.page.journal-title": "Journal Title",
+  "publication.page.journal-title": "Dergi Başlığı",
+  
+  // "publication.page.publisher": "Publisher",
+  "publication.page.publisher": "Yayımcı",
+  
+  // "publication.page.titleprefix": "Publication: ",
+  "publication.page.titleprefix": "Yayın: ",
+  
+  // "publication.page.volume-title": "Volume Title",
+  "publication.page.volume-title": "Cilt Başlığı",
+  
+  // "publication.search.results.head": "Publication Search Results",
+  "publication.search.results.head": "Yayın Arama Sonuçları",
+  
+  // "publication.search.title": "DSpace Angular :: Publication Search",
+  "publication.search.title": "DSpace Angular :: Yayın Arama",
+  
+  
+  // "register-email.title": "New user registration",
+  "register-email.title": "Yeni kullanıcı kaydı",
+  
+  // "register-page.create-profile.header": "Create Profile",
+  "register-page.create-profile.header": "Profil oluştur",
+  
+  // "register-page.create-profile.identification.header": "Identify",
+  "register-page.create-profile.identification.header": "Tanımlamak",
+  
+  // "register-page.create-profile.identification.email": "Email Address",
+  "register-page.create-profile.identification.email": "E-posta Adresi",
+  
+  // "register-page.create-profile.identification.first-name": "First Name *",
+  "register-page.create-profile.identification.first-name": "Ad *",
+  
+  // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
+  "register-page.create-profile.identification.first-name.error": "Lütfen bir ad girin",
+  
+  // "register-page.create-profile.identification.last-name": "Last Name *",
+  "register-page.create-profile.identification.last-name": "Soyadı *",
+  
+  // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
+  "register-page.create-profile.identification.last-name.error": "Lütfen bir soyadı girin",
+  
+  // "register-page.create-profile.identification.contact": "Contact Telephone",
+  "register-page.create-profile.identification.contact": "İletişim telefonu",
+  
+  // "register-page.create-profile.identification.language": "Language",
+  "register-page.create-profile.identification.language": "Dil",
+  
+  // "register-page.create-profile.security.header": "Security",
+  "register-page.create-profile.security.header": "Güvenlik",
+  
+  // "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": "Lütfen aşağıdaki kutuya bir parola girin ve ikinci kutuya tekrar yazarak onaylayın. En az altı karakter uzunluğunda olmalıdır.",
+  
+  // "register-page.create-profile.security.label.password": "Password *",
+  "register-page.create-profile.security.label.password": "Parola *",
+  
+  // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
+  "register-page.create-profile.security.label.passwordrepeat": "Doğrulamak için yeniden yazınız *",
+  
+  // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
+  "register-page.create-profile.security.error.empty-password": "Lütfen aşağıdaki kutuya bir parola girin.",
+  
+  // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
+  "register-page.create-profile.security.error.matching-passwords": "Parolalar eşleşmiyor.",
+  
+  // "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": "Parola en az 6 karakter uzunluğunda olmalıdır.",
+  
+  // "register-page.create-profile.submit": "Complete Registration",
+  "register-page.create-profile.submit": "Kaydı Tamamla",
+  
+  // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
+  "register-page.create-profile.submit.error.content": "Yeni bir kullanıcı kaydedilirken bir şeyler ters gitti.",
+  
+  // "register-page.create-profile.submit.error.head": "Registration failed",
+  "register-page.create-profile.submit.error.head": "Kayıt başarısız",
+  
+  // "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.",
+  "register-page.create-profile.submit.success.content": "Kayıt başarıyla tamamlandı. Oluşturulan kullanıcı olarak giriş yaptınız",
+  
+  // "register-page.create-profile.submit.success.head": "Registration completed",
+  "register-page.create-profile.submit.success.head": "Kayıt tamamlandı",
+  
+  
+  // "register-page.registration.header": "New user registration",
+  "register-page.registration.header": "Yeni kullanıcı kaydı",
+  
+  // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+  "register-page.registration.info": "E-mail güncellemeleri için koleksiyonlara abone olup hesap açın. Ve DSapce’e yeni öğeler kaydetin.",
+  
+  // "register-page.registration.email": "Email Address *",
+  "register-page.registration.email": "E-posta Adresi *",
+  
+  // "register-page.registration.email.error.required": "Please fill in an email address",
+  "register-page.registration.email.error.required": "Lütfen bir e-posta adresi girin",
+  
+  // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
+  "register-page.registration.email.error.pattern": "Lütfen geçerli bir email adresi girin",
+  
+  // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
+  "register-page.registration.email.hint": "Bu adres doğrulanacak ve oturum açma adınız olarak kullanılacaktır.",
+  
+  // "register-page.registration.submit": "Register",
+  "register-page.registration.submit": "Kayıt olmak",
+  
+  // "register-page.registration.success.head": "Verification email sent",
+  "register-page.registration.success.head": "Doğrulama e-postası gönderildi",
+  
+  // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "register-page.registration.success.content": "{{ email }} adresine özel bir URL ve daha fazla talimat içeren bir e-posta gönderildi.",
+  
+  // "register-page.registration.error.head": "Error when trying to register email",
+  "register-page.registration.error.head": "E-posta kaydetmeye çalışırken hata",
+  
+  // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  "register-page.registration.error.content": "Aşağıdaki e-posta adresi kaydedilirken bir hata oluştu: {{ email }}",
+  
+  
+  
+  // "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
+  "relationships.add.error.relationship-type.content": "İki öğe arasında {{ type }} ilişki türü için uygun bir eşleşme bulunamadı",
+  
+  // "relationships.add.error.server.content": "The server returned an error",
+  "relationships.add.error.server.content": "Sunucu bir hata verdi",
+  
+  // "relationships.add.error.title": "Unable to add relationship",
+  "relationships.add.error.title": "İlişki eklenemedi",
+  
+  // "relationships.isAuthorOf": "Authors",
+  "relationships.isAuthorOf": "Yazarlar",
+  
+  // "relationships.isAuthorOf.Person": "Authors (persons)",
+  "relationships.isAuthorOf.Person": "Yazarlar (kişiler)",
+  
+  // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
+  "relationships.isAuthorOf.OrgUnit": "Yazarlar (organizasyon birimleri)",
+  
+  // "relationships.isIssueOf": "Journal Issues",
+  "relationships.isIssueOf": "Dergi Sayıları",
+  
+  // "relationships.isJournalIssueOf": "Journal Issue",
+  "relationships.isJournalIssueOf": "Dergi Sayısı",
+  
+  // "relationships.isJournalOf": "Journals",
+  "relationships.isJournalOf": "Dergiler",
+  
+  // "relationships.isOrgUnitOf": "Organizational Units",
+  "relationships.isOrgUnitOf": "Organizasyon Birimleri",
+  
+  // "relationships.isPersonOf": "Authors",
+  "relationships.isPersonOf": "Yazarlar",
+  
+  // "relationships.isProjectOf": "Research Projects",
+  "relationships.isProjectOf": "Araştırma Projeleri",
+  
+  // "relationships.isPublicationOf": "Publications",
+  "relationships.isPublicationOf": "Yayınlar",
+  
+  // "relationships.isPublicationOfJournalIssue": "Articles",
+  "relationships.isPublicationOfJournalIssue": "Makaleler",
+  
+  // "relationships.isSingleJournalOf": "Journal",
+  "relationships.isSingleJournalOf": "Dergi",
+  
+  // "relationships.isSingleVolumeOf": "Journal Volume",
+  "relationships.isSingleVolumeOf": "Dergi Cilti",
+  
+  // "relationships.isVolumeOf": "Journal Volumes",
+  "relationships.isVolumeOf": "Dergi Ciltleri",
+  
+  // "relationships.isContributorOf": "Contributors",
+  "relationships.isContributorOf": "Katkıda Bulunanlar",
+  
+  
+  
+  // "resource-policies.add.button": "Add",
+  "resource-policies.add.button": "Ekle",
+  
+  // "resource-policies.add.for.": "Add a new policy",
+  "resource-policies.add.for.": "Yeni bir politika ekle",
+  
+  // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
+  "resource-policies.add.for.bitstream": "Yeni bir Bitstream ilkesi ekleyin",
+  
+  // "resource-policies.add.for.bundle": "Add a new Bundle policy",
+  "resource-policies.add.for.bundle": "Yeni bir Bundle ilkesi ekleyin",
+  
+  // "resource-policies.add.for.item": "Add a new Item policy",
+  "resource-policies.add.for.item": "Yeni bir öğe ilkesi ekleyin",
+  
+  // "resource-policies.add.for.community": "Add a new Community policy",
+  "resource-policies.add.for.community": "Yeni bir Komünite politikası ekle",
+  
+  // "resource-policies.add.for.collection": "Add a new Collection policy",
+  "resource-policies.add.for.collection": "Yeni bir Koleksiyon politikası ekle",
+  
+  // "resource-policies.create.page.heading": "Create new resource policy for ",
+  "resource-policies.create.page.heading": "Şunun için yeni kaynak ilkesi oluşturun: ",
+  
+  // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
+  "resource-policies.create.page.failure.content": "Kaynak ilkesi oluşturulurken bir hata oluştu.",
+  
+  // "resource-policies.create.page.success.content": "Operation successful",
+  "resource-policies.create.page.success.content": "Operasyon başarılı",
+  
+  // "resource-policies.create.page.title": "Create new resource policy",
+  "resource-policies.create.page.title": "Yeni kaynak politikası oluştur",
+  
+  // "resource-policies.delete.btn": "Delete selected",
+  "resource-policies.delete.btn": "Seçileni sil",
+  
+  // "resource-policies.delete.btn.title": "Delete selected resource policies",
+  "resource-policies.delete.btn.title": "Seçili kaynak politikalarını sil",
+  
+  // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
+  "resource-policies.delete.failure.content": "Seçili kaynak ilkeleri silinirken bir hata oluştu.",
+  
+  // "resource-policies.delete.success.content": "Operation successful",
+  "resource-policies.delete.success.content": "İşlem başarılı",
+  
+  // "resource-policies.edit.page.heading": "Edit resource policy ",
+  "resource-policies.edit.page.heading": "Kaynak politikasını düzenle ",
+  
+  // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
+  "resource-policies.edit.page.failure.content": "Kaynak ilkesi düzenlenirken bir hata oluştu.",
+  
+  // "resource-policies.edit.page.success.content": "Operation successful",
+  "resource-policies.edit.page.success.content": "İşlem başarılı",
+  
+  // "resource-policies.edit.page.title": "Edit resource policy",
+  "resource-policies.edit.page.title": "Kaynak politikasını düzenle",
+  
+  // "resource-policies.form.action-type.label": "Select the action type",
+  "resource-policies.form.action-type.label": "Eylem türünü seçin",
+  
+  // "resource-policies.form.action-type.required": "You must select the resource policy action.",
+  "resource-policies.form.action-type.required": "Kaynak ilkesi eylemini seçmelisiniz.",
+  
+  // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
+  "resource-policies.form.eperson-group-list.label": "İzin verilecek e-kişi veya grup",
+  
+  // "resource-policies.form.eperson-group-list.select.btn": "Select",
+  "resource-policies.form.eperson-group-list.select.btn": "Seç",
+  
+  // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
+  "resource-policies.form.eperson-group-list.tab.eperson": "e-kişi arayın",
+  
+  // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
+  "resource-policies.form.eperson-group-list.tab.group": "Grup arayın",
+  
+  // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
+  "resource-policies.form.eperson-group-list.table.headers.action": "Eylem",
+  
+  // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
+  "resource-policies.form.eperson-group-list.table.headers.id": "Kimlik",
+  
+  // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
+  "resource-policies.form.eperson-group-list.table.headers.name": "Ad",
+  
+  // "resource-policies.form.date.end.label": "End Date",
+  "resource-policies.form.date.end.label": "Bitiş Tarihi",
+  
+  // "resource-policies.form.date.start.label": "Start Date",
+  "resource-policies.form.date.start.label": "Başlangıç tarihi",
+  
+  // "resource-policies.form.description.label": "Description",
+  "resource-policies.form.description.label": "Açıklama",
+  
+  // "resource-policies.form.name.label": "Name",
+  "resource-policies.form.name.label": "Ad",
+  
+  // "resource-policies.form.policy-type.label": "Select the policy type",
+  "resource-policies.form.policy-type.label": "Politika türünü seçin",
+  
+  // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
+  "resource-policies.form.policy-type.required": "Kaynak ilkesi türünü seçmelisiniz.",
+  
+  // "resource-policies.table.headers.action": "Action",
+  "resource-policies.table.headers.action": "Eylem",
+  
+  // "resource-policies.table.headers.date.end": "End Date",
+  "resource-policies.table.headers.date.end": "Bitiş tarihi",
+  
+  // "resource-policies.table.headers.date.start": "Start Date",
+  "resource-policies.table.headers.date.start": "Başlangıç Tarihi",
+  
+  // "resource-policies.table.headers.edit": "Edit",
+  "resource-policies.table.headers.edit": "Düzenle",
+  
+  // "resource-policies.table.headers.edit.group": "Edit group",
+  "resource-policies.table.headers.edit.group": "Grubu düzenle",
+  
+  // "resource-policies.table.headers.edit.policy": "Edit policy",
+  "resource-policies.table.headers.edit.policy": "Politikayı düzenle",
+  
+  // "resource-policies.table.headers.eperson": "E-kişi",
+  "resource-policies.table.headers.eperson": "E-kişi",
+  
+  // "resource-policies.table.headers.group": "Grup",
+  "resource-policies.table.headers.group": "Grup",
+  
+  // "resource-policies.table.headers.id": "ID",
+  "resource-policies.table.headers.id": "Kimlik",
+  
+  // "resource-policies.table.headers.name": "Name",
+  "resource-policies.table.headers.name": "Ad",
+  
+  // "resource-policies.table.headers.policyType": "type",
+  "resource-policies.table.headers.policyType": "tür",
+  
+  // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
+  "resource-policies.table.headers.title.for.bitstream": "BitStream Politikaları",
+  
+  // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
+  "resource-policies.table.headers.title.for.bundle": "Bundle Politikaları",
+  
+  // "resource-policies.table.headers.title.for.item": "Policies for Item",
+  "resource-policies.table.headers.title.for.item": "Öğe Politikaları",
+  
+  // "resource-policies.table.headers.title.for.community": "Policies for Community",
+  "resource-policies.table.headers.title.for.community": "Komünite Politikaları",
+  
+  // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
+  "resource-policies.table.headers.title.for.collection": "Koleksiyon Politikaları",
+  
+  
+  
+  // "search.description": "",
+  "search.description": "",
+  
+  // "search.switch-configuration.title": "Show",
+  "search.switch-configuration.title": "Göster",
+  
+  // "search.title": "DSpace Angular :: Search",
+  "search.title": "DSpace Angular :: Ara",
+  
+  // "search.breadcrumbs": "Search",
+  "search.breadcrumbs": "Ara",
+  
+  
+  // "search.filters.applied.f.author": "Author",
+  "search.filters.applied.f.author": "Yazar",
+  
+  // "search.filters.applied.f.dateIssued.max": "End date",
+  "search.filters.applied.f.dateIssued.max": "Bitiş tarihi",
+  
+  // "search.filters.applied.f.dateIssued.min": "Start date",
+  "search.filters.applied.f.dateIssued.min": "Başlangıç Tarihi",
+  
+  // "search.filters.applied.f.dateSubmitted": "Date submitted",
+  "search.filters.applied.f.dateSubmitted": "Gönderilme tarihi",
+  
+  // "search.filters.applied.f.discoverable": "Private",
+  "search.filters.applied.f.discoverable": "Özel",
+  
+  // "search.filters.applied.f.entityType": "Item Type",
+  "search.filters.applied.f.entityType": "Öğe Türü",
+  
+  // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
+  "search.filters.applied.f.has_content_in_original_bundle": "Has dosyaları",
+  
+  // "search.filters.applied.f.itemtype": "Type",
+  "search.filters.applied.f.itemtype": "Tür",
+  
+  // "search.filters.applied.f.namedresourcetype": "Status",
+  "search.filters.applied.f.namedresourcetype": "Durum",
+  
+  // "search.filters.applied.f.subject": "Subject",
+  "search.filters.applied.f.subject": "Konu",
+  
+  // "search.filters.applied.f.submitter": "Submitter",
+  "search.filters.applied.f.submitter": "Gönderen",
+  
+  // "search.filters.applied.f.jobTitle": "Job Title",
+  "search.filters.applied.f.jobTitle": "İş Adı",
+  
+  // "search.filters.applied.f.birthDate.max": "End birth date",
+  "search.filters.applied.f.birthDate.max": "Doğum Tarih Sonu",
+  
+  // "search.filters.applied.f.birthDate.min": "Start birth date",
+  "search.filters.applied.f.birthDate.min": "Doğum Tarih Başlangıcı",
+  
+  // "search.filters.applied.f.withdrawn": "Withdrawn",
+  "search.filters.applied.f.withdrawn": "Geri çekildi",
+  
+  
+  
+  // "search.filters.filter.author.head": "Author",
+  "search.filters.filter.author.head": "Yazar",
+  
+  // "search.filters.filter.author.placeholder": "Author name",
+  "search.filters.filter.author.placeholder": "Yazar adı",
+  
+  // "search.filters.filter.birthDate.head": "Birth Date",
+  "search.filters.filter.birthDate.head": "Doğum Tarihi",
+  
+  // "search.filters.filter.birthDate.placeholder": "Birth Date",
+  "search.filters.filter.birthDate.placeholder": "Doğum Tarihi",
+  
+  // "search.filters.filter.creativeDatePublished.head": "Date Published",
+  "search.filters.filter.creativeDatePublished.head": "Yayınlanma Tarihi",
+  
+  // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
+  "search.filters.filter.creativeDatePublished.placeholder": "Yayınlanma Tarihi",
+  
+  // "search.filters.filter.creativeWorkEditor.head": "Editor",
+  "search.filters.filter.creativeWorkEditor.head": "Editör",
+  
+  // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
+  "search.filters.filter.creativeWorkEditor.placeholder": "Editör",
+  
+  // "search.filters.filter.creativeWorkKeywords.head": "Subject",
+  "search.filters.filter.creativeWorkKeywords.head": "Konu",
+  
+  // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "Konu",
+  
+  // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.head": "Yayımcı",
+  
+  // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Yayımcı",
+  
+  // "search.filters.filter.dateIssued.head": "Date",
+  "search.filters.filter.dateIssued.head": "Tarih",
+
+  // "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
+  "search.filters.filter.dateIssued.max.placeholder": "En Erken Tarih",
+  
+  // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
+  "search.filters.filter.dateIssued.min.placeholder": "En Geç Tarih",
+  
+  // "search.filters.filter.dateSubmitted.head": "Date submitted",
+  "search.filters.filter.dateSubmitted.head": "Teslim Edilen Tarih",
+  
+  // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
+  "search.filters.filter.dateSubmitted.placeholder": "Teslim Edilen Tarih",
+  
+  // "search.filters.filter.discoverable.head": "Private",
+  "search.filters.filter.discoverable.head": "Özel",
+  
+  // "search.filters.filter.withdrawn.head": "Withdrawn",
+  "search.filters.filter.withdrawn.head": "Alınmış",
+  
+  // "search.filters.filter.entityType.head": "Item Type",
+  "search.filters.filter.entityType.head": "Materyal Türü",
+  
+  // "search.filters.filter.entityType.placeholder": "Item Type",
+  "search.filters.filter.entityType.placeholder": "Materyal Türü",
+  
+  // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
+  "search.filters.filter.has_content_in_original_bundle.head": "Dosyalara Sahip",
+  
+  // "search.filters.filter.itemtype.head": "Type",
+  "search.filters.filter.itemtype.head": "Tür",
+  
+  // "search.filters.filter.itemtype.placeholder": "Type",
+  "search.filters.filter.itemtype.placeholder": "Tür",
+  
+  // "search.filters.filter.jobTitle.head": "Job Title",
+  "search.filters.filter.jobTitle.head": "İş Ünvanı",
+  
+  // "search.filters.filter.jobTitle.placeholder": "Job Title",
+  "search.filters.filter.jobTitle.placeholder": "İş Ünvanı",
+  
+  // "search.filters.filter.knowsLanguage.head": "Known language",
+  "search.filters.filter.knowsLanguage.head": "Bilinen Diller",
+  
+  // "search.filters.filter.knowsLanguage.placeholder": "Known language",
+  "search.filters.filter.knowsLanguage.placeholder": "Bilinen Diller",
+  
+  // "search.filters.filter.namedresourcetype.head": "Status",
+  "search.filters.filter.namedresourcetype.head": "Durum",
+  
+  // "search.filters.filter.namedresourcetype.placeholder": "Status",
+  "search.filters.filter.namedresourcetype.placeholder": "Durum",
+  
+  // "search.filters.filter.objectpeople.head": "People",
+  "search.filters.filter.objectpeople.head": "İnsanlar",
+  
+  // "search.filters.filter.objectpeople.placeholder": "People",
+  "search.filters.filter.objectpeople.placeholder": "İnsanlar",
+  
+  // "search.filters.filter.organizationAddressCountry.head": "Country",
+  "search.filters.filter.organizationAddressCountry.head": "Ülke",
+  
+  // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
+  "search.filters.filter.organizationAddressCountry.placeholder": "Ülke",
+  
+  // "search.filters.filter.organizationAddressLocality.head": "City",
+  "search.filters.filter.organizationAddressLocality.head": "Şehir",
+  
+  // "search.filters.filter.organizationAddressLocality.placeholder": "City",
+  "search.filters.filter.organizationAddressLocality.placeholder": "Şehir",
+  
+  // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.head": "Bulunduğu Tarih",
+  
+  // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.placeholder": "Bulunduğu Tarih",
+  
+  // "search.filters.filter.scope.head": "Scope",
+  "search.filters.filter.scope.head": "Kapsam",
+  
+  // "search.filters.filter.scope.placeholder": "Scope filter",
+  "search.filters.filter.scope.placeholder": "Kapsam Filtresi",
+  
+  // "search.filters.filter.show-less": "Collapse",
+  "search.filters.filter.show-less": "Yığılmış",
+  
+  // "search.filters.filter.show-more": "Show more",
+  "search.filters.filter.show-more": "Daha Fazla Göster",
+  
+  // "search.filters.filter.subject.head": "Subject",
+  "search.filters.filter.subject.head": "Konu",
+  
+  // "search.filters.filter.subject.placeholder": "Subject",
+  "search.filters.filter.subject.placeholder": "Konu",
+  
+  // "search.filters.filter.submitter.head": "Submitter",
+  "search.filters.filter.submitter.head": "Teslim Eden",
+  
+  // "search.filters.filter.submitter.placeholder": "Submitter",
+  "search.filters.filter.submitter.placeholder": "Teslim Eden",
+  
+  
+  
+  // "search.filters.entityType.JournalIssue": "Journal Issue",
+  "search.filters.entityType.JournalIssue": "Makale Konusu",
+  
+  // "search.filters.entityType.JournalVolume": "Journal Volume",
+  "search.filters.entityType.JournalVolume": "Cilt Sayısı",
+  
+  // "search.filters.entityType.OrgUnit": "Organizational Unit",
+  "search.filters.entityType.OrgUnit": "Ait Olduğu Organizasyon",
+  
+  // "search.filters.has_content_in_original_bundle.true": "Yes",
+  "search.filters.has_content_in_original_bundle.true": "Evet",
+  
+  // "search.filters.has_content_in_original_bundle.false": "No",
+  "search.filters.has_content_in_original_bundle.false": "Hayır",
+  
+  // "search.filters.discoverable.true": "No",
+  "search.filters.discoverable.true": "Hayır",
+  
+  // "search.filters.discoverable.false": "Yes",
+  "search.filters.discoverable.false": "Evet",
+  
+  // "search.filters.withdrawn.true": "Yes",
+  "search.filters.withdrawn.true": "Evet",
+  
+  // "search.filters.withdrawn.false": "No",
+  "search.filters.withdrawn.false": "Hayır",
+  
+  
+  // "search.filters.head": "Filters",
+  "search.filters.head": "Filtreler",
+  
+  // "search.filters.reset": "Reset filters",
+  "search.filters.reset": "Filtreleri Sıfırla",
+  
+  
+  
+  // "search.form.search": "Search",
+  "search.form.search": "Ara",
+  
+  // "search.form.search_dspace": "Search DSpace",
+  "search.form.search_dspace": "DSpace içinde Ara",
+  
+  // "search.form.search_mydspace": "Search MyDSpace",
+  "search.form.search_mydspace": "MyDSpace içinde Ara",
+  
+  
+  
+  // "search.results.head": "Search Results",
+  "search.results.head": "Sonuçları Ara",
+  
+  // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
+  "search.results.no-results": "Aramanız hiçbir sonuç vermedi. Aradığınızı bulmakta sorun mu yaşıyorsunuz? Bir daha deneyin.",
+  
+  // "search.results.no-results-link": "quotes around it",
+  "search.results.no-results-link": "Çevresindeki Alıntılar",
+  
+  // "search.results.empty": "Your search returned no results.",
+  "search.results.empty": "Aramanız hiçbir sonuç vermedi.",
+  
+  
+  
+  // "search.sidebar.close": "Back to results",
+  "search.sidebar.close": "Sonuçlara Dön",
+  
+  // "search.sidebar.filters.title": "Filters",
+  "search.sidebar.filters.title": "Filtreler",
+  
+  // "search.sidebar.open": "Search Tools",
+  "search.sidebar.open": "Araç Gereç Ara",
+  
+  // "search.sidebar.results": "results",
+  "search.sidebar.results": "Sonuçlar",
+  
+  // "search.sidebar.settings.rpp": "Results per page",
+  "search.sidebar.settings.rpp": "Sayfa Sonuçları",
+  
+  // "search.sidebar.settings.sort-by": "Sort By",
+  "search.sidebar.settings.sort-by": "Göre Sıralanmış",
+  
+  // "search.sidebar.settings.title": "Settings",
+  "search.sidebar.settings.title": "Ayarlar",
+  
+  
+  
+  // "search.view-switch.show-detail": "Show detail",
+  "search.view-switch.show-detail": "Detayları Göster",
+  
+  // "search.view-switch.show-grid": "Show as grid",
+  "search.view-switch.show-grid": "Ağ Dizge Olarak Göster",
+  
+  // "search.view-switch.show-list": "Show as list",
+  "search.view-switch.show-list": "Liste Olarak Göster",
+  
+  
+  
+  // "sorting.ASC": "Ascending",
+  "sorting.ASC": "Artan",
+  
+  // "sorting.DESC": "Descending",
+  "sorting.DESC": "Azalan",
+  
+  // "sorting.dc.title.ASC": "Title Ascending",
+  "sorting.dc.title.ASC": "Artan Başlıklar",
+  
+  // "sorting.dc.title.DESC": "Title Descending",
+  "sorting.dc.title.DESC": "Azalan Başlıklar",
+  
+  // "sorting.score.DESC": "Relevance",
+  "sorting.score.DESC": "Bağıntılı",
+  
+  
+  
+  // "statistics.title": "Statistics",
+  "statistics.title": "İstatistikler",
+  
+  // "statistics.header": "Statistics for {{ scope }}",
+  "statistics.header": "{{ scope }} için İstatistikler",
+  
+  // "statistics.breadcrumbs": "Statistics",
+  "statistics.breadcrumbs": "İstatistikler",
+  
+  // "statistics.page.no-data": "No data available",
+  "statistics.page.no-data": "Data Bulunamadı.",
+  
+  // "statistics.table.no-data": "No data available",
+  "statistics.table.no-data": "Data Bulunamadı.",
+  
+  // "statistics.table.title.TotalVisits": "Total visits",
+  "statistics.table.title.TotalVisits": "Toplam Ziyaretler",
+  
+  // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
+  "statistics.table.title.TotalVisitsPerMonth": "Aylık Toplam Ziyaretler",
+  
+  // "statistics.table.title.TotalDownloads": "File Visits",
+  "statistics.table.title.TotalDownloads": "Dosya Ziyaretleri",
+  
+  // "statistics.table.title.TopCountries": "Top country views",
+  "statistics.table.title.TopCountries": "En Çok Gösterilen Ülke",
+  
+  // "statistics.table.title.TopCities": "Top city views",
+  "statistics.table.title.TopCities": "En Çok Gösterilen Şehir",
+  
+  // "statistics.table.header.views": "Views",
+  "statistics.table.header.views": "Gösterilmeler",
+  
+  
+  
+  // "submission.edit.title": "Edit Submission",
+  "submission.edit.title": "Teslimi Düzenle",
+  
+  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
+  "submission.general.cannot_submit": "Yeni bir teslim yapamazsınız.",
+  
+  // "submission.general.deposit": "Deposit",
+  "submission.general.deposit": "Tamamla",
+  
+  // "submission.general.discard.confirm.cancel": "Cancel",
+  "submission.general.discard.confirm.cancel": "Vazgeç",
+  
+  // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.general.discard.confirm.info": "Bu işlem geri alınamaz. Emin misiniz?",
+  
+  // "submission.general.discard.confirm.submit": "Yes, I'm sure",
+  "submission.general.discard.confirm.submit": "Evet eminim",
+  
+  // "submission.general.discard.confirm.title": "Discard submission",
+  "submission.general.discard.confirm.title": "Teslimi İptal Et",
+  
+  // "submission.general.discard.submit": "Discard",
+  "submission.general.discard.submit": "İptal",
+  
+  // "submission.general.save": "Save",
+  "submission.general.save": "Kaydet",
+  
+  // "submission.general.save-later": "Save for later",
+  "submission.general.save-later": "Sonrası İçin Kaydet",
+  
+  
+  // "submission.import-external.page.title": "Import metadata from an external source",
+  "submission.import-external.page.title": "Harici bir kaynaktan metadataları içe aktarın",
+  
+  // "submission.import-external.title": "Import metadata from an external source",
+  "submission.import-external.title": "Harici bir kaynaktan metadataları içe aktarın",
+  
+  // "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.",
+  "submission.import-external.page.hint": "Web'den DSpace'e içe aktarılacak öğeleri bulmak için yukarıya bir sorgu girin.",
+  
+  // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
+  "submission.import-external.back-to-my-dspace": "MyDSpace'e Geri Dön",
+  
+  // "submission.import-external.search.placeholder": "Search the external source",
+  "submission.import-external.search.placeholder": "Dış Kaynaktan Ara",
+  
+  // "submission.import-external.search.button": "Search",
+  "submission.import-external.search.button": "Ara",
+  
+  // "submission.import-external.search.button.hint": "Write some words to search",
+  "submission.import-external.search.button.hint": "Aramak için Kelime Girin",
+  
+  // "submission.import-external.search.source.hint": "Pick an external source",
+  "submission.import-external.search.source.hint": "Dış Kaynak Seçin",
+  
+  // "submission.import-external.source.arxiv": "arXiv",
+  "submission.import-external.source.arxiv": "arXiv",
+  
+  // "submission.import-external.source.loading": "Loading ...",
+  "submission.import-external.source.loading": "Yükleniyor ...",
+  
+  // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
+  "submission.import-external.source.sherpaJournal": "SHERPA Journals",
+  
+  // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+  "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+  
+  // "submission.import-external.source.orcid": "ORCID",
+  "submission.import-external.source.orcid": "ORCID",
+  
+  // "submission.import-external.source.pubmed": "Pubmed",
+  "submission.import-external.source.pubmed": "Pubmed",
+  
+  // "submission.import-external.source.lcname": "Library of Congress Names",
+  "submission.import-external.source.lcname": "Kongre İsimleri Kütüphanesi",
+  
+  // "submission.import-external.preview.title": "Item Preview",
+  "submission.import-external.preview.title": "Materyal Önizlenimi",
+  
+  // "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.",
+  "submission.import-external.preview.subtitle": "Aşağıdaki metadatalar harici bir kaynaktan içe aktarıldı. Gönderime başladığınızda önceden doldurulacaktır.",
+  
+  // "submission.import-external.preview.button.import": "Start submission",
+  "submission.import-external.preview.button.import": "Gönderimi Başlat",
+  
+  // "submission.import-external.preview.error.import.title": "Submission error",
+  "submission.import-external.preview.error.import.title": "Gönderim Sırasında Hata",
+  
+  // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
+  "submission.import-external.preview.error.import.body": "Dış kaynak girişi içe aktarma işlemi sırasında bir hata oluştu.",
+  
+  // "submission.sections.describe.relationship-lookup.close": "Close",
+  "submission.sections.describe.relationship-lookup.close": "Kapat",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.added": "Giriş seçime başarıyla eklendi",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Dış Kaynak Yazarı İçe Aktar",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Dış Kaynak Makaleyi İçe Aktar",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Dış Kaynak Makale Konusu İçe Aktar",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Dış Kaynak Makale Cilt Sayısı İçe Aktar",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Dış Kaynak Yazarı İçe Aktar",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Yazar seçime başarıyla eklendi",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Successfully imported and added external author to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Harici yazar başarıyla içe aktarıldı ve seçime eklendi",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Yetkili",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Yeni bir yerel yetkili girişi olarak içe aktar",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "İptal",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Select a collection to import new entries to",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Yeni girişleri içe aktarmak için bir koleksiyon seçin",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Varlıklar",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Yeni bir yerel varlık olarak içe aktar",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "LC Adına göre İçe Aktar",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "ORCID'den İçe Aktar",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Sherpa Journal'den İçe Aktar",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Sherpa Publisher'den İçe Aktar",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "PubMed'den İçe Aktar",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "arXiv'den İçe Aktar",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "İçe Aktar",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Makaleyi Dışardan İçe Aktar",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Successfully added local journal to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": " Makale seçime başarıyla eklendi",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Successfully imported and added external journal to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Harici makale başarıyla içe aktarıldı ve seçime eklendi",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Dış Kaynak Makale Konusu İçe Aktar",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Dış Kaynak Makale Konusu Başarıyla İçe Aktarıldı.",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Başarıyla içe aktarıldı ve seçime harici makale sayısı eklendi",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Dış Kaynak Makale Cilt Sayısı İçe Aktar",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Successfully added local journal volume to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Dış Kaynak Makale Cilt Sayısı Başarıyla İçe Aktarıldı.",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Successfully imported and added external journal volume to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Harici makale cilti başarıyla içe aktarıldı ve seçime eklendi",
+  
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Yerel Eşleşmeyi Seç",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Tümünü Seçmeyi Bırak",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Sayfa Seçimin Bırak",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "Yükleniyor...",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Arama Sorgusu",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Git",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Hepsini Seç",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Sayfa Seç",
+  
+  // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
+  "submission.sections.describe.relationship-lookup.selected": "{{ size }} boyutundaki Seçili Materyaller ",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": " Yerel Yazarlar({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Yerel Makaleler ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Yerel Projeler ({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Yerel Yayınlar ({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Yerel Yazarlar ({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Yerel Organizasyonlar({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Yerel Veri Paketleri ({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Yerel Veri Dosyaları ({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Yerel Makaleler ({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Yerel Makale Konuları ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Yerel Makale Konuları ({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Yerel Makale Cilt ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Yerel Makale Cilt ({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Adları ({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Finansman Kuruluşlarını Arama",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Finansman Arama",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Organizasyonları Arama",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Mevcut Seçim ({{ count }})",
+  
+  // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Makale Konuları",
+  // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Makale Konuları",
+  
+  // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Makale Ciltleri",
+  // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Makale Ciltleri",
+  
+  // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Makaleler",
+  
+  // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Yazarlar",
+  
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Finansman Kuruluşu",
+  // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
+  "submission.sections.describe.relationship-lookup.title.Project": "Projeler",
+  
+  // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
+  "submission.sections.describe.relationship-lookup.title.Publication": "Yayınlar",
+  
+  // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
+  "submission.sections.describe.relationship-lookup.title.Person": "Yazarlar",
+  
+  // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizasyonlar",
+  
+  // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Veri Paketler",
+  
+  // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "Veri Dosyaları",
+  
+  // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Finansman Kuruluşu",
+  
+  // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Finansman",
+  
+  // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Ana Organizasyon",
+  
+  // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Açılır menüyü aç/kapat",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Ayarlar",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Mevcut seçiminiz boş. ",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Seçili Yazarlar",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Seçili Makaleler",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Seçili Makale Ciltleri",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Seçili Projeler",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Seçili Yayınlar",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Seçili Yazarlar",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Seçili Organizasyonlar",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Seçili Veri Paketleri",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Seçili Veri Dosyaları",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Seçili Makaleler",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Seçili Makale Konuları",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Seçili Makale Ciltleri",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Seçili Finansman Kuruluşu",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Seçili Finansman",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Seçili Makale Konuları",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Seçili Organizasyonlar",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Sonuçları Ara",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Sonuçları Ara",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Sonuçları Ara",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Sonuçları Ara",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Sonuçları Ara",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Sonuçları Ara",
+  
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Sonuçları Ara",
+  
+  // "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don\'t you can still use it for this submission.",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Bu kişi için \"{{ value }}\" ilerideki gönderilerde kullanılabilmek için Yeni İsim olarak kaydedilsin mi? Bunu yapmazsanız, yine de bu gönderim için kullanabilirsiniz .",
+  
+  // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Yeni İsim değişikliğini kaydet.",
+  
+  // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Sadece bu gönderim için kullan.",
+  
+  // "submission.sections.ccLicense.type": "License Type",
+  "submission.sections.ccLicense.type": "Lisans Türü",
+  
+  // "submission.sections.ccLicense.select": "Select a license type…",
+  "submission.sections.ccLicense.select": "Lisans Türünü Seç…",
+  
+  // "submission.sections.ccLicense.change": "Change your license type…",
+  "submission.sections.ccLicense.change": "Lisans Türünü Değiştir…",
+  
+  // "submission.sections.ccLicense.none": "No licenses available",
+  "submission.sections.ccLicense.none": "Lisans Mevcut Değil",
+  
+  // "submission.sections.ccLicense.option.select": "Select an option…",
+  "submission.sections.ccLicense.option.select": "Seçenek Seç…",
+  
+  // "submission.sections.ccLicense.link": "You’ve selected the following license:",
+  "submission.sections.ccLicense.link": "Seçtiğiniz Lisans Türü:",
+  
+  // "submission.sections.ccLicense.confirmation": "I grant the license above",
+  "submission.sections.ccLicense.confirmation": "Yukarıdaki lisansı veriyorum",
+  
+  // "submission.sections.general.add-more": "Add more",
+  "submission.sections.general.add-more": "Ekle",
+  
+  // "submission.sections.general.collection": "Collection",
+  "submission.sections.general.collection": "Koleksiyon",
+  
+  // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
+  "submission.sections.general.deposit_error_notice": "Öğe gönderilirken bir sorun oluştu, lütfen daha sonra tekrar deneyin.",
+  
+  // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
+  "submission.sections.general.deposit_success_notice": "Gönderim başarıyla yatırıldı.",
+  
+  // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
+  "submission.sections.general.discard_error_notice": "Öğe gönderilirken bir sorun oluştu, lütfen daha sonra tekrar deneyin.",
+  
+  // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
+  "submission.sections.general.discard_success_notice": "Gönderim başarıyla silindi.",
+  
+  // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
+  "submission.sections.general.metadata-extracted": "Yeni metadatalar çıkarıldı ve <strong>{{sectionId}}</strong> bölümüne eklendi.",
+  
+  // "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
+  "submission.sections.general.metadata-extracted-new-section": "Gönderime yeni <strong>{{sectionId}}</strong> bölümü eklendi.",
+  
+  // "submission.sections.general.no-collection": "No collection found",
+  "submission.sections.general.no-collection": "Koleksiyon bulunamadı",
+  
+  // "submission.sections.general.no-sections": "No options available",
+  "submission.sections.general.no-sections": "Seçenekler Bulunamadı.",
+  
+  // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
+  "submission.sections.general.save_error_notice": "Öğe kaydedilirken bir sorun oluştu, lütfen daha sonra tekrar deneyin.",
+  
+  // "submission.sections.general.save_success_notice": "Submission saved successfully.",
+  "submission.sections.general.save_success_notice": "Gönderim başarıyla kaydedildi.",
+  
+  // "submission.sections.general.search-collection": "Search for a collection",
+  "submission.sections.general.search-collection": "Koleksiyon ara",
+  
+  // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
+  "submission.sections.general.sections_not_valid": "Eksik bölümler var.",
+  
+  
+  
+  // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
+  "submission.sections.submit.progressbar.CClicense": "Yaratıcı Ortak Lisansları",
+  
+  // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
+  "submission.sections.submit.progressbar.describe.recycle": "Geri Dönüştür",
+  
+  // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
+  "submission.sections.submit.progressbar.describe.stepcustom": "Tanımla",
+  
+  // "submission.sections.submit.progressbar.describe.stepone": "Describe",
+  "submission.sections.submit.progressbar.describe.stepone": "Tanımla",
+  
+  // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
+  "submission.sections.submit.progressbar.describe.steptwo": "Tanımla",
+  
+  // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
+  "submission.sections.submit.progressbar.detect-duplicate": "Olası Kopyalar",
+  
+  // "submission.sections.submit.progressbar.license": "Deposit license",
+  "submission.sections.submit.progressbar.license": "Lisansı Yerleştir",
+  
+  // "submission.sections.submit.progressbar.upload": "Upload files",
+  "submission.sections.submit.progressbar.upload": "Dosyaları yükle",
+  
+  
+  
+  // "submission.sections.upload.delete.confirm.cancel": "Cancel",
+  "submission.sections.upload.delete.confirm.cancel": "İptal",
+  
+  // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.sections.upload.delete.confirm.info": "Bu işlem geri alınamaz. Emin misin?",
+  
+  // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
+  "submission.sections.upload.delete.confirm.submit": "Evet eminim.",
+  
+  // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
+  "submission.sections.upload.delete.confirm.title": "Bitstreamı Sil",
+  
+  // "submission.sections.upload.delete.submit": "Delete",
+  "submission.sections.upload.delete.submit": "Sil",
+  
+  // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
+  "submission.sections.upload.drop-message": "Öğeye eklemek için dosyaları bırakın",
+  
+  // "submission.sections.upload.form.access-condition-label": "Access condition type",
+  "submission.sections.upload.form.access-condition-label": "Erişim Koşulu Türü",
+  
+  // "submission.sections.upload.form.date-required": "Date is required.",
+  "submission.sections.upload.form.date-required": "Tarih gerekli.",
+  
+  // "submission.sections.upload.form.from-label": "Grant access from",
+  "submission.sections.upload.form.from-label": "Şuradan erişim izni ver:",
+  
+  // "submission.sections.upload.form.from-placeholder": "From",
+  "submission.sections.upload.form.from-placeholder": "İtibaren",
+  
+  // "submission.sections.upload.form.group-label": "Group",
+  "submission.sections.upload.form.group-label": "Grup",
+  
+  // "submission.sections.upload.form.group-required": "Group is required.",
+  "submission.sections.upload.form.group-required": "Grup gerekli.",
+  
+  // "submission.sections.upload.form.until-label": "Grant access until",
+  "submission.sections.upload.form.until-label": "Şu tarihe kadar erişim izni ver:",
+  
+  // "submission.sections.upload.form.until-placeholder": "Until",
+  "submission.sections.upload.form.until-placeholder": "Kadar",
+  
+  // "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
+  "submission.sections.upload.header.policy.default.nolist": "{{collectionName}} koleksiyonuna yüklenen dosyalara aşağıdaki gruplara göre erişilebilir:",
+  
+  // "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
+  "submission.sections.upload.header.policy.default.withlist": "{{collectionName}} koleksiyonuna yüklenen dosyalara, tek dosya için açıkça karar verilenlere ek olarak aşağıdaki gruplarla erişilebilir olacağını lütfen unutmayın:",
+  
+  // "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files just dragging & dropping them everywhere in the page</strong>",
+  "submission.sections.upload.info": "Burada, o anda öğede bulunan tüm dosyaları bulacaksınız. Dosya metadatalarını güncelleyebilir ve koşullara erişebilir veya <strong>sayfanın her yerine sürükleyip bırakarak ek dosyalar yükleyebilirsiniz</strong>",
+  
+  // "submission.sections.upload.no-entry": "No",
+  "submission.sections.upload.no-entry": "Hayır",
+  
+  // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
+  "submission.sections.upload.no-file-uploaded": "Henüz dosya yüklenmedi.",
+  
+  // "submission.sections.upload.save-metadata": "Save metadata",
+  "submission.sections.upload.save-metadata": "Metadataları kaydet",
+  
+  // "submission.sections.upload.undo": "Cancel",
+  "submission.sections.upload.undo": "İptal",
+  
+  // "submission.sections.upload.upload-failed": "Upload failed",
+  "submission.sections.upload.upload-failed": "Yükleme Başarısız",
+  
+  // "submission.sections.upload.upload-successful": "Upload successful",
+  "submission.sections.upload.upload-successful": "Yükleme Başarılı",
+  
+  
+  
+  // "submission.submit.title": "Submission",
+  "submission.submit.title": "Gönder",
+  
+  
+  
+  // "submission.workflow.generic.delete": "Delete",
+  "submission.workflow.generic.delete": "Sil",
+  
+  // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
+  "submission.workflow.generic.delete-help": "Bu öğeyi atmak istiyorsanız, \"Sil\" öğesini seçin. Daha sonra onaylamanız istenecektir.",
+  
+  // "submission.workflow.generic.edit": "Edit",
+  "submission.workflow.generic.edit": "Değiştir",
+  
+  // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
+  "submission.workflow.generic.edit-help": "Öğenin metadatalarını değiştirmek için bu seçeneği belirleyin.",
+  
+  // "submission.workflow.generic.view": "View",
+  "submission.workflow.generic.view": "Göster",
+  
+  // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workflow.generic.view-help": "Öğenin metadatalarını görüntülemek için bu seçeneği belirleyin.",
+  
+  
+  
+  // "submission.workflow.tasks.claimed.approve": "Approve",
+  "submission.workflow.tasks.claimed.approve": "Kabul Et.",
+  
+  // "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the item and it is suitable for inclusion in the collection, select \"Approve\".",
+  "submission.workflow.tasks.claimed.approve_help": "Öğeyi incelediyseniz ve koleksiyona dahil edilmeye uygunsa, \"Onayla\"yı seçin.",
+  
+  // "submission.workflow.tasks.claimed.edit": "Edit",
+  "submission.workflow.tasks.claimed.edit": "Değiştir",
+  
+  // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
+  "submission.workflow.tasks.claimed.edit_help": "Öğenin metadatalarını değiştirmek için bu seçeneği belirleyin.",
+  
+  // "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
+  "submission.workflow.tasks.claimed.reject.reason.info": "Lütfen gönderiyi reddetme nedeninizi aşağıdaki kutuya, gönderenin bir sorunu çözüp yeniden gönderip gönderemeyeceğini belirterek girin.",
+  
+  // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
+  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Reddetme nedenini açıklayın",
+  
+  // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
+  "submission.workflow.tasks.claimed.reject.reason.submit": "Materyali Reddet",
+  
+  // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
+  "submission.workflow.tasks.claimed.reject.reason.title": "Neden",
+  
+  // "submission.workflow.tasks.claimed.reject.submit": "Reject",
+  "submission.workflow.tasks.claimed.reject.submit": "Kabul Etme",
+  
+  // "submission.workflow.tasks.claimed.reject_help": "If you have reviewed the item and found it is <strong>not</strong> suitable for inclusion in the collection, select \"Reject\".  You will then be asked to enter a message indicating why the item is unsuitable, and whether the submitter should change something and resubmit.",
+  "submission.workflow.tasks.claimed.reject_help": "Öğeyi incelediyseniz ve koleksiyona dahil edilmeye <strong>uygun olmadığını</strong> bulduysanız, \"Reddet\"i seçin. Ardından, öğenin neden uygun olmadığını ve gönderenin bir şeyi değiştirip yeniden göndermesi gerekip gerekmediğini belirten bir mesaj girmeniz istenecektir.",
+  
+  // "submission.workflow.tasks.claimed.return": "Return to pool",
+  "submission.workflow.tasks.claimed.return": "Havuza Dön",
+  
+  // "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
+  "submission.workflow.tasks.claimed.return_help": "Başka bir kullanıcının görevi gerçekleştirebilmesi için görevi havuza geri döndürün.",
+  
+  
+  
+  // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
+  "submission.workflow.tasks.generic.error": "İşlem sırasında hata oluştu...",
+  
+  // "submission.workflow.tasks.generic.processing": "Processing...",
+  "submission.workflow.tasks.generic.processing": "İşleniyor...",
+  
+  // "submission.workflow.tasks.generic.submitter": "Submitter",
+  "submission.workflow.tasks.generic.submitter": "Gönderen",
+  
+  // "submission.workflow.tasks.generic.success": "Operation successful",
+  "submission.workflow.tasks.generic.success": "İşlem Başarılı",
+  
+  
+  
+  // "submission.workflow.tasks.pool.claim": "Claim",
+  "submission.workflow.tasks.pool.claim": "Talep Et",
+  
+  // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
+  "submission.workflow.tasks.pool.claim_help": "Bu görevi kendinize atayın.",
+  
+  // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
+  "submission.workflow.tasks.pool.hide-detail": "Detayları gizle",
+  
+  // "submission.workflow.tasks.pool.show-detail": "Show detail",
+  "submission.workflow.tasks.pool.show-detail": "Detayaları göster",
+  
+  
+  
+  // "title": "DSpace",
+  "title": "DSpace",
+  
+  
+  
+  // "vocabulary-treeview.header": "Hierarchical tree view",
+  "vocabulary-treeview.header": "Hiyerarşik ağaç görünümü",
+  
+  // "vocabulary-treeview.load-more": "Load more",
+  "vocabulary-treeview.load-more": "Daha Fazla Yükle",
+  
+  // "vocabulary-treeview.search.form.reset": "Reset",
+  "vocabulary-treeview.search.form.reset": "Sıfırla",
+  
+  // "vocabulary-treeview.search.form.search": "Search",
+  "vocabulary-treeview.search.form.search": "Ara",
+  
+  // "vocabulary-treeview.search.no-result": "There were no items to show",
+  "vocabulary-treeview.search.no-result": "Gösterilecek öğe yok",
+  
+  // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+  "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+  
+  // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
+  "vocabulary-treeview.tree.description.srsc": "Araştırma Konusu Kategorileri",
+  
+  
+  
+  // "uploader.browse": "browse",
+  "uploader.browse": "Tara",
+  
+  // "uploader.drag-message": "Drag & Drop your files here",
+  "uploader.drag-message": "Dosyalarınızı buraya sürükleyip bırakın",
+  
+  // "uploader.or": ", or ",
+  "uploader.or": ", veya",
+  
+  // "uploader.processing": "Processing",
+  "uploader.processing": "İşleniyor",
+  
+  // "uploader.queue-length": "Queue length",
+  "uploader.queue-length": "Sıra Uzunluğu",
+  
+  // "virtual-metadata.delete-item.info": "Select the types for which you want to save the virtual metadata as real metadata",
+  "virtual-metadata.delete-item.info": "Sanal metadataları gerçek metadatalar olarak kaydetmek istediğiniz türleri seçin",
+  
+  // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
+  "virtual-metadata.delete-item.modal-head": "Bu ilişkinin sanal metadataları",
+  
+  // "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
+  "virtual-metadata.delete-relationship.modal-head": "Sanal metadatalarını gerçek metadatalar olarak kaydetmek istediğiniz öğeleri seçin",
+  
+  
+  
+  // "workflowAdmin.search.results.head": "Administer Workflow",
+  "workflowAdmin.search.results.head": "İş Akışını Yönet",
+  
+  
+  
+  // "workflow-item.delete.notification.success.title": "Deleted",
+  "workflow-item.delete.notification.success.title": "Silindi",
+  
+  // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
+  "workflow-item.delete.notification.success.content": "Bu iş akışı öğesi başarıyla silindi",
+  
+  // "workflow-item.delete.notification.error.title": "Something went wrong",
+  "workflow-item.delete.notification.error.title": "Bir şeyler yanlış gitti",
+  
+  // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
+  "workflow-item.delete.notification.error.content": "İş akışı öğesi silinemedi",
+  
+  // "workflow-item.delete.title": "Delete workflow item",
+  "workflow-item.delete.title": "İş akışı öğesini sil",
+  
+  // "workflow-item.delete.header": "Delete workflow item",
+  "workflow-item.delete.header": "İş akışı öğesini sil",
+  
+  // "workflow-item.delete.button.cancel": "Cancel",
+  "workflow-item.delete.button.cancel": "İptal",
+  
+  // "workflow-item.delete.button.confirm": "Delete",
+  "workflow-item.delete.button.confirm": "Sil",
+  
+  
+  // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
+  "workflow-item.send-back.notification.success.title": "Gönderene geri gönderildi",
+  
+  // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
+  "workflow-item.send-back.notification.success.content": "Bu iş akışı öğesi, gönderene başarıyla geri gönderildi",
+  
+  // "workflow-item.send-back.notification.error.title": "Something went wrong",
+  "workflow-item.send-back.notification.error.title": "Bir şeyler yanlış gitti",
+  
+  // "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter",
+  "workflow-item.send-back.notification.error.content": "İş akışı öğesi, gönderene geri gönderilemedi",
+  
+  // "workflow-item.send-back.title": "Send workflow item back to submitter",
+  "workflow-item.send-back.title": "İş akışı öğesini gönderene geri gönder",
+  
+  // "workflow-item.send-back.header": "Send workflow item back to submitter",
+  "workflow-item.send-back.header": "İş akışı öğesini gönderene geri gönder",
+  
+  // "workflow-item.send-back.button.cancel": "Cancel",
+  "workflow-item.send-back.button.cancel": "İptal",
+  
+  // "workflow-item.send-back.button.confirm": "Send back"
+  "workflow-item.send-back.button.confirm": "Geri Gönder"
+
+}

From 310237d30f1bdc0fc3991678e573e55fc4cc805d Mon Sep 17 00:00:00 2001
From: corrad82 <corrado.lombardi@gmail.com>
Date: Tue, 30 Aug 2022 12:00:27 +0200
Subject: [PATCH 26/48] [CST-6035] updated test description and used
 example.com domain in test urls

---
 .../submission-import-external.component.spec.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/app/submission/import-external/submission-import-external.component.spec.ts b/src/app/submission/import-external/submission-import-external.component.spec.ts
index 7a9c71f342..1b21203b58 100644
--- a/src/app/submission/import-external/submission-import-external.component.spec.ts
+++ b/src/app/submission/import-external/submission-import-external.component.spec.ts
@@ -184,7 +184,7 @@ describe('SubmissionImportExternalComponent test suite', () => {
     });
   });
 
-  describe('handle BE response for search query', () => {
+  describe('handle backend response for search query', () => {
     const paginatedData: any = {
       'timeCompleted': 1657009282990,
       'msToLive': 900000,
@@ -203,20 +203,20 @@ describe('SubmissionImportExternalComponent test suite', () => {
         },
         '_links': {
           'first': {
-            'href': 'https://dspacecris7.4science.cloud/server/api/integration/externalsources/scopus/entries?query=test&page=0&size=10&sort=id,asc'
+            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?query=test&page=0&size=10&sort=id,asc'
           },
           'self': {
-            'href': 'https://dspacecris7.4science.cloud/server/api/integration/externalsources/scopus/entries?sort=id,ASC&page=0&size=10&query=test'
+            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?sort=id,ASC&page=0&size=10&query=test'
           },
           'next': {
-            'href': 'https://dspacecris7.4science.cloud/server/api/integration/externalsources/scopus/entries?query=test&page=1&size=10&sort=id,asc'
+            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?query=test&page=1&size=10&sort=id,asc'
           },
           'last': {
-            'href': 'https://dspacecris7.4science.cloud/server/api/integration/externalsources/scopus/entries?query=test&page=1197160&size=10&sort=id,asc'
+            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?query=test&page=1197160&size=10&sort=id,asc'
           },
           'page': [
             {
-              'href': 'https://dspacecris7.4science.cloud/server/api/integration/externalsources/scopus/entryValues/2-s2.0-85130258665'
+              'href': 'https://example.com/server/api/integration/externalsources/scopus/entryValues/2-s2.0-85130258665'
             }
           ]
         },
@@ -411,7 +411,7 @@ describe('SubmissionImportExternalComponent test suite', () => {
             },
             '_links': {
               'self': {
-                'href': 'https://dspacecris7.4science.cloud/server/api/integration/externalsources/scopus/entryValues/2-s2.0-85130258665'
+                'href': 'https://example.com/server/api/integration/externalsources/scopus/entryValues/2-s2.0-85130258665'
               }
             }
           }
@@ -421,7 +421,7 @@ describe('SubmissionImportExternalComponent test suite', () => {
     };
     const errorObj = {
       errorMessage: 'Http failure response for ' +
-        'https://dspacecris7.4science.cloud/server/api/integration/externalsources/pubmed/entries?sort=id,ASC&page=0&size=10&query=test: 500 OK',
+        'https://example.com/server/api/integration/externalsources/pubmed/entries?sort=id,ASC&page=0&size=10&query=test: 500 OK',
       statusCode: 500,
       timeCompleted: 1656950434666,
       errors: [{

From 01daf93d01a8e551e25abdc611e5a9554132e998 Mon Sep 17 00:00:00 2001
From: gaurav <gaurav@d2t.co>
Date: Wed, 31 Aug 2022 11:14:43 +0530
Subject: [PATCH 27/48] Displaying Recent Submissions on the homepage

---
 config/config.example.yml                     |  6 ++
 src/app/home-page/home-page.component.html    |  1 +
 src/app/home-page/home-page.module.ts         |  3 +-
 .../recent-item-list.component.html           | 15 ++++
 .../recent-item-list.component.scss           |  0
 .../recent-item-list.component.spec.ts        | 74 +++++++++++++++++++
 .../recent-item-list.component.ts             | 72 ++++++++++++++++++
 src/assets/i18n/en.json5                      |  1 +
 src/config/app-config.interface.ts            |  3 +-
 src/config/default-app-config.ts              |  9 ++-
 src/config/homepage-config.interface.ts       | 17 +++++
 src/environments/environment.test.ts          |  7 ++
 12 files changed, 205 insertions(+), 3 deletions(-)
 create mode 100644 src/app/home-page/recent-item-list/recent-item-list.component.html
 create mode 100644 src/app/home-page/recent-item-list/recent-item-list.component.scss
 create mode 100644 src/app/home-page/recent-item-list/recent-item-list.component.spec.ts
 create mode 100644 src/app/home-page/recent-item-list/recent-item-list.component.ts
 create mode 100644 src/config/homepage-config.interface.ts

diff --git a/config/config.example.yml b/config/config.example.yml
index ae733e0be5..b48b509a4d 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -258,3 +258,9 @@ mediaViewer:
 info:
   enableEndUserAgreement: true
   enablePrivacyStatement: true
+# Home Page
+homePage:
+	# The number of item showing in recent submission components
+  recentSubmissionsRpp: 5
+	# Sort record of recent submission
+  recentSubmissionsSortField: 'dc.date.accessioned'
diff --git a/src/app/home-page/home-page.component.html b/src/app/home-page/home-page.component.html
index 0f7db182f0..f8073f4571 100644
--- a/src/app/home-page/home-page.component.html
+++ b/src/app/home-page/home-page.component.html
@@ -5,4 +5,5 @@
   </ng-container>
   <ds-search-form [inPlaceSearch]="false" [searchPlaceholder]="'home.search-form.placeholder' | translate"></ds-search-form>
   <ds-top-level-community-list></ds-top-level-community-list>
+  <ds-recent-item-list></ds-recent-item-list>
 </div>
diff --git a/src/app/home-page/home-page.module.ts b/src/app/home-page/home-page.module.ts
index d304c78696..26fde41d8d 100644
--- a/src/app/home-page/home-page.module.ts
+++ b/src/app/home-page/home-page.module.ts
@@ -9,13 +9,14 @@ import { TopLevelCommunityListComponent } from './top-level-community-list/top-l
 import { StatisticsModule } from '../statistics/statistics.module';
 import { ThemedHomeNewsComponent } from './home-news/themed-home-news.component';
 import { ThemedHomePageComponent } from './themed-home-page.component';
-
+import { RecentItemListComponent } from './recent-item-list/recent-item-list.component';
 const DECLARATIONS = [
   HomePageComponent,
   ThemedHomePageComponent,
   TopLevelCommunityListComponent,
   ThemedHomeNewsComponent,
   HomeNewsComponent,
+  RecentItemListComponent
 ];
 
 @NgModule({
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.html b/src/app/home-page/recent-item-list/recent-item-list.component.html
new file mode 100644
index 0000000000..8314580f1d
--- /dev/null
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.html
@@ -0,0 +1,15 @@
+<ng-container *ngVar="(itemRD$ | async) as itemRD">
+        <div class="mt-4" *ngIf="itemRD?.hasSucceeded && itemRD?.payload?.page.length > 0" @fadeIn>
+                <div class="d-flex flex-row border-bottom mb-4 pb-4 ng-tns-c416-2"></div>
+                <h2> {{'home.recent-submissions.head' | translate}}</h2>
+                <div class="my-4" *ngFor="let item of itemRD?.payload?.page">
+                        <ds-listable-object-component-loader [object]="item" [viewMode]="viewMode" class="pb-4">
+                        </ds-listable-object-component-loader>
+                </div>
+                <button (click)="onLoadMore()" class="btn btn-primary search-button mt-4 float-left ng-tns-c290-40">Load
+                        more...</button>
+        </div>
+        <ds-error *ngIf="itemRD?.hasFailed" message="{{'error.recent-submissions' | translate}}"></ds-error>
+        <ds-loading *ngIf="!itemRD || itemRD.isLoading" message="{{'loading.recent-submissions' | translate}}">
+        </ds-loading>
+</ng-container>
\ No newline at end of file
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.scss b/src/app/home-page/recent-item-list/recent-item-list.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts b/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts
new file mode 100644
index 0000000000..bb267adabf
--- /dev/null
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts
@@ -0,0 +1,74 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+
+import { SearchService } from 'src/app/core/shared/search/search.service';
+import { createSuccessfulRemoteDataObject } from 'src/app/shared/remote-data.utils';
+import { SearchServiceStub } from 'src/app/shared/testing/search-service.stub';
+import { createPaginatedList } from 'src/app/shared/testing/utils.test';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import { RecentItemListComponent } from './recent-item-list.component';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { ViewMode } from 'src/app/core/shared/view-mode.model';
+
+describe('RecentItemListComponent', () => {
+  let component: RecentItemListComponent;
+  let fixture: ComponentFixture<RecentItemListComponent>;
+  const emptyList = createSuccessfulRemoteDataObject(createPaginatedList([]));
+  let paginationService;
+  let searchConfigService: SearchConfigurationService;
+  const searchServiceStub = Object.assign(new SearchServiceStub(), {
+    search: () => observableOf(emptyList),
+    /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
+    clearDiscoveryRequests: () => {}
+    /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
+  });
+  paginationService = new PaginationServiceStub();
+  const mockSearchOptions = observableOf(new PaginatedSearchOptions({
+    pagination: Object.assign(new PaginationComponentOptions(), {
+      id: 'search-page-configuration',
+      pageSize: 10,
+      currentPage: 1
+    }),
+    sort: new SortOptions('dc.date.accessioned', SortDirection.DESC),
+   
+  }));
+  const searchConfigServiceStub = {
+    paginatedSearchOptions: mockSearchOptions
+  };
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ RecentItemListComponent],
+      providers: [
+        { provide: SearchService, useValue: searchServiceStub },
+        { provide: PaginationService, useValue: paginationService },
+        { provide: SearchConfigurationService, useValue: searchConfigServiceStub },
+      ],
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(RecentItemListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should call the navigate method on the Router with view mode list parameter as a parameter when setViewMode is called', () => {
+    component.onLoadMore();
+    expect(paginationService.updateRouteWithUrl).toHaveBeenCalledWith('page-id', ['/search'], {page: 1},{ view: ViewMode.ListElement }
+    );
+  });
+});
+function observableOf(emptyList: any): any {
+  throw new Error('Function not implemented.');
+}
+
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.ts b/src/app/home-page/recent-item-list/recent-item-list.component.ts
new file mode 100644
index 0000000000..294dac3954
--- /dev/null
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.ts
@@ -0,0 +1,72 @@
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { fadeIn, fadeInOut } from '../../shared/animations/fade';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { Item } from '../../core/shared/item.model';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { SearchService } from '../../core/shared/search/search.service';
+import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { environment } from '../../../environments/environment';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import {
+  toDSpaceObjectListRD
+} from '../../core/shared/operators';
+import {
+  Observable,
+} from 'rxjs';
+@Component({
+  selector: 'ds-recent-item-list',
+  templateUrl: './recent-item-list.component.html',
+  styleUrls: ['./recent-item-list.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  animations: [
+    fadeIn,
+    fadeInOut
+  ]
+})
+export class RecentItemListComponent implements OnInit {
+  itemRD$: Observable<RemoteData<PaginatedList<Item>>>;
+  paginationConfig: PaginationComponentOptions;
+  sortConfig: SortOptions;
+  /**
+ * The view-mode we're currently on
+ * @type {ViewMode}
+ */
+  viewMode = ViewMode.ListElement;
+  constructor(private searchService: SearchService,
+    private paginationService: PaginationService,
+    public searchConfigurationService: SearchConfigurationService
+  ) {
+
+    this.paginationConfig = Object.assign(new PaginationComponentOptions(), {
+      id: 'hp',
+      pageSize: environment.homePage.recentSubmissionsRpp,
+      currentPage: 1,
+      maxSize: 1
+    });
+    this.sortConfig = new SortOptions(environment.homePage.recentSubmissionsSortField, SortDirection.DESC);
+  }
+  ngOnInit(): void {
+    this.itemRD$ = this.searchService.search(
+      new PaginatedSearchOptions({
+        pagination: this.paginationConfig,
+        sort: this.sortConfig,
+      }),
+    ).pipe(toDSpaceObjectListRD()) as Observable<RemoteData<PaginatedList<Item>>>;
+  }
+  ngOnDestroy(): void {
+    this.paginationService.clearPagination(this.paginationConfig.id);
+  }
+  onLoadMore(): void {
+    this.paginationService.updateRouteWithUrl(this.searchConfigurationService.paginationID, ['search'], {
+      sortField: environment.homePage.recentSubmissionsSortField,
+      sortDirection: 'DESC' as SortDirection,
+      page: 1
+    });
+  }
+
+}
+
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 57863b3a69..4305723380 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4727,5 +4727,6 @@
   "person.orcid.registry.queue": "ORCID Registry Queue",
 
   "person.orcid.registry.auth": "ORCID Authorizations",
+  "home.recent-submissions.head": "Recent Submissions",
 
 }
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index f9d38d9b45..950ff7d313 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -17,7 +17,7 @@ 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 { HomeConfig } from './homepage-config.interface';
 interface AppConfig extends Config {
   ui: UIServerConfig;
   rest: ServerConfig;
@@ -38,6 +38,7 @@ interface AppConfig extends Config {
   bundle: BundleConfig;
   actuators: ActuatorsConfig
   info: InfoConfig;
+  homePage: HomeConfig;
 }
 
 const APP_CONFIG = new InjectionToken<AppConfig>('APP_CONFIG');
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index d2d0608a03..f57425a79a 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -17,7 +17,7 @@ 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 { HomeConfig } from './homepage-config.interface';
 export class DefaultAppConfig implements AppConfig {
   production = false;
 
@@ -338,4 +338,11 @@ export class DefaultAppConfig implements AppConfig {
     enableEndUserAgreement: true,
     enablePrivacyStatement: true
   };
+  // Home Pages
+  homePage: HomeConfig = {
+    //The number of item showing in recent submission components
+    recentSubmissionsRpp: 5,
+    //sort record of recent submission
+    recentSubmissionsSortField: 'dc.date.accessioned',
+  };
 }
diff --git a/src/config/homepage-config.interface.ts b/src/config/homepage-config.interface.ts
new file mode 100644
index 0000000000..564cd7f9fb
--- /dev/null
+++ b/src/config/homepage-config.interface.ts
@@ -0,0 +1,17 @@
+import { Config } from './config.interface';
+
+/**
+ * Config that determines how the dropdown list of years are created for browse-by-date components
+ */
+export interface HomeConfig extends Config {
+  /**
+   * The number of item showing in recent submission components
+   */
+   recentSubmissionsRpp: number;
+
+  /**
+   * sort record of recent submission
+   */
+   recentSubmissionsSortField: string;
+
+}
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 4d466bd37b..bb7f8a2962 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -247,5 +247,12 @@ export const environment: BuildConfig = {
   info: {
     enableEndUserAgreement: true,
     enablePrivacyStatement: true,
+  },
+  //Home Page
+  homePage: {
+    //The number of item showing in recent submission components
+    recentSubmissionsRpp: 5,
+    //sort record of recent submission
+    recentSubmissionsSortField: 'dc.date.accessioned',
   }
 };

From bcc71ce2e179b62edafb7f5df88a59bda5664801 Mon Sep 17 00:00:00 2001
From: gaurav <gaurav@d2t.co>
Date: Wed, 31 Aug 2022 12:44:47 +0530
Subject: [PATCH 28/48] Trailing spaces remove

---
 .../recent-item-list/recent-item-list.component.spec.ts       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts b/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts
index bb267adabf..43ff48824c 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts
@@ -1,6 +1,4 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
 import { SearchService } from 'src/app/core/shared/search/search.service';
 import { createSuccessfulRemoteDataObject } from 'src/app/shared/remote-data.utils';
 import { SearchServiceStub } from 'src/app/shared/testing/search-service.stub';
@@ -9,7 +7,6 @@ import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { RecentItemListComponent } from './recent-item-list.component';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
@@ -35,7 +32,6 @@ describe('RecentItemListComponent', () => {
       currentPage: 1
     }),
     sort: new SortOptions('dc.date.accessioned', SortDirection.DESC),
-   
   }));
   const searchConfigServiceStub = {
     paginatedSearchOptions: mockSearchOptions

From 0840bfd8cef02fd25d3926a6c12428063b1c3555 Mon Sep 17 00:00:00 2001
From: gaurav <gaurav@d2t.co>
Date: Wed, 31 Aug 2022 17:20:17 +0530
Subject: [PATCH 29/48] bug resolve

---
 .../recent-item-list.component.spec.ts                 | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts b/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts
index 43ff48824c..87152f53ef 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts
@@ -11,13 +11,12 @@ import { PaginatedSearchOptions } from '../../shared/search/models/paginated-sea
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { ViewMode } from 'src/app/core/shared/view-mode.model';
-
+import { of as observableOf } from 'rxjs';
 describe('RecentItemListComponent', () => {
   let component: RecentItemListComponent;
   let fixture: ComponentFixture<RecentItemListComponent>;
   const emptyList = createSuccessfulRemoteDataObject(createPaginatedList([]));
   let paginationService;
-  let searchConfigService: SearchConfigurationService;
   const searchServiceStub = Object.assign(new SearchServiceStub(), {
     search: () => observableOf(emptyList),
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
@@ -60,11 +59,8 @@ describe('RecentItemListComponent', () => {
 
   it('should call the navigate method on the Router with view mode list parameter as a parameter when setViewMode is called', () => {
     component.onLoadMore();
-    expect(paginationService.updateRouteWithUrl).toHaveBeenCalledWith('page-id', ['/search'], {page: 1},{ view: ViewMode.ListElement }
-    );
+    expect(paginationService.updateRouteWithUrl).toHaveBeenCalledWith(undefined, ['search'], Object({ sortField: 'dc.date.accessioned', sortDirection: 'DESC', page: 1 }));
   });
 });
-function observableOf(emptyList: any): any {
-  throw new Error('Function not implemented.');
-}
+
 

From 77eb6c1807ec6f081003a558e6085e99c92578af Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 2 Sep 2022 09:51:11 +0200
Subject: [PATCH 30/48] Remove unused imports

---
 src/app/core/auth/auth-request.service.ts | 2 +-
 src/modules/app/server-init.service.ts    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts
index 8a27d5ca41..7fd93fb014 100644
--- a/src/app/core/auth/auth-request.service.ts
+++ b/src/app/core/auth/auth-request.service.ts
@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, map, mergeMap, switchMap, tap, take } from 'rxjs/operators';
+import { distinctUntilChanged, filter, map, switchMap, tap, take } from 'rxjs/operators';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RequestService } from '../data/request.service';
 import { isNotEmpty } from '../../shared/empty.util';
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index 2e35083bf4..e93c692cd7 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -6,7 +6,7 @@
  * http://www.dspace.org/license/
  */
 import { InitService } from '../../app/init.service';
-import { Store, select } from '@ngrx/store';
+import { Store } from '@ngrx/store';
 import { AppState } from '../../app/app.reducer';
 import { TransferState } from '@angular/platform-browser';
 import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
@@ -20,8 +20,7 @@ import { MetadataService } from '../../app/core/metadata/metadata.service';
 import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service';
 import { CSSVariableService } from '../../app/shared/sass-helper/sass-helper.service';
 import { ThemeService } from '../../app/shared/theme-support/theme.service';
-import { take, distinctUntilChanged, find } from 'rxjs/operators';
-import { isAuthenticationBlocking } from '../../app/core/auth/selectors';
+import { take } from 'rxjs/operators';
 
 /**
  * Performs server-side initialization.

From 9f609a2966a834e3c94f695164370a1ad1135546 Mon Sep 17 00:00:00 2001
From: "Mark H. Wood" <mwood@IUPUI.Edu>
Date: Fri, 2 Sep 2022 11:53:10 -0400
Subject: [PATCH 31/48] Add themed components to shared module and 'custom'
 theme.

---
 src/app/shared/shared.module.ts               | 30 +++++++++++++++++++
 ...te-collection-parent-selector.component.ts | 11 +++++++
 ...e-community-parent-selector.component.html | 19 ++++++++++++
 ...e-community-parent-selector.component.scss |  3 ++
 ...ate-community-parent-selector.component.ts | 12 ++++++++
 ...create-item-parent-selector.component.html | 15 ++++++++++
 .../create-item-parent-selector.component.ts  | 11 +++++++
 .../dso-selector-modal-wrapper.component.html | 11 +++++++
 .../edit-collection-selector.component.ts     | 11 +++++++
 .../edit-community-selector.component.ts      | 11 +++++++
 .../edit-item-selector.component.ts           | 11 +++++++
 src/themes/custom/eager-theme.module.ts       | 24 +++++++++++++++
 12 files changed, 169 insertions(+)
 create mode 100644 src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
 create mode 100644 src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
 create mode 100644 src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.scss
 create mode 100644 src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
 create mode 100644 src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
 create mode 100644 src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
 create mode 100644 src/themes/custom/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
 create mode 100644 src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
 create mode 100644 src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
 create mode 100644 src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts

diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index f40ddd5b90..9036ff98c5 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -124,12 +124,21 @@ import { DSOSelectorComponent } from './dso-selector/dso-selector/dso-selector.c
 import {
   CreateCommunityParentSelectorComponent
 } from './dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
+import {
+    ThemedCreateCommunityParentSelectorComponent
+} from './dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component';
 import {
   CreateItemParentSelectorComponent
 } from './dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
+import {
+    ThemedCreateItemParentSelectorComponent
+} from './dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
 import {
   CreateCollectionParentSelectorComponent
 } from './dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
+import {
+    ThemedCreateCollectionParentSelectorComponent
+} from './dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component';
 import {
   CommunitySearchResultListElementComponent
 } from './object-list/search-result-list-element/community-search-result/community-search-result-list-element.component';
@@ -139,12 +148,21 @@ import {
 import {
   EditItemSelectorComponent
 } from './dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
+import {
+    ThemedEditItemSelectorComponent
+} from './dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component';
 import {
   EditCommunitySelectorComponent
 } from './dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
+import {
+    ThemedEditCommunitySelectorComponent
+} from './dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component';
 import {
   EditCollectionSelectorComponent
 } from './dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
+import {
+    ThemedEditCollectionSelectorComponent
+} from './dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component';
 import {
   ItemListPreviewComponent
 } from './object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component';
@@ -395,11 +413,17 @@ const COMPONENTS = [
   DsoInputSuggestionsComponent,
   DSOSelectorComponent,
   CreateCommunityParentSelectorComponent,
+  ThemedCreateCommunityParentSelectorComponent,
   CreateCollectionParentSelectorComponent,
+  ThemedCreateCollectionParentSelectorComponent,
   CreateItemParentSelectorComponent,
+  ThemedCreateItemParentSelectorComponent,
   EditCommunitySelectorComponent,
+  ThemedEditCommunitySelectorComponent,
   EditCollectionSelectorComponent,
+  ThemedEditCollectionSelectorComponent,
   EditItemSelectorComponent,
+  ThemedEditItemSelectorComponent,
   CommunitySearchResultListElementComponent,
   CollectionSearchResultListElementComponent,
   BrowseByComponent,
@@ -491,11 +515,17 @@ const ENTRY_COMPONENTS = [
   StartsWithDateComponent,
   StartsWithTextComponent,
   CreateCommunityParentSelectorComponent,
+  ThemedCreateCommunityParentSelectorComponent,
   CreateCollectionParentSelectorComponent,
+  ThemedCreateCollectionParentSelectorComponent,
   CreateItemParentSelectorComponent,
+  ThemedCreateItemParentSelectorComponent,
   EditCommunitySelectorComponent,
+  ThemedEditCommunitySelectorComponent,
   EditCollectionSelectorComponent,
+  ThemedEditCollectionSelectorComponent,
   EditItemSelectorComponent,
+  ThemedEditItemSelectorComponent,
   PlainTextMetadataListElementComponent,
   ItemMetadataListElementComponent,
   MetadataRepresentationListElementComponent,
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
new file mode 100644
index 0000000000..6df8807cae
--- /dev/null
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+import {
+    CreateCollectionParentSelectorComponent as BaseComponent
+} from 'src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
+
+@Component({
+  selector: 'ds-create-collection-parent-selector',
+  templateUrl: '../dso-selector-modal-wrapper.component.html',
+})
+export class CreateCollectionParentSelectorComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
new file mode 100644
index 0000000000..84fdd34c01
--- /dev/null
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -0,0 +1,19 @@
+<div>
+    <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
+        <button type="button" class="close" (click)="close()" aria-label="Close">
+            <span aria-hidden="true">×</span>
+        </button>
+    </div>
+    <div class="modal-body">
+        <button class="btn btn-outline-primary btn-lg btn-block" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
+        <h3 class="position-relative py-1 my-3 font-weight-normal">
+            <hr>
+            <div id="create-community-or-separator" class="text-center position-absolute w-100">
+                <span class="px-4 bg-white">or</span>
+            </div>
+        </h3>
+
+        <h5 class="px-2">{{'dso-selector.create.community.sub-level' | translate}}</h5>
+        <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+    </div>
+</div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.scss b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.scss
new file mode 100644
index 0000000000..0daf4cfa5f
--- /dev/null
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.scss
@@ -0,0 +1,3 @@
+#create-community-or-separator {
+    top: 0;
+}
\ No newline at end of file
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
new file mode 100644
index 0000000000..bb2785eab9
--- /dev/null
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+import {
+    CreateCommunityParentSelectorComponent as BaseComponent
+} from 'src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
+
+@Component({
+  selector: 'ds-create-community-parent-selector',
+  styleUrls: ['./create-community-parent-selector.component.scss'],
+  templateUrl: './create-community-parent-selector.component.html',
+})
+export class CreateCommunityParentSelectorComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
new file mode 100644
index 0000000000..664aef95c0
--- /dev/null
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
@@ -0,0 +1,15 @@
+<div>
+  <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
+    <button type="button" class="close" (click)="close()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <div [innerHTML]="'dso-selector.create.item.intro' | translate"></div>
+    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    <ds-authorized-collection-selector [currentDSOId]="dsoRD?.payload.uuid"
+                                       [entityType]="entityType"
+                                       [types]="selectorTypes"
+                                       (onSelect)="selectObject($event)"></ds-authorized-collection-selector>
+  </div>
+</div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
new file mode 100644
index 0000000000..e04874c801
--- /dev/null
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
@@ -0,0 +1,11 @@
+import {Component} from '@angular/core';
+import {
+    CreateItemParentSelectorComponent as BaseComponent
+} from 'src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
+
+@Component({
+    selector: 'ulib-create-item-parent-selector',
+    templateUrl: './create-item-parent-selector.component.html',
+})
+export class CreateItemParentSelectorComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
new file mode 100644
index 0000000000..85d8797e66
--- /dev/null
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
@@ -0,0 +1,11 @@
+<div>
+  <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
+    <button type="button" class="close" (click)="close()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+  </div>
+</div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
new file mode 100644
index 0000000000..6a51908dbc
--- /dev/null
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+import {
+    EditCollectionSelectorComponent as BaseComponent
+} from 'src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component'
+
+@Component({
+  selector: 'ds-edit-collection-selector',
+  templateUrl: '../dso-selector-modal-wrapper.component.html',
+})
+export class EditCollectionSelectorComponent extends BaseComponent {
+}
\ No newline at end of file
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
new file mode 100644
index 0000000000..3a20cff266
--- /dev/null
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+import {
+    EditCommunitySelectorComponent as BaseComponent
+} from 'src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
+
+@Component({
+  selector: 'ds-edit-item-selector',
+  templateUrl: '../dso-selector-modal-wrapper.component.html',
+})
+export class EditCommunitySelectorComponent extends BaseComponent {
+}
\ No newline at end of file
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
new file mode 100644
index 0000000000..ddd6cae7b6
--- /dev/null
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+import {
+    EditItemSelectorComponent as BaseComponent
+} from 'src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
+
+@Component({
+  selector: 'ds-edit-item-selector',
+  templateUrl: '../dso-selector-modal-wrapper.component.html',
+})
+export class EditItemSelectorComponent extends BaseComponent {
+}
\ No newline at end of file
diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts
index 5256d2fd7c..4c75f63cc9 100644
--- a/src/themes/custom/eager-theme.module.ts
+++ b/src/themes/custom/eager-theme.module.ts
@@ -21,6 +21,24 @@ import {
 } from './app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
 import { UntypedItemComponent } from './app/item-page/simple/item-types/untyped-item/untyped-item.component';
 import { ItemSharedModule } from '../../app/item-page/item-shared.module';
+import {
+    CreateCollectionParentSelectorComponent
+} from './app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
+import {
+    CreateCommunityParentSelectorComponent
+} from './app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
+import {
+    CreateItemParentSelectorComponent
+} from './app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
+import {
+    EditCollectionSelectorComponent
+} from './app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
+import {
+    EditCommunitySelectorComponent
+} from './app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
+import {
+    EditItemSelectorComponent
+} from './app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
 
 /**
  * Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS.
@@ -41,6 +59,12 @@ const DECLARATIONS = [
   HeaderNavbarWrapperComponent,
   NavbarComponent,
   FooterComponent,
+  CreateCollectionParentSelectorComponent,
+  CreateCommunityParentSelectorComponent,
+  CreateItemParentSelectorComponent,
+  EditCollectionSelectorComponent,
+  EditCommunitySelectorComponent,
+  EditItemSelectorComponent,
 ];
 
 @NgModule({

From 1f1b04e88f56ab2e8a70cf2a66e4706f9c592c54 Mon Sep 17 00:00:00 2001
From: "Mark H. Wood" <mwood@IUPUI.Edu>
Date: Fri, 2 Sep 2022 12:04:01 -0400
Subject: [PATCH 32/48] Fix lint issues, incorrect selector copied from local
 code.

---
 .../create-item-parent-selector.component.ts                  | 2 +-
 .../edit-collection-selector.component.ts                     | 4 ++--
 .../edit-community-selector.component.ts                      | 2 +-
 .../edit-item-selector/edit-item-selector.component.ts        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
index e04874c801..44eb6edd18 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
@@ -4,7 +4,7 @@ import {
 } from 'src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
 
 @Component({
-    selector: 'ulib-create-item-parent-selector',
+    selector: 'ds-create-item-parent-selector',
     templateUrl: './create-item-parent-selector.component.html',
 })
 export class CreateItemParentSelectorComponent extends BaseComponent {
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
index 6a51908dbc..3b463f2851 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
@@ -1,11 +1,11 @@
 import { Component } from '@angular/core';
 import {
     EditCollectionSelectorComponent as BaseComponent
-} from 'src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component'
+} from 'src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
 
 @Component({
   selector: 'ds-edit-collection-selector',
   templateUrl: '../dso-selector-modal-wrapper.component.html',
 })
 export class EditCollectionSelectorComponent extends BaseComponent {
-}
\ No newline at end of file
+}
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
index 3a20cff266..cd9ea222f4 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
@@ -8,4 +8,4 @@ import {
   templateUrl: '../dso-selector-modal-wrapper.component.html',
 })
 export class EditCommunitySelectorComponent extends BaseComponent {
-}
\ No newline at end of file
+}
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
index ddd6cae7b6..efff58d2a3 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
@@ -8,4 +8,4 @@ import {
   templateUrl: '../dso-selector-modal-wrapper.component.html',
 })
 export class EditItemSelectorComponent extends BaseComponent {
-}
\ No newline at end of file
+}

From 38203490c7573f70e3de26da8bc54f29c8022e9a Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Mon, 5 Sep 2022 09:51:05 +0200
Subject: [PATCH 33/48] 93803: Add missing docstrings

---
 .../browse/browse-definition-data.service.ts  | 18 +++++++++++++-
 src/app/core/config/config-data.service.ts    | 18 ++++++++++++++
 ...submission-accesses-config-data.service.ts | 14 +++++++++++
 .../submission-forms-config-data.service.ts   | 17 +++++++++++++
 .../core/data/access-status-data.service.ts   |  5 +++-
 src/app/core/data/dso-redirect.service.ts     | 14 +++++++++++
 .../persistent-identifier-data.service.ts     | 24 -------------------
 .../vocabulary-entry-details.data.service.ts  |  3 +++
 .../vocabularies/vocabulary.data.service.ts   |  3 +++
 9 files changed, 90 insertions(+), 26 deletions(-)
 delete mode 100644 src/app/core/data/persistent-identifier-data.service.ts

diff --git a/src/app/core/browse/browse-definition-data.service.ts b/src/app/core/browse/browse-definition-data.service.ts
index 1c68885432..32c3b44e14 100644
--- a/src/app/core/browse/browse-definition-data.service.ts
+++ b/src/app/core/browse/browse-definition-data.service.ts
@@ -14,6 +14,9 @@ import { IdentifiableDataService } from '../data/base/identifiable-data.service'
 import { FindAllData, FindAllDataImpl } from '../data/base/find-all-data';
 import { dataService } from '../data/base/data-service.decorator';
 
+/**
+ * Data service responsible for retrieving browse definitions from the REST server
+ */
 @Injectable({
   providedIn: 'root',
 })
@@ -32,7 +35,20 @@ export class BrowseDefinitionDataService extends IdentifiableDataService<BrowseD
     this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
-
+  /**
+   * 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<BrowseDefinition>[]): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
     return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
diff --git a/src/app/core/config/config-data.service.ts b/src/app/core/config/config-data.service.ts
index 8c903a8ba6..9ef2f11ad1 100644
--- a/src/app/core/config/config-data.service.ts
+++ b/src/app/core/config/config-data.service.ts
@@ -6,7 +6,25 @@ import { getFirstCompletedRemoteData } from '../shared/operators';
 import { map } from 'rxjs/operators';
 import { BaseDataService } from '../data/base/base-data.service';
 
+/**
+ * Abstract data service to retrieve configuration objects from the REST server.
+ * Common logic for configuration objects should be implemented here.
+ */
 export abstract class ConfigDataService extends BaseDataService<ConfigObject> {
+  /**
+   * 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
+   *
+   * Throws an error if a configuration object cannot be retrieved.
+   *
+   * @param href                        The url 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
+   */
   public findByHref(href: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<ConfigObject>[]): Observable<RemoteData<ConfigObject>> {
     return super.findByHref(href, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
       getFirstCompletedRemoteData(),
diff --git a/src/app/core/config/submission-accesses-config-data.service.ts b/src/app/core/config/submission-accesses-config-data.service.ts
index 9cfdfaec96..d2da0fce42 100644
--- a/src/app/core/config/submission-accesses-config-data.service.ts
+++ b/src/app/core/config/submission-accesses-config-data.service.ts
@@ -27,6 +27,20 @@ export class SubmissionAccessesConfigDataService extends ConfigDataService {
     super('submissionaccessoptions', requestService, rdbService, objectCache, halService);
   }
 
+  /**
+   * 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
+   *
+   * Throws an error if a configuration object cannot be retrieved.
+   *
+   * @param href                        The url 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
+   */
   findByHref(href: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow): Observable<RemoteData<SubmissionAccessesModel>> {
     return super.findByHref(href, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow as FollowLinkConfig<ConfigObject>[]) as Observable<RemoteData<SubmissionAccessesModel>>;
   }
diff --git a/src/app/core/config/submission-forms-config-data.service.ts b/src/app/core/config/submission-forms-config-data.service.ts
index 3cb82b262a..f4c0690685 100644
--- a/src/app/core/config/submission-forms-config-data.service.ts
+++ b/src/app/core/config/submission-forms-config-data.service.ts
@@ -12,6 +12,9 @@ import { Observable } from 'rxjs';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { dataService } from '../data/base/data-service.decorator';
 
+/**
+ * Data service to retrieve submission form configuration objects from the REST server.
+ */
 @Injectable()
 @dataService(SUBMISSION_FORMS_TYPE)
 export class SubmissionFormsConfigDataService extends ConfigDataService {
@@ -24,6 +27,20 @@ export class SubmissionFormsConfigDataService extends ConfigDataService {
     super('submissionforms', requestService, rdbService, objectCache, halService);
   }
 
+  /**
+   * 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
+   *
+   * Throws an error if a configuration object cannot be retrieved.
+   *
+   * @param href                        The url 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
+   */
   public findByHref(href: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<SubmissionFormsModel>[]): Observable<RemoteData<SubmissionFormsModel>> {
     return super.findByHref(href, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow as FollowLinkConfig<ConfigObject>[]) as Observable<RemoteData<SubmissionFormsModel>>;
   }
diff --git a/src/app/core/data/access-status-data.service.ts b/src/app/core/data/access-status-data.service.ts
index aac9cc9136..2f641456fa 100644
--- a/src/app/core/data/access-status-data.service.ts
+++ b/src/app/core/data/access-status-data.service.ts
@@ -11,6 +11,9 @@ import { Item } from '../shared/item.model';
 import { BaseDataService } from './base/base-data.service';
 import { dataService } from './base/data-service.decorator';
 
+/**
+ * Data service responsible for retrieving the access status of Items
+ */
 @Injectable()
 @dataService(ACCESS_STATUS)
 export class AccessStatusDataService extends BaseDataService<AccessStatusObject> {
@@ -26,7 +29,7 @@ export class AccessStatusDataService extends BaseDataService<AccessStatusObject>
 
   /**
    * Returns {@link RemoteData} of {@link AccessStatusObject} that is the access status of the given item
-   * @param item  Item we want the access status of
+   * @param item Item we want the access status of
    */
   findAccessStatusFor(item: Item): Observable<RemoteData<AccessStatusObject>> {
     return this.findByHref(item._links.accessStatus.href);
diff --git a/src/app/core/data/dso-redirect.service.ts b/src/app/core/data/dso-redirect.service.ts
index 6c57dbb594..81ce678e43 100644
--- a/src/app/core/data/dso-redirect.service.ts
+++ b/src/app/core/data/dso-redirect.service.ts
@@ -25,6 +25,11 @@ import { getDSORoute } from '../../app-routing-paths';
 const ID_ENDPOINT = 'pid';
 const UUID_ENDPOINT = 'dso';
 
+/**
+ * A data service to retrieve DSpaceObjects by persistent identifier or UUID.
+ * Doesn't define a constant {@link linkPath} but switches between two endpoints on demand:
+ * {@link setLinkPath} must be called before each request.
+ */
 class DsoByIdOrUUIDDataService extends IdentifiableDataService<DSpaceObject> {
   constructor(
     protected requestService: RequestService,
@@ -56,6 +61,10 @@ class DsoByIdOrUUIDDataService extends IdentifiableDataService<DSpaceObject> {
   }
 }
 
+/**
+ * A service to handle redirects from identifier paths to DSO path
+ * e.g.: redirect from /handle/... to /items/...
+ */
 @Injectable()
 export class DsoRedirectService {
   private dataService: DsoByIdOrUUIDDataService;
@@ -70,6 +79,11 @@ export class DsoRedirectService {
     this.dataService = new DsoByIdOrUUIDDataService(requestService, rdbService, objectCache, halService);
   }
 
+  /**
+   * Retrieve a DSpaceObject by
+   * @param id              the identifier of the object to retrieve
+   * @param identifierType  the type of the given identifier (defaults to UUID)
+   */
   findByIdAndIDType(id: string, identifierType = IdentifierType.UUID): Observable<RemoteData<DSpaceObject>> {
     this.dataService.setLinkPath(identifierType);
     return this.dataService.findById(id).pipe(
diff --git a/src/app/core/data/persistent-identifier-data.service.ts b/src/app/core/data/persistent-identifier-data.service.ts
deleted file mode 100644
index bd7d12a7c6..0000000000
--- a/src/app/core/data/persistent-identifier-data.service.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * 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 { RequestService } from './request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { IdentifiableDataService } from './base/identifiable-data.service';
-import { DSpaceObject } from '../shared/dspace-object.model';
-
-export class PersistentIdentifierDataService extends IdentifiableDataService<DSpaceObject> {
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-  ) {
-    super('pid', requestService, rdbService, objectCache, halService);
-  }
-}
diff --git a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
index f19c0c00c2..ab7646042e 100644
--- a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
@@ -22,6 +22,9 @@ import { Injectable } from '@angular/core';
 import { VOCABULARY_ENTRY_DETAIL } from './models/vocabularies.resource-type';
 import { dataService } from '../../data/base/data-service.decorator';
 
+/**
+ * Data service to retrieve vocabulary entry details from the REST server.
+ */
 @Injectable()
 @dataService(VOCABULARY_ENTRY_DETAIL)
 export class VocabularyEntryDetailsDataService extends IdentifiableDataService<VocabularyEntryDetail> implements FindAllData<VocabularyEntryDetail>, SearchData<VocabularyEntryDetail> {
diff --git a/src/app/core/submission/vocabularies/vocabulary.data.service.ts b/src/app/core/submission/vocabularies/vocabulary.data.service.ts
index e4e17b7e73..ef642a6793 100644
--- a/src/app/core/submission/vocabularies/vocabulary.data.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.data.service.ts
@@ -21,6 +21,9 @@ import { Injectable } from '@angular/core';
 import { VOCABULARY } from './models/vocabularies.resource-type';
 import { dataService } from '../../data/base/data-service.decorator';
 
+/**
+ * Data service to retrieve vocabularies from the REST server.
+ */
 @Injectable()
 @dataService(VOCABULARY)
 export class VocabularyDataService extends IdentifiableDataService<Vocabulary> implements FindAllData<Vocabulary> {

From a6fb4a6303ab47ac1f54218cdad1d05168d40af4 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Mon, 5 Sep 2022 10:55:58 +0200
Subject: [PATCH 34/48] 93803: Update DataService constructor signatures

Override linkPath/responseMsToLive/constructIdEndpoint
  - in class body for inheritable classes (for clarity: it's the first thing you'd read, variable name is right there)
  - in constructor for composable classes
    * wrapped services must be 'synchronized' with their wrapper
    * moved these overrides up in the argument list for emphasis (implementing a new composable feature? first thing is to use the same endpoint!)
---
 .../browse/browse-definition-data.service.ts  |  6 ++-
 .../core/config/config-data.service.spec.ts   |  2 +-
 ...submission-accesses-config-data.service.ts |  4 +-
 .../submission-forms-config-data.service.ts   |  4 +-
 .../submission-uploads-config-data.service.ts |  4 +-
 .../core/data/access-status-data.service.ts   |  3 +-
 .../core/data/base/base-data.service.spec.ts  |  2 +-
 src/app/core/data/base/base-data.service.ts   | 53 +++++++++++++++----
 src/app/core/data/base/create-data.spec.ts    |  2 +-
 src/app/core/data/base/create-data.ts         |  4 +-
 src/app/core/data/base/delete-data.spec.ts    |  2 +-
 src/app/core/data/base/delete-data.ts         |  6 +--
 src/app/core/data/base/find-all-data.spec.ts  |  2 +-
 src/app/core/data/base/find-all-data.ts       |  4 +-
 .../base/identifiable-data.service.spec.ts    |  2 +-
 .../data/base/identifiable-data.service.ts    | 15 +++---
 src/app/core/data/base/patch-data.spec.ts     |  2 +-
 src/app/core/data/base/patch-data.ts          |  6 +--
 src/app/core/data/base/put-data.spec.ts       |  2 +-
 src/app/core/data/base/put-data.ts            |  4 +-
 src/app/core/data/base/search-data.spec.ts    |  2 +-
 src/app/core/data/base/search-data.ts         |  4 +-
 src/app/core/data/bitstream-data.service.ts   | 10 ++--
 .../data/bitstream-format-data.service.ts     |  7 ++-
 src/app/core/data/bundle-data.service.ts      |  6 ++-
 src/app/core/data/collection-data.service.ts  |  4 +-
 src/app/core/data/comcol-data.service.spec.ts |  7 ++-
 src/app/core/data/comcol-data.service.ts      | 13 +++--
 src/app/core/data/community-data.service.ts   |  4 +-
 .../core/data/configuration-data.service.ts   |  3 +-
 src/app/core/data/dso-redirect.service.ts     | 14 +++--
 .../core/data/dspace-object-data.service.ts   | 13 +++--
 src/app/core/data/entity-type-data.service.ts |  8 +--
 .../core/data/external-source-data.service.ts |  6 ++-
 .../authorization-data.service.ts             |  5 +-
 .../feature-data.service.ts                   |  2 +-
 src/app/core/data/href-only-data.service.ts   |  2 +-
 src/app/core/data/item-data.service.ts        | 16 +++---
 .../core/data/item-request-data.service.ts    |  4 +-
 .../core/data/item-template-data.service.ts   | 10 ++--
 .../core/data/metadata-field-data.service.ts  | 12 +++--
 .../core/data/metadata-schema-data.service.ts | 12 +++--
 .../data/processes/process-data.service.ts    |  6 ++-
 .../data/processes/script-data.service.ts     |  6 ++-
 .../core/data/relationship-data.service.ts    |  9 ++--
 .../data/relationship-type-data.service.ts    |  8 +--
 src/app/core/data/root-data.service.ts        |  5 +-
 src/app/core/data/site-data.service.ts        |  6 ++-
 src/app/core/data/version-data.service.ts     |  5 +-
 .../core/data/version-history-data.service.ts |  3 +-
 .../core/data/workflow-action-data.service.ts |  2 +-
 src/app/core/eperson/eperson-data.service.ts  | 12 +++--
 src/app/core/eperson/group-data.service.ts    | 12 +++--
 .../core/feedback/feedback-data.service.ts    |  6 ++-
 .../core/orcid/orcid-history-data.service.ts  |  4 +-
 .../core/orcid/orcid-queue-data.service.ts    |  9 ++--
 .../researcher-profile-data.service.ts        | 13 +++--
 .../resource-policy-data.service.ts           | 12 +++--
 src/app/core/shared/search/search.service.ts  |  4 +-
 .../statistics/usage-report-data.service.ts   |  6 ++-
 .../submission-cc-license-data.service.ts     |  3 +-
 .../submission-cc-license-url-data.service.ts |  6 ++-
 .../vocabulary-entry-details.data.service.ts  |  8 +--
 .../vocabularies/vocabulary.data.service.ts   |  6 ++-
 .../submission/workflowitem-data.service.ts   |  9 ++--
 .../submission/workspaceitem-data.service.ts  |  8 +--
 .../core/tasks/claimed-task-data.service.ts   |  4 +-
 src/app/core/tasks/pool-task-data.service.ts  |  5 +-
 src/app/core/tasks/tasks.service.spec.ts      |  2 +-
 src/app/core/tasks/tasks.service.ts           |  6 +--
 70 files changed, 294 insertions(+), 184 deletions(-)

diff --git a/src/app/core/browse/browse-definition-data.service.ts b/src/app/core/browse/browse-definition-data.service.ts
index 32c3b44e14..0bb60b1104 100644
--- a/src/app/core/browse/browse-definition-data.service.ts
+++ b/src/app/core/browse/browse-definition-data.service.ts
@@ -22,6 +22,8 @@ import { dataService } from '../data/base/data-service.decorator';
 })
 @dataService(BROWSE_DEFINITION)
 export class BrowseDefinitionDataService extends IdentifiableDataService<BrowseDefinition> implements FindAllData<BrowseDefinition> {
+  protected linkPath = 'browses';
+
   private findAllData: FindAllDataImpl<BrowseDefinition>;
 
   constructor(
@@ -30,9 +32,9 @@ export class BrowseDefinitionDataService extends IdentifiableDataService<BrowseD
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('browses', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/config/config-data.service.spec.ts b/src/app/core/config/config-data.service.spec.ts
index 38340d1ad5..ca747d2255 100644
--- a/src/app/core/config/config-data.service.spec.ts
+++ b/src/app/core/config/config-data.service.spec.ts
@@ -24,7 +24,7 @@ class TestService extends ConfigDataService {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(BROWSE, requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
   }
 }
 
diff --git a/src/app/core/config/submission-accesses-config-data.service.ts b/src/app/core/config/submission-accesses-config-data.service.ts
index d2da0fce42..be236182d9 100644
--- a/src/app/core/config/submission-accesses-config-data.service.ts
+++ b/src/app/core/config/submission-accesses-config-data.service.ts
@@ -18,13 +18,15 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(SUBMISSION_ACCESSES_TYPE)
 export class SubmissionAccessesConfigDataService extends ConfigDataService {
+  protected linkPath = 'submissionaccessoptions';
+
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('submissionaccessoptions', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/config/submission-forms-config-data.service.ts b/src/app/core/config/submission-forms-config-data.service.ts
index f4c0690685..6243a13c0a 100644
--- a/src/app/core/config/submission-forms-config-data.service.ts
+++ b/src/app/core/config/submission-forms-config-data.service.ts
@@ -18,13 +18,15 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(SUBMISSION_FORMS_TYPE)
 export class SubmissionFormsConfigDataService extends ConfigDataService {
+  protected linkPath = 'submissionforms';
+
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('submissionforms', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/config/submission-uploads-config-data.service.ts b/src/app/core/config/submission-uploads-config-data.service.ts
index 8f838352a9..23ad1741e4 100644
--- a/src/app/core/config/submission-uploads-config-data.service.ts
+++ b/src/app/core/config/submission-uploads-config-data.service.ts
@@ -18,13 +18,15 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(SUBMISSION_UPLOADS_TYPE)
 export class SubmissionUploadsConfigDataService extends ConfigDataService {
+  protected linkPath = 'submissionuploads';
+
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('submissionuploads', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
   }
 
   findByHref(href: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow): Observable<RemoteData<SubmissionUploadsModel>> {
diff --git a/src/app/core/data/access-status-data.service.ts b/src/app/core/data/access-status-data.service.ts
index 2f641456fa..6635369726 100644
--- a/src/app/core/data/access-status-data.service.ts
+++ b/src/app/core/data/access-status-data.service.ts
@@ -17,6 +17,7 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(ACCESS_STATUS)
 export class AccessStatusDataService extends BaseDataService<AccessStatusObject> {
+  protected linkPath = 'accessStatus';
 
   constructor(
     protected requestService: RequestService,
@@ -24,7 +25,7 @@ export class AccessStatusDataService extends BaseDataService<AccessStatusObject>
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('accessStatus', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/base/base-data.service.spec.ts b/src/app/core/data/base/base-data.service.spec.ts
index cd8b8c3e32..19310004fa 100644
--- a/src/app/core/data/base/base-data.service.spec.ts
+++ b/src/app/core/data/base/base-data.service.spec.ts
@@ -32,7 +32,7 @@ class TestService extends BaseDataService<any> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(undefined, requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
   }
 
   public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index d8caa6c1c8..3618583428 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -8,7 +8,7 @@
 
 import { AsyncSubject, from as observableFrom, Observable, of as observableOf } from 'rxjs';
 import { map, mergeMap, skipWhile, switchMap, take, tap, toArray } from 'rxjs/operators';
-import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
+import { hasValue, isEmpty, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { RequestParam } from '../../cache/models/request-param.model';
@@ -31,13 +31,23 @@ import { HALDataService } from './hal-data-service.interface';
  *
  * All DataService (or DataService feature) classes must
  *   - extend this class (or {@link IdentifiableDataService})
- *   - implement any DataService features it requires in order to forward calls to it
+ *   - specify a {@link linkPath}
+ *   - implement any DataService features it requires in order to forward calls to it.
+ *     {@link linkPath} and {@link responseMsToLive} must be passed through.
  *
  * ```
  * export class SomeDataService extends BaseDataService<Something> implements CreateData<Something>, SearchData<Something> {
+ *   protected linkPath = 'something';
+ *   protected responseMsToLive = 3 * 60 * 1000;  // not required
+ *
  *   private createData: CreateData<Something>;
  *   private searchData: SearchDataData<Something>;
  *
+ *   constructor(...) {
+ *      this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, ...);
+ *      this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, ...);
+ *   }
+ *
  *   create(...) {
  *     return this.createData.create(...);
  *   }
@@ -49,19 +59,40 @@ import { HALDataService } from './hal-data-service.interface';
  * ```
  */
 export class BaseDataService<T extends CacheableObject> implements HALDataService<T> {
-  constructor(
-    protected linkPath: string,
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected responseMsToLive?: number,
-  ) {
-  }
+  /**
+   * The REST endpoint this data service communicates with
+   */
+  protected linkPath: string;
 
   /**
    * Allows subclasses to reset the response cache time.
    */
+  protected responseMsToLive?: number;
+
+  /**
+   * @param requestService
+   * @param rdbService
+   * @param objectCache
+   * @param halService
+   * @param linkPath          Optionally sets the {@link linkPath}; to be used by composable features.
+   * @param responseMsToLive  Optionally sets the {@link responseMsToLive}; to be used by composable features.
+   */
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    linkPath?: string,
+    responseMsToLive?: number,
+  ) {
+    if (isEmpty(this.linkPath) && isNotEmpty(linkPath)) {
+      this.linkPath = linkPath;
+    }
+    if (isEmpty(this.responseMsToLive) && isNotEmpty(responseMsToLive)) {
+      this.responseMsToLive = responseMsToLive;
+    }
+  }
+
 
   /**
    * Get the endpoint for browsing
diff --git a/src/app/core/data/base/create-data.spec.ts b/src/app/core/data/base/create-data.spec.ts
index ceefd3c51d..1936be5c98 100644
--- a/src/app/core/data/base/create-data.spec.ts
+++ b/src/app/core/data/base/create-data.spec.ts
@@ -31,7 +31,7 @@ class TestService extends CreateDataImpl<any> {
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super(undefined, requestService, rdbService, objectCache, halService, notificationsService, undefined);
+    super(undefined, undefined, requestService, rdbService, objectCache, halService, notificationsService);
   }
 
   public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
diff --git a/src/app/core/data/base/create-data.ts b/src/app/core/data/base/create-data.ts
index 3ffcd9adf2..faaadf45e7 100644
--- a/src/app/core/data/base/create-data.ts
+++ b/src/app/core/data/base/create-data.ts
@@ -45,14 +45,14 @@ export interface CreateData<T extends CacheableObject> {
 export class CreateDataImpl<T extends CacheableObject> extends BaseDataService<T> implements CreateData<T> {
   constructor(
     protected linkPath: string,
+    protected responseMsToLive: number,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
-    protected responseMsToLive: number,
   ) {
-    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive);
+    super(requestService, rdbService, objectCache, halService, linkPath, responseMsToLive);
   }
 
   /**
diff --git a/src/app/core/data/base/delete-data.spec.ts b/src/app/core/data/base/delete-data.spec.ts
index 4c4a2ded6d..bdca855c98 100644
--- a/src/app/core/data/base/delete-data.spec.ts
+++ b/src/app/core/data/base/delete-data.spec.ts
@@ -36,7 +36,7 @@ class TestService extends DeleteDataImpl<any> {
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super(undefined, requestService, rdbService, objectCache, halService, notificationsService, undefined, constructIdEndpointDefault);
+    super(undefined, undefined, constructIdEndpointDefault, requestService, rdbService, objectCache, halService, notificationsService);
   }
 
   public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
diff --git a/src/app/core/data/base/delete-data.ts b/src/app/core/data/base/delete-data.ts
index 2e34f0957c..514a65dc2f 100644
--- a/src/app/core/data/base/delete-data.ts
+++ b/src/app/core/data/base/delete-data.ts
@@ -46,15 +46,15 @@ export interface DeleteData<T extends CacheableObject> {
 export class DeleteDataImpl<T extends CacheableObject> extends IdentifiableDataService<T> implements DeleteData<T> {
   constructor(
     protected linkPath: string,
+    protected responseMsToLive: number,
+    protected constructIdEndpoint: ConstructIdEndpoint,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
-    protected responseMsToLive: number,
-    protected constructIdEndpoint: ConstructIdEndpoint,
   ) {
-    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive, constructIdEndpoint);
+    super(requestService, rdbService, objectCache, halService);
     if (hasNoValue(constructIdEndpoint)) {
       throw new Error(`DeleteDataImpl initialized without a constructIdEndpoint method (linkPath: ${linkPath})`);
     }
diff --git a/src/app/core/data/base/find-all-data.spec.ts b/src/app/core/data/base/find-all-data.spec.ts
index 3caa8990f6..6312d70424 100644
--- a/src/app/core/data/base/find-all-data.spec.ts
+++ b/src/app/core/data/base/find-all-data.spec.ts
@@ -71,7 +71,7 @@ class TestService extends FindAllDataImpl<any> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(undefined, requestService, rdbService, objectCache, halService, undefined);
+    super(undefined, undefined, requestService, rdbService, objectCache, halService);
   }
 
   public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
diff --git a/src/app/core/data/base/find-all-data.ts b/src/app/core/data/base/find-all-data.ts
index c2330af243..04ee426598 100644
--- a/src/app/core/data/base/find-all-data.ts
+++ b/src/app/core/data/base/find-all-data.ts
@@ -61,13 +61,13 @@ export interface FindAllData<T extends CacheableObject> {
 export class FindAllDataImpl<T extends CacheableObject> extends BaseDataService<T> implements FindAllData<T> {
   constructor(
     protected linkPath: string,
+    protected responseMsToLive: number,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected responseMsToLive: number,
   ) {
-    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive);
+    super(requestService, rdbService, objectCache, halService, linkPath, responseMsToLive);
   }
 
   /**
diff --git a/src/app/core/data/base/identifiable-data.service.spec.ts b/src/app/core/data/base/identifiable-data.service.spec.ts
index d08f1141fc..015c7593b0 100644
--- a/src/app/core/data/base/identifiable-data.service.spec.ts
+++ b/src/app/core/data/base/identifiable-data.service.spec.ts
@@ -29,7 +29,7 @@ class TestService extends IdentifiableDataService<any> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(undefined, requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
   }
 
   public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
diff --git a/src/app/core/data/base/identifiable-data.service.ts b/src/app/core/data/base/identifiable-data.service.ts
index 904f925765..a2fb7cc1b7 100644
--- a/src/app/core/data/base/identifiable-data.service.ts
+++ b/src/app/core/data/base/identifiable-data.service.ts
@@ -28,21 +28,22 @@ export const constructIdEndpointDefault = (endpoint, resourceID) => `${endpoint}
 
 /**
  * A type of data service that deals with objects that have an ID.
- *
- * The effective endpoint to use for the ID can be adjusted by providing a different {@link ConstructIdEndpoint} method.
- * This method is passed as an argument so that it can be set on data service features without having to override them.
  */
 export class IdentifiableDataService<T extends CacheableObject> extends BaseDataService<T> {
+  /**
+   * A method to construct the effective endpoint to use for the ID.
+   * Also passed as an optional constructor argument so that it can be set on data service features without having to override them.
+   * @protected
+   */
+  protected constructIdEndpoint: ConstructIdEndpoint = constructIdEndpointDefault;
+
   constructor(
-    protected linkPath: string,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected responseMsToLive?: number,
-    protected constructIdEndpoint: ConstructIdEndpoint = constructIdEndpointDefault,
   ) {
-    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive);
+    super(requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/base/patch-data.spec.ts b/src/app/core/data/base/patch-data.spec.ts
index 601188ae7d..4962d2e28a 100644
--- a/src/app/core/data/base/patch-data.spec.ts
+++ b/src/app/core/data/base/patch-data.spec.ts
@@ -38,7 +38,7 @@ class TestService extends PatchDataImpl<any> {
     protected halService: HALEndpointService,
     protected comparator: ChangeAnalyzer<Item>,
   ) {
-    super(undefined, requestService, rdbService, objectCache, halService, comparator, undefined, constructIdEndpointDefault);
+    super(undefined, undefined, constructIdEndpointDefault, requestService, rdbService, objectCache, halService, comparator);
   }
 
   public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
diff --git a/src/app/core/data/base/patch-data.ts b/src/app/core/data/base/patch-data.ts
index 558de928c4..f361629400 100644
--- a/src/app/core/data/base/patch-data.ts
+++ b/src/app/core/data/base/patch-data.ts
@@ -65,15 +65,15 @@ export interface PatchData<T extends CacheableObject> {
 export class PatchDataImpl<T extends CacheableObject> extends IdentifiableDataService<T> implements PatchData<T> {
   constructor(
     protected linkPath: string,
+    protected responseMsToLive: number,
+    protected constructIdEndpoint: ConstructIdEndpoint,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected comparator: ChangeAnalyzer<T>,
-    protected responseMsToLive: number,
-    protected constructIdEndpoint: ConstructIdEndpoint,
   ) {
-    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive, constructIdEndpoint);
+    super(requestService, rdbService, objectCache, halService);
     if (hasNoValue(constructIdEndpoint)) {
       throw new Error(`PatchDataImpl initialized without a constructIdEndpoint method (linkPath: ${linkPath})`);
     }
diff --git a/src/app/core/data/base/put-data.spec.ts b/src/app/core/data/base/put-data.spec.ts
index 01b5caea5b..173121572b 100644
--- a/src/app/core/data/base/put-data.spec.ts
+++ b/src/app/core/data/base/put-data.spec.ts
@@ -30,7 +30,7 @@ class TestService extends PutDataImpl<any> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(undefined, requestService, rdbService, objectCache, halService, undefined);
+    super(undefined, undefined, requestService, rdbService, objectCache, halService);
   }
 
   public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
diff --git a/src/app/core/data/base/put-data.ts b/src/app/core/data/base/put-data.ts
index bd2a8d2929..82491e9264 100644
--- a/src/app/core/data/base/put-data.ts
+++ b/src/app/core/data/base/put-data.ts
@@ -39,13 +39,13 @@ export interface PutData<T extends CacheableObject> {
 export class PutDataImpl<T extends CacheableObject> extends BaseDataService<T> implements PutData<T> {
   constructor(
     protected linkPath: string,
+    protected responseMsToLive: number,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected responseMsToLive: number,
   ) {
-    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive);
+    super(requestService, rdbService, objectCache, halService, linkPath, responseMsToLive);
   }
 
   /**
diff --git a/src/app/core/data/base/search-data.spec.ts b/src/app/core/data/base/search-data.spec.ts
index 7abf26b5b8..b0ad185b73 100644
--- a/src/app/core/data/base/search-data.spec.ts
+++ b/src/app/core/data/base/search-data.spec.ts
@@ -68,7 +68,7 @@ class TestService extends SearchDataImpl<any> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(undefined, requestService, rdbService, objectCache, halService, undefined);
+    super(undefined, undefined, requestService, rdbService, objectCache, halService);
   }
 
   public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
diff --git a/src/app/core/data/base/search-data.ts b/src/app/core/data/base/search-data.ts
index 12cae77c3a..d0204e83a2 100644
--- a/src/app/core/data/base/search-data.ts
+++ b/src/app/core/data/base/search-data.ts
@@ -80,14 +80,14 @@ export class SearchDataImpl<T extends CacheableObject> extends BaseDataService<T
    */
   constructor(
     protected linkPath: string,
+    protected responseMsToLive: number,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected responseMsToLive: number,
     private constructSearchEndpoint: ConstructSearchEndpoint = constructSearchEndpointDefault,
   ) {
-    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive);
+    super(requestService, rdbService, objectCache, halService, linkPath, responseMsToLive);
     if (hasNoValue(constructSearchEndpoint)) {
       throw new Error(`SearchDataImpl initialized without a constructSearchEndpoint method (linkPath: ${linkPath})`);
     }
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index 0e0c939d9e..2e8d8f9368 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -42,6 +42,8 @@ import { dataService } from './base/data-service.decorator';
 })
 @dataService(BITSTREAM)
 export class BitstreamDataService extends IdentifiableDataService<Bitstream> implements SearchData<Bitstream>, PatchData<Bitstream>, DeleteData<Bitstream> {
+  protected linkPath = 'bitstreams';
+
   private searchData: SearchDataImpl<Bitstream>;
   private patchData: PatchDataImpl<Bitstream>;
   private deleteData: DeleteDataImpl<Bitstream>;
@@ -56,11 +58,11 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
     protected comparator: DSOChangeAnalyzer<Bitstream>,
     protected notificationsService: NotificationsService,
   ) {
-    super('bitstreams', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
-    this.patchData = new PatchDataImpl<Bitstream>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
-    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.patchData = new PatchDataImpl<Bitstream>(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, comparator);
+    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
   }
 
   /**
diff --git a/src/app/core/data/bitstream-format-data.service.ts b/src/app/core/data/bitstream-format-data.service.ts
index 0104389815..587100b1de 100644
--- a/src/app/core/data/bitstream-format-data.service.ts
+++ b/src/app/core/data/bitstream-format-data.service.ts
@@ -41,7 +41,6 @@ const selectedBitstreamFormatSelector = createSelector(
 @Injectable()
 @dataService(BITSTREAM_FORMAT)
 export class BitstreamFormatDataService extends IdentifiableDataService<BitstreamFormat> implements FindAllData<BitstreamFormat>, DeleteData<BitstreamFormat> {
-
   protected linkPath = 'bitstreamformats';
 
   private findAllData: FindAllDataImpl<BitstreamFormat>;
@@ -55,10 +54,10 @@ export class BitstreamFormatDataService extends IdentifiableDataService<Bitstrea
     protected notificationsService: NotificationsService,
     protected store: Store<CoreState>,
   ) {
-    super('bitstreamformats', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
-    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
   }
 
   /**
diff --git a/src/app/core/data/bundle-data.service.ts b/src/app/core/data/bundle-data.service.ts
index e85c0c2bee..dbd5781446 100644
--- a/src/app/core/data/bundle-data.service.ts
+++ b/src/app/core/data/bundle-data.service.ts
@@ -32,6 +32,8 @@ import { dataService } from './base/data-service.decorator';
 )
 @dataService(BUNDLE)
 export class BundleDataService extends IdentifiableDataService<Bundle> implements PatchData<Bundle> {
+  protected linkPath = 'bundles';
+
   private bitstreamsEndpoint = 'bitstreams';
 
   private patchData: PatchDataImpl<Bundle>;
@@ -43,9 +45,9 @@ export class BundleDataService extends IdentifiableDataService<Bundle> implement
     protected halService: HALEndpointService,
     protected comparator: DSOChangeAnalyzer<Bundle>,
   ) {
-    super('bundles', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.patchData = new PatchDataImpl<Bundle>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.patchData = new PatchDataImpl<Bundle>(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, comparator);
   }
 
   /**
diff --git a/src/app/core/data/collection-data.service.ts b/src/app/core/data/collection-data.service.ts
index 405b35c1f9..fd3d6f4066 100644
--- a/src/app/core/data/collection-data.service.ts
+++ b/src/app/core/data/collection-data.service.ts
@@ -38,6 +38,8 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(COLLECTION)
 export class CollectionDataService extends ComColDataService<Collection> {
+  protected linkPath = 'collections';
+
   protected errorTitle = 'collection.source.update.notifications.error.title';
   protected contentSourceError = 'collection.source.update.notifications.error.content';
 
@@ -52,7 +54,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
     protected communityDataService: CommunityDataService,
     protected translate: TranslateService,
   ) {
-    super('collections', requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
+    super(requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
   }
 
   /**
diff --git a/src/app/core/data/comcol-data.service.spec.ts b/src/app/core/data/comcol-data.service.spec.ts
index 758cbad97a..8c70fd9895 100644
--- a/src/app/core/data/comcol-data.service.spec.ts
+++ b/src/app/core/data/comcol-data.service.spec.ts
@@ -33,6 +33,7 @@ const communitiesEndpoint = 'https://rest.api/core/communities';
 const communityEndpoint = `${communitiesEndpoint}/${scopeID}`;
 
 class TestService extends ComColDataService<any> {
+  protected linkPath = 'something';
 
   constructor(
     protected requestService: RequestService,
@@ -45,9 +46,8 @@ class TestService extends ComColDataService<any> {
     protected http: HttpClient,
     protected bitstreamDataService: BitstreamDataService,
     protected comparator: DSOChangeAnalyzer<Community>,
-    protected linkPath: string
   ) {
-    super('something', requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
+    super(requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
   }
 
   protected getFindByParentHref(parentUUID: string): Observable<string> {
@@ -131,8 +131,7 @@ describe('ComColDataService', () => {
       notificationsService,
       http,
       bitstreamDataService,
-      comparator,
-      LINK_NAME
+      comparator
     );
   }
 
diff --git a/src/app/core/data/comcol-data.service.ts b/src/app/core/data/comcol-data.service.ts
index 6392f389b6..7ad4836d43 100644
--- a/src/app/core/data/comcol-data.service.ts
+++ b/src/app/core/data/comcol-data.service.ts
@@ -37,7 +37,6 @@ export abstract class ComColDataService<T extends Community | Collection> extend
   private deleteData: DeleteData<T>;
 
   protected constructor(
-    protected linkPath: string,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
@@ -46,13 +45,13 @@ export abstract class ComColDataService<T extends Community | Collection> extend
     protected notificationsService: NotificationsService,
     protected bitstreamDataService: BitstreamDataService,
   ) {
-    super(linkPath, requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
-    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
-    this.searchData = new SearchDataImpl<T>(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
-    this.patchData = new PatchDataImpl<T>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
-    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, );
+    this.searchData = new SearchDataImpl<T>(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, );
+    this.patchData = new PatchDataImpl<T>(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, comparator);
+    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
   }
 
   /**
diff --git a/src/app/core/data/community-data.service.ts b/src/app/core/data/community-data.service.ts
index 8623d414b2..06792be2d9 100644
--- a/src/app/core/data/community-data.service.ts
+++ b/src/app/core/data/community-data.service.ts
@@ -22,6 +22,8 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(COMMUNITY)
 export class CommunityDataService extends ComColDataService<Community> {
+  protected linkPath = 'communities';
+
   protected topLinkPath = 'search/top';
 
   constructor(
@@ -33,7 +35,7 @@ export class CommunityDataService extends ComColDataService<Community> {
     protected notificationsService: NotificationsService,
     protected bitstreamDataService: BitstreamDataService,
   ) {
-    super('communities', requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
+    super(requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
   }
 
   getEndpoint() {
diff --git a/src/app/core/data/configuration-data.service.ts b/src/app/core/data/configuration-data.service.ts
index de044e25e3..3dfdd5ef08 100644
--- a/src/app/core/data/configuration-data.service.ts
+++ b/src/app/core/data/configuration-data.service.ts
@@ -17,6 +17,7 @@ import { dataService } from './base/data-service.decorator';
  * Data Service responsible for retrieving Configuration properties
  */
 export class ConfigurationDataService extends IdentifiableDataService<ConfigurationProperty> {
+  protected linkPath = 'properties';
 
   constructor(
     protected requestService: RequestService,
@@ -24,7 +25,7 @@ export class ConfigurationDataService extends IdentifiableDataService<Configurat
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('properties', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/dso-redirect.service.ts b/src/app/core/data/dso-redirect.service.ts
index 81ce678e43..ed37e063c6 100644
--- a/src/app/core/data/dso-redirect.service.ts
+++ b/src/app/core/data/dso-redirect.service.ts
@@ -31,20 +31,18 @@ const UUID_ENDPOINT = 'dso';
  * {@link setLinkPath} must be called before each request.
  */
 class DsoByIdOrUUIDDataService extends IdentifiableDataService<DSpaceObject> {
+  // interpolate id/uuid as query parameter
+  constructIdEndpoint = (endpoint: string, resourceID: string): string =>
+    endpoint.replace(/{\?id}/, `?id=${resourceID}`)
+            .replace(/{\?uuid}/, `?uuid=${resourceID}`);
+
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(
-      undefined, requestService, rdbService, objectCache, halService, undefined,
-      // interpolate id/uuid as query parameter
-      (endpoint: string, resourceID: string): string => {
-        return endpoint.replace(/{\?id}/, `?id=${resourceID}`)
-                       .replace(/{\?uuid}/, `?uuid=${resourceID}`);
-      },
-    );
+    super(requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/dspace-object-data.service.ts b/src/app/core/data/dspace-object-data.service.ts
index 2ad024133c..ff815cb3df 100644
--- a/src/app/core/data/dspace-object-data.service.ts
+++ b/src/app/core/data/dspace-object-data.service.ts
@@ -11,6 +11,13 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(DSPACE_OBJECT)
 export class DSpaceObjectDataService extends IdentifiableDataService<DSpaceObject> {
+  protected linkPath = 'dso';
+
+  // interpolate uuid as query parameter
+  protected constructIdEndpoint = (endpoint: string, resourceID: string): string => {
+    return endpoint.replace(/{\?uuid}/, `?uuid=${resourceID}`);
+  };
+
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
@@ -18,11 +25,7 @@ export class DSpaceObjectDataService extends IdentifiableDataService<DSpaceObjec
     protected halService: HALEndpointService,
   ) {
     super(
-      'dso', requestService, rdbService, objectCache, halService, undefined,
-      // interpolate uuid as query parameter
-      (endpoint: string, resourceID: string): string => {
-        return endpoint.replace(/{\?uuid}/, `?uuid=${resourceID}`);
-      },
+      requestService, rdbService, objectCache, halService,
     );
   }
 }
diff --git a/src/app/core/data/entity-type-data.service.ts b/src/app/core/data/entity-type-data.service.ts
index 4020ff638d..9eb0cf5188 100644
--- a/src/app/core/data/entity-type-data.service.ts
+++ b/src/app/core/data/entity-type-data.service.ts
@@ -22,6 +22,8 @@ import { FindAllData, FindAllDataImpl } from './base/find-all-data';
  */
 @Injectable()
 export class EntityTypeDataService extends BaseDataService<ItemType> implements FindAllData<ItemType>, SearchData<ItemType> {
+  protected linkPath = 'entitytypes';
+
   private findAllData: FindAllData<ItemType>;
   private searchData: SearchDataImpl<ItemType>;
 
@@ -32,10 +34,10 @@ export class EntityTypeDataService extends BaseDataService<ItemType> implements
     protected halService: HALEndpointService,
     protected relationshipTypeService: RelationshipTypeDataService,
   ) {
-    super('entitytypes', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
-    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
   }
 
   getBrowseEndpoint(options, linkPath?: string): Observable<string> {
diff --git a/src/app/core/data/external-source-data.service.ts b/src/app/core/data/external-source-data.service.ts
index c7b71790a3..ec8e65777b 100644
--- a/src/app/core/data/external-source-data.service.ts
+++ b/src/app/core/data/external-source-data.service.ts
@@ -21,6 +21,8 @@ import { SearchData, SearchDataImpl } from './base/search-data';
  */
 @Injectable()
 export class ExternalSourceDataService extends IdentifiableDataService<ExternalSource> implements SearchData<ExternalSource> {
+  protected linkPath = 'externalsources';
+
   private searchData: SearchData<ExternalSource>;
 
   constructor(
@@ -29,9 +31,9 @@ export class ExternalSourceDataService extends IdentifiableDataService<ExternalS
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('externalsources', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/feature-authorization/authorization-data.service.ts b/src/app/core/data/feature-authorization/authorization-data.service.ts
index a9aded4bfe..3f4c42df0c 100644
--- a/src/app/core/data/feature-authorization/authorization-data.service.ts
+++ b/src/app/core/data/feature-authorization/authorization-data.service.ts
@@ -29,6 +29,7 @@ import { dataService } from '../base/data-service.decorator';
 @dataService(AUTHORIZATION)
 export class AuthorizationDataService extends BaseDataService<Authorization> implements SearchData<Authorization> {
   protected linkPath = 'authorizations';
+
   protected searchByObjectPath = 'object';
 
   private searchData: SearchDataImpl<Authorization>;
@@ -40,9 +41,9 @@ export class AuthorizationDataService extends BaseDataService<Authorization> imp
     protected halService: HALEndpointService,
     protected siteService: SiteDataService,
   ) {
-    super('authorizations', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/feature-authorization/feature-data.service.ts b/src/app/core/data/feature-authorization/feature-data.service.ts
index eda8791153..3e84024785 100644
--- a/src/app/core/data/feature-authorization/feature-data.service.ts
+++ b/src/app/core/data/feature-authorization/feature-data.service.ts
@@ -22,6 +22,6 @@ export class FeatureDataService extends BaseDataService<Feature> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('features', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
   }
 }
diff --git a/src/app/core/data/href-only-data.service.ts b/src/app/core/data/href-only-data.service.ts
index 0a765de101..5192c45fa3 100644
--- a/src/app/core/data/href-only-data.service.ts
+++ b/src/app/core/data/href-only-data.service.ts
@@ -52,7 +52,7 @@ export class HrefOnlyDataService implements HALDataService<any> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    this.dataService = new BaseDataService(undefined, requestService, rdbService, objectCache, halService);
+    this.dataService = new BaseDataService(requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index 11179d1e77..016c8c3625 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -39,7 +39,7 @@ import { StatusCodeOnlyResponseParsingService } from './status-code-only-respons
 import { sendRequest } from '../shared/request.operators';
 import { RestRequest } from './rest-request.model';
 import { FindListOptions } from './find-list-options.model';
-import { ConstructIdEndpoint, IdentifiableDataService } from './base/identifiable-data.service';
+import { IdentifiableDataService } from './base/identifiable-data.service';
 import { PatchData, PatchDataImpl } from './base/patch-data';
 import { DeleteData, DeleteDataImpl } from './base/delete-data';
 import { RestRequestMethod } from './rest-request-method';
@@ -58,7 +58,6 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
   private deleteData: DeleteData<Item>;
 
   protected constructor(
-    protected linkPath,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
@@ -67,13 +66,12 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
     protected comparator: DSOChangeAnalyzer<Item>,
     protected browseService: BrowseService,
     protected bundleService: BundleDataService,
-    protected constructIdEndpoint: ConstructIdEndpoint = (endpoint, resourceID) => `${endpoint}/${resourceID}`,
   ) {
-    super(linkPath, requestService, rdbService, objectCache, halService, undefined, constructIdEndpoint);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
-    this.patchData = new PatchDataImpl<Item>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
-    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService);
+    this.patchData = new PatchDataImpl<Item>(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, comparator);
+    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
   }
 
   /**
@@ -388,6 +386,8 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
 @Injectable()
 @dataService(ITEM)
 export class ItemDataService extends BaseItemDataService {
+  protected linkPath = 'items';
+
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
@@ -398,6 +398,6 @@ export class ItemDataService extends BaseItemDataService {
     protected browseService: BrowseService,
     protected bundleService: BundleDataService,
   ) {
-    super('items', requestService, rdbService, objectCache, halService, notificationsService, comparator, browseService, bundleService);
+    super(requestService, rdbService, objectCache, halService, notificationsService, comparator, browseService, bundleService);
   }
 }
diff --git a/src/app/core/data/item-request-data.service.ts b/src/app/core/data/item-request-data.service.ts
index ff6025f7ac..6781badfb0 100644
--- a/src/app/core/data/item-request-data.service.ts
+++ b/src/app/core/data/item-request-data.service.ts
@@ -23,13 +23,15 @@ import { IdentifiableDataService } from './base/identifiable-data.service';
   providedIn: 'root',
 })
 export class ItemRequestDataService extends IdentifiableDataService<ItemRequest> {
+  protected linkPath = 'itemrequests';
+
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('itemrequests', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
   }
 
   getItemRequestEndpoint(): Observable<string> {
diff --git a/src/app/core/data/item-template-data.service.ts b/src/app/core/data/item-template-data.service.ts
index 634c966dba..b8e8ec6301 100644
--- a/src/app/core/data/item-template-data.service.ts
+++ b/src/app/core/data/item-template-data.service.ts
@@ -22,6 +22,8 @@ import { CreateDataImpl } from './base/create-data';
  * Data service for interacting with Item templates via their Collection
  */
 class CollectionItemTemplateDataService extends IdentifiableDataService<Item> {
+  protected linkPath = 'itemtemplates';
+
   private createData: CreateDataImpl<Item>;
 
   constructor(
@@ -32,10 +34,10 @@ class CollectionItemTemplateDataService extends IdentifiableDataService<Item> {
     protected notificationsService: NotificationsService,
     protected collectionService: CollectionDataService,
   ) {
-    super('itemtemplates', requestService, rdbService, objectCache, halService, undefined);
+    super(requestService, rdbService, objectCache, halService);
 
     // We only intend to use createOnEndpoint, so this inner data service feature doesn't need an endpoint at all
-    this.createData = new CreateDataImpl<Item>(undefined, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.createData = new CreateDataImpl<Item>(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService);
   }
 
   /**
@@ -65,6 +67,8 @@ class CollectionItemTemplateDataService extends IdentifiableDataService<Item> {
  */
 @Injectable()
 export class ItemTemplateDataService extends BaseItemDataService {
+  protected linkPath = 'itemtemplates';
+
   private byCollection: CollectionItemTemplateDataService;
 
   constructor(
@@ -78,7 +82,7 @@ export class ItemTemplateDataService extends BaseItemDataService {
     protected bundleService: BundleDataService,
     protected collectionService: CollectionDataService,
   ) {
-    super('itemtemplates', requestService, rdbService, objectCache, halService, notificationsService, comparator, browseService, bundleService);
+    super(requestService, rdbService, objectCache, halService, notificationsService, comparator, browseService, bundleService);
 
     this.byCollection = new CollectionItemTemplateDataService(requestService, rdbService, objectCache, halService, notificationsService, collectionService);
   }
diff --git a/src/app/core/data/metadata-field-data.service.ts b/src/app/core/data/metadata-field-data.service.ts
index db9361ee4c..519b68f40c 100644
--- a/src/app/core/data/metadata-field-data.service.ts
+++ b/src/app/core/data/metadata-field-data.service.ts
@@ -29,6 +29,8 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(METADATA_FIELD)
 export class MetadataFieldDataService extends IdentifiableDataService<MetadataField> implements CreateData<MetadataField>, PutData<MetadataField>, DeleteData<MetadataField>, SearchData<MetadataField> {
+  protected linkPath = 'metadatafields';
+
   private createData: CreateData<MetadataField>;
   private searchData: SearchData<MetadataField>;
   private putData: PutData<MetadataField>;
@@ -44,12 +46,12 @@ export class MetadataFieldDataService extends IdentifiableDataService<MetadataFi
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super('metadatafields', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
-    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
-    this.putData = new PutDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
-    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService, );
+    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.putData = new PutDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
   }
 
   /**
diff --git a/src/app/core/data/metadata-schema-data.service.ts b/src/app/core/data/metadata-schema-data.service.ts
index 6bd633b8c6..ffb9763386 100644
--- a/src/app/core/data/metadata-schema-data.service.ts
+++ b/src/app/core/data/metadata-schema-data.service.ts
@@ -27,6 +27,8 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(METADATA_SCHEMA)
 export class MetadataSchemaDataService extends IdentifiableDataService<MetadataSchema> implements FindAllData<MetadataSchema>, DeleteData<MetadataSchema> {
+  protected linkPath = 'metadataschemas';
+
   private createData: CreateData<MetadataSchema>;
   private findAllData: FindAllData<MetadataSchema>;
   private putData: PutData<MetadataSchema>;
@@ -39,12 +41,12 @@ export class MetadataSchemaDataService extends IdentifiableDataService<MetadataS
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super('metadataschemas', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
-    this.putData = new PutDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
-    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
-    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService);
+    this.putData = new PutDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/processes/process-data.service.ts b/src/app/core/data/processes/process-data.service.ts
index 9c484fed2d..33e7e3c7e8 100644
--- a/src/app/core/data/processes/process-data.service.ts
+++ b/src/app/core/data/processes/process-data.service.ts
@@ -20,6 +20,8 @@ import { dataService } from '../base/data-service.decorator';
 @Injectable()
 @dataService(PROCESS)
 export class ProcessDataService extends IdentifiableDataService<Process> implements FindAllData<Process> {
+  protected linkPath = 'processes';
+
   private findAllData: FindAllData<Process>;
 
   constructor(
@@ -29,9 +31,9 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
     protected halService: HALEndpointService,
     protected bitstreamDataService: BitstreamDataService,
   ) {
-    super('processes', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/processes/script-data.service.ts b/src/app/core/data/processes/script-data.service.ts
index ed228612ef..39666da86b 100644
--- a/src/app/core/data/processes/script-data.service.ts
+++ b/src/app/core/data/processes/script-data.service.ts
@@ -28,6 +28,8 @@ export const METADATA_EXPORT_SCRIPT_NAME = 'metadata-export';
 @Injectable()
 @dataService(SCRIPT)
 export class ScriptDataService extends IdentifiableDataService<Script> implements FindAllData<Script> {
+  protected linkPath = 'scripts';
+
   private findAllData: FindAllDataImpl<Script>;
 
   constructor(
@@ -36,9 +38,9 @@ export class ScriptDataService extends IdentifiableDataService<Script> implement
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('scripts', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
   }
 
   public invoke(scriptName: string, parameters: ProcessParameter[], files: File[]): Observable<RemoteData<Process>> {
diff --git a/src/app/core/data/relationship-data.service.ts b/src/app/core/data/relationship-data.service.ts
index cab6a1ae13..e60ddb068c 100644
--- a/src/app/core/data/relationship-data.service.ts
+++ b/src/app/core/data/relationship-data.service.ts
@@ -75,6 +75,9 @@ const compareItemsByUUID = (itemCheck: Item) =>
 @Injectable()
 @dataService(RELATIONSHIP)
 export class RelationshipDataService extends IdentifiableDataService<Relationship> implements SearchData<Relationship> {
+  protected linkPath = 'relationships';
+  protected responseMsToLive = 15 * 60 * 1000;
+
   private searchData: SearchData<Relationship>;
   private putData: PutData<Relationship>;
 
@@ -87,10 +90,10 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
     protected appStore: Store<AppState>,
     @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);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
-    this.putData = new PutDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.putData = new PutDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/relationship-type-data.service.ts b/src/app/core/data/relationship-type-data.service.ts
index 3020e52d47..66da843bac 100644
--- a/src/app/core/data/relationship-type-data.service.ts
+++ b/src/app/core/data/relationship-type-data.service.ts
@@ -33,6 +33,8 @@ const checkSide = (typeRd: RemoteData<ItemType>, label: string): boolean =>
 @Injectable()
 @dataService(RELATIONSHIP_TYPE)
 export class RelationshipTypeDataService extends BaseDataService<RelationshipType> {
+  protected linkPath = 'relationshiptypes';
+
   private searchData: SearchDataImpl<RelationshipType>;
   private findAllData: FindAllDataImpl<RelationshipType>;
 
@@ -42,10 +44,10 @@ export class RelationshipTypeDataService extends BaseDataService<RelationshipTyp
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('relationshiptypes', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
-    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/root-data.service.ts b/src/app/core/data/root-data.service.ts
index 54fe614d3e..b17e349ae5 100644
--- a/src/app/core/data/root-data.service.ts
+++ b/src/app/core/data/root-data.service.ts
@@ -20,6 +20,9 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(ROOT)
 export class RootDataService extends BaseDataService<Root> {
+  protected linkPath = '';
+  protected responseMsToLive =  6 * 60 * 60 * 1000;
+
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
@@ -27,7 +30,7 @@ export class RootDataService extends BaseDataService<Root> {
     protected halService: HALEndpointService,
     protected restService: DspaceRestService,
   ) {
-    super('', requestService, rdbService, objectCache, halService, 6 * 60 * 60 * 1000);
+    super(requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/site-data.service.ts b/src/app/core/data/site-data.service.ts
index c2c4ffa466..38cb86a9c2 100644
--- a/src/app/core/data/site-data.service.ts
+++ b/src/app/core/data/site-data.service.ts
@@ -22,6 +22,8 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(SITE)
 export class SiteDataService extends BaseDataService<Site> implements FindAllData<Site> {
+  protected linkPath = 'sites';
+
   private findAllData: FindAllData<Site>;
 
   constructor(
@@ -30,9 +32,9 @@ export class SiteDataService extends BaseDataService<Site> implements FindAllDat
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('sites', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/version-data.service.ts b/src/app/core/data/version-data.service.ts
index ee7bdb2028..a1765f8e94 100644
--- a/src/app/core/data/version-data.service.ts
+++ b/src/app/core/data/version-data.service.ts
@@ -24,6 +24,7 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(VERSION)
 export class VersionDataService extends IdentifiableDataService<Version> implements PatchData<Version> {
+  protected linkPath = 'versions';
   private patchData: PatchData<Version>;
 
   constructor(
@@ -33,9 +34,9 @@ export class VersionDataService extends IdentifiableDataService<Version> impleme
     protected halService: HALEndpointService,
     protected comparator: DefaultChangeAnalyzer<Version>,
   ) {
-    super('versions', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.patchData = new PatchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.patchData = new PatchDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, comparator);
   }
 
   /**
diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts
index b331c4f2e4..e475c32edd 100644
--- a/src/app/core/data/version-history-data.service.ts
+++ b/src/app/core/data/version-history-data.service.ts
@@ -32,6 +32,7 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(VERSION_HISTORY)
 export class VersionHistoryDataService extends IdentifiableDataService<VersionHistory> {
+  protected linkPath = 'versionhistories';
   protected versionsEndpoint = 'versions';
 
   constructor(
@@ -41,7 +42,7 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
     protected halService: HALEndpointService,
     protected versionDataService: VersionDataService,
   ) {
-    super('versionhistories', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/workflow-action-data.service.ts b/src/app/core/data/workflow-action-data.service.ts
index b2c4f0bd7b..fbea353d63 100644
--- a/src/app/core/data/workflow-action-data.service.ts
+++ b/src/app/core/data/workflow-action-data.service.ts
@@ -22,6 +22,6 @@ export class WorkflowActionDataService extends BaseDataService<WorkflowAction> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('workflowactions', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
   }
 }
diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts
index 2313d2b20e..e20717ef8a 100644
--- a/src/app/core/eperson/eperson-data.service.ts
+++ b/src/app/core/eperson/eperson-data.service.ts
@@ -41,6 +41,8 @@ const editEPersonSelector = createSelector(ePeopleRegistryStateSelector, (ePeopl
 @Injectable()
 @dataService(EPERSON)
 export class EPersonDataService extends IdentifiableDataService<EPerson> implements CreateData<EPerson>, SearchData<EPerson>, PatchData<EPerson>, DeleteData<EPerson> {
+  protected linkPath = 'epersons';
+
   protected searchByEmailPath = 'byEmail';
   protected searchByMetadataPath = 'byMetadata';
 
@@ -58,12 +60,12 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
     protected notificationsService: NotificationsService,
     protected store: Store<any>,
   ) {
-    super('epersons', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
-    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
-    this.patchData = new PatchDataImpl<EPerson>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
-    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService);
+    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.patchData = new PatchDataImpl<EPerson>(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, comparator);
+    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
   }
 
   /**
diff --git a/src/app/core/eperson/group-data.service.ts b/src/app/core/eperson/group-data.service.ts
index 6e6d1fbb9b..a2ce1f7544 100644
--- a/src/app/core/eperson/group-data.service.ts
+++ b/src/app/core/eperson/group-data.service.ts
@@ -50,6 +50,8 @@ const editGroupSelector = createSelector(groupRegistryStateSelector, (groupRegis
 @Injectable()
 @dataService(GROUP)
 export class GroupDataService extends IdentifiableDataService<Group> {
+  protected linkPath = 'metadatafields';
+
   protected browseEndpoint = '';
   public ePersonsEndpoint = 'epersons';
   public subgroupsEndpoint = 'subgroups';
@@ -69,12 +71,12 @@ export class GroupDataService extends IdentifiableDataService<Group> {
     protected nameService: DSONameService,
     protected store: Store<any>,
   ) {
-    super('groups', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
-    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
-    this.patchData = new PatchDataImpl<Group>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
-    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService);
+    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.patchData = new PatchDataImpl<Group>(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, comparator);
+    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
   }
 
   /**
diff --git a/src/app/core/feedback/feedback-data.service.ts b/src/app/core/feedback/feedback-data.service.ts
index 3cc7df7653..9a3a1a235e 100644
--- a/src/app/core/feedback/feedback-data.service.ts
+++ b/src/app/core/feedback/feedback-data.service.ts
@@ -21,6 +21,8 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(FEEDBACK)
 export class FeedbackDataService extends IdentifiableDataService<Feedback> implements CreateData<Feedback> {
+  protected linkPath = 'feedbacks';
+
   private createData: CreateDataImpl<Feedback>;
 
   constructor(
@@ -31,9 +33,9 @@ export class FeedbackDataService extends IdentifiableDataService<Feedback> imple
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super('feedbacks', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService);
   }
 
   /**
diff --git a/src/app/core/orcid/orcid-history-data.service.ts b/src/app/core/orcid/orcid-history-data.service.ts
index f06a270a44..973fd19891 100644
--- a/src/app/core/orcid/orcid-history-data.service.ts
+++ b/src/app/core/orcid/orcid-history-data.service.ts
@@ -23,6 +23,8 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(ORCID_HISTORY)
 export class OrcidHistoryDataService extends IdentifiableDataService<OrcidHistory> {
+  protected linkPath = 'orcidhistories';
+  protected responseMsToLive = 10 * 1000;
 
   constructor(
     protected requestService: RequestService,
@@ -30,7 +32,7 @@ export class OrcidHistoryDataService extends IdentifiableDataService<OrcidHistor
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('orcidhistories', requestService, rdbService, objectCache, halService, 10 * 1000);
+    super(requestService, rdbService, objectCache, halService);
   }
 
   sendToORCID(orcidQueue: OrcidQueue): Observable<RemoteData<OrcidHistory>> {
diff --git a/src/app/core/orcid/orcid-queue-data.service.ts b/src/app/core/orcid/orcid-queue-data.service.ts
index 77149c4bf8..41806ba0f5 100644
--- a/src/app/core/orcid/orcid-queue-data.service.ts
+++ b/src/app/core/orcid/orcid-queue-data.service.ts
@@ -23,6 +23,9 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(ORCID_QUEUE)
 export class OrcidQueueDataService extends IdentifiableDataService<OrcidQueue> {
+  protected linkPath = 'orcidqueues';
+  protected responseMsToLive = 10 * 1000;
+
   private searchData: SearchData<OrcidQueue>;
   private deleteData: DeleteData<OrcidQueue>;
 
@@ -33,10 +36,10 @@ export class OrcidQueueDataService extends IdentifiableDataService<OrcidQueue> {
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super('orcidqueues', requestService, rdbService, objectCache, halService, 10 * 1000);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
-    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
   }
 
   /**
diff --git a/src/app/core/profile/researcher-profile-data.service.ts b/src/app/core/profile/researcher-profile-data.service.ts
index 8c62879c37..a1a9a39fbd 100644
--- a/src/app/core/profile/researcher-profile-data.service.ts
+++ b/src/app/core/profile/researcher-profile-data.service.ts
@@ -40,6 +40,9 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(RESEARCHER_PROFILE)
 export class ResearcherProfileDataService extends IdentifiableDataService<ResearcherProfile> implements CreateData<ResearcherProfile>, SearchData<ResearcherProfile>, PatchData<ResearcherProfile>, DeleteData<ResearcherProfile> {
+  protected linkPath = 'profiles';
+  protected responseMsToLive = 10 * 1000;
+
   private createData: CreateDataImpl<ResearcherProfile>;
   private searchData: SearchDataImpl<ResearcherProfile>;
   private patchData: PatchDataImpl<ResearcherProfile>;
@@ -55,12 +58,12 @@ export class ResearcherProfileDataService extends IdentifiableDataService<Resear
     protected comparator: DefaultChangeAnalyzer<ResearcherProfile>,
     protected itemService: ItemDataService,
   ) {
-    super('profiles', requestService, rdbService, objectCache, halService, 10 * 1000);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
-    this.patchData = new PatchDataImpl<ResearcherProfile>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
-    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
-    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService);
+    this.patchData = new PatchDataImpl<ResearcherProfile>(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, comparator);
+    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
   }
 
   /**
diff --git a/src/app/core/resource-policy/resource-policy-data.service.ts b/src/app/core/resource-policy/resource-policy-data.service.ts
index 5190ff30ed..9dfa19c709 100644
--- a/src/app/core/resource-policy/resource-policy-data.service.ts
+++ b/src/app/core/resource-policy/resource-policy-data.service.ts
@@ -40,6 +40,8 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(RESOURCE_POLICY)
 export class ResourcePolicyDataService extends IdentifiableDataService<ResourcePolicy> {
+  protected linkPath = 'resourcepolicies';
+
   protected searchByEPersonMethod = 'eperson';
   protected searchByGroupMethod = 'group';
   protected searchByResourceMethod = 'resource';
@@ -59,12 +61,12 @@ export class ResourcePolicyDataService extends IdentifiableDataService<ResourceP
     protected ePersonService: EPersonDataService,
     protected groupService: GroupDataService,
   ) {
-    super('resourcepolicies', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
-    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
-    this.patchData = new PatchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
-    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService);
+    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.patchData = new PatchDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, comparator);
+    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
   }
 
   /**
diff --git a/src/app/core/shared/search/search.service.ts b/src/app/core/shared/search/search.service.ts
index 7911db026d..1405e8b0ca 100644
--- a/src/app/core/shared/search/search.service.ts
+++ b/src/app/core/shared/search/search.service.ts
@@ -42,8 +42,10 @@ import { BaseDataService } from '../../data/base/base-data.service';
  * Therefore, equest/response handling methods won't work even though they're defined
  */
 class SearchDataService extends BaseDataService<any> {
+  protected linkPath = 'discover';
+
   constructor() {
-    super('discover', undefined, undefined, undefined, undefined);
+    super(undefined, undefined, undefined, undefined);
   }
 
   /**
diff --git a/src/app/core/statistics/usage-report-data.service.ts b/src/app/core/statistics/usage-report-data.service.ts
index fde8298488..afb183ffaa 100644
--- a/src/app/core/statistics/usage-report-data.service.ts
+++ b/src/app/core/statistics/usage-report-data.service.ts
@@ -22,6 +22,8 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(USAGE_REPORT)
 export class UsageReportDataService extends IdentifiableDataService<UsageReport> implements SearchData<UsageReport> {
+  protected linkPath = 'usagereports';
+
   private searchData: SearchDataImpl<UsageReport>;
 
   constructor(
@@ -30,9 +32,9 @@ export class UsageReportDataService extends IdentifiableDataService<UsageReport>
     protected halService: HALEndpointService,
     protected objectCache: ObjectCacheService,
   ) {
-    super('usagereports', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
   }
 
   getStatistic(scope: string, type: string): Observable<UsageReport> {
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..df3b19b502 100644
--- a/src/app/core/submission/submission-cc-license-data.service.ts
+++ b/src/app/core/submission/submission-cc-license-data.service.ts
@@ -17,7 +17,6 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(SUBMISSION_CC_LICENSE)
 export class SubmissionCcLicenseDataService extends BaseDataService<SubmissionCcLicence> implements FindAllData<SubmissionCcLicence> {
-
   protected linkPath = 'submissioncclicenses';
 
   constructor(
@@ -26,7 +25,7 @@ export class SubmissionCcLicenseDataService extends BaseDataService<SubmissionCc
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('submissioncclicenses', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/submission/submission-cc-license-url-data.service.ts b/src/app/core/submission/submission-cc-license-url-data.service.ts
index 3934ea7cb2..276112cbbd 100644
--- a/src/app/core/submission/submission-cc-license-url-data.service.ts
+++ b/src/app/core/submission/submission-cc-license-url-data.service.ts
@@ -20,6 +20,8 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(SUBMISSION_CC_LICENSE_URL)
 export class SubmissionCcLicenseUrlDataService extends BaseDataService<SubmissionCcLicenceUrl> implements SearchData<SubmissionCcLicenceUrl> {
+  protected linkPath = 'submissioncclicenseUrls-search';
+
   private searchData: SearchData<SubmissionCcLicenceUrl>;
 
   constructor(
@@ -28,9 +30,9 @@ export class SubmissionCcLicenseUrlDataService extends BaseDataService<Submissio
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('submissioncclicenseUrls-search', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive, (href, searchMethod) => `${href}/${searchMethod}`);
+    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, (href, searchMethod) => `${href}/${searchMethod}`);
   }
 
   /**
diff --git a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
index ab7646042e..412e9819e4 100644
--- a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
@@ -28,6 +28,8 @@ import { dataService } from '../../data/base/data-service.decorator';
 @Injectable()
 @dataService(VOCABULARY_ENTRY_DETAIL)
 export class VocabularyEntryDetailsDataService extends IdentifiableDataService<VocabularyEntryDetail> implements FindAllData<VocabularyEntryDetail>, SearchData<VocabularyEntryDetail> {
+  protected linkPath = 'vocabularyEntryDetails';
+
   private findAllData: FindAllData<VocabularyEntryDetail>;
   private searchData: SearchData<VocabularyEntryDetail>;
 
@@ -37,10 +39,10 @@ export class VocabularyEntryDetailsDataService extends IdentifiableDataService<V
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('vocabularyEntryDetails', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
-    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/submission/vocabularies/vocabulary.data.service.ts b/src/app/core/submission/vocabularies/vocabulary.data.service.ts
index ef642a6793..b2d6ce704b 100644
--- a/src/app/core/submission/vocabularies/vocabulary.data.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.data.service.ts
@@ -27,6 +27,8 @@ import { dataService } from '../../data/base/data-service.decorator';
 @Injectable()
 @dataService(VOCABULARY)
 export class VocabularyDataService extends IdentifiableDataService<Vocabulary> implements FindAllData<Vocabulary> {
+  protected linkPath = 'vocabularies';
+
   private findAllData: FindAllData<Vocabulary>;
 
   constructor(
@@ -35,9 +37,9 @@ export class VocabularyDataService extends IdentifiableDataService<Vocabulary> i
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('vocabularies', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/submission/workflowitem-data.service.ts b/src/app/core/submission/workflowitem-data.service.ts
index c8cf9dd02f..de2ff884d8 100644
--- a/src/app/core/submission/workflowitem-data.service.ts
+++ b/src/app/core/submission/workflowitem-data.service.ts
@@ -29,9 +29,10 @@ import { dataService } from '../data/base/data-service.decorator';
 @dataService(WorkflowItem.type)
 export class WorkflowItemDataService extends IdentifiableDataService<WorkflowItem> implements SearchData<WorkflowItem>, DeleteData<WorkflowItem> {
   protected linkPath = 'workflowitems';
-  protected searchByItemLinkPath = 'item';
   protected responseMsToLive = 10 * 1000;
 
+  protected searchByItemLinkPath = 'item';
+
   private searchData: SearchDataImpl<WorkflowItem>;
   private deleteData: DeleteDataImpl<WorkflowItem>;
 
@@ -42,10 +43,10 @@ export class WorkflowItemDataService extends IdentifiableDataService<WorkflowIte
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super('workspaceitems', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
-    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
   }
 
   /**
diff --git a/src/app/core/submission/workspaceitem-data.service.ts b/src/app/core/submission/workspaceitem-data.service.ts
index f285fb6eca..a13fbfcd89 100644
--- a/src/app/core/submission/workspaceitem-data.service.ts
+++ b/src/app/core/submission/workspaceitem-data.service.ts
@@ -23,6 +23,8 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(WorkspaceItem.type)
 export class WorkspaceitemDataService extends IdentifiableDataService<WorkspaceItem> implements SearchData<WorkspaceItem>, DeleteData<WorkspaceItem> {
+  protected linkPath = 'workspaceitems';
+
   protected searchByItemLinkPath = 'item';
 
   private searchData: SearchDataImpl<WorkspaceItem>;
@@ -35,10 +37,10 @@ export class WorkspaceitemDataService extends IdentifiableDataService<WorkspaceI
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super('workspaceitems', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
-    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
   }
 
   /**
diff --git a/src/app/core/tasks/claimed-task-data.service.ts b/src/app/core/tasks/claimed-task-data.service.ts
index 4e5c43c146..5b8ac0c7fc 100644
--- a/src/app/core/tasks/claimed-task-data.service.ts
+++ b/src/app/core/tasks/claimed-task-data.service.ts
@@ -22,6 +22,8 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(CLAIMED_TASK)
 export class ClaimedTaskDataService extends TasksService<ClaimedTask> {
+  protected linkPath = 'claimedtasks';
+  protected responseMsToLive = 1000;
 
   /**
    * Initialize instance variables
@@ -37,7 +39,7 @@ export class ClaimedTaskDataService extends TasksService<ClaimedTask> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('claimedtasks', requestService, rdbService, objectCache, halService, 1000);
+    super(requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/tasks/pool-task-data.service.ts b/src/app/core/tasks/pool-task-data.service.ts
index ec44184934..3464b570e9 100644
--- a/src/app/core/tasks/pool-task-data.service.ts
+++ b/src/app/core/tasks/pool-task-data.service.ts
@@ -20,6 +20,9 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(POOL_TASK)
 export class PoolTaskDataService extends TasksService<PoolTask> {
+  protected linkPath = 'pooltasks';
+  protected responseMsToLive = 1000;
+
   /**
    * Initialize instance variables
    *
@@ -34,7 +37,7 @@ export class PoolTaskDataService extends TasksService<PoolTask> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('pooltasks', requestService, rdbService, objectCache, halService, 1000);
+    super(requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/tasks/tasks.service.spec.ts b/src/app/core/tasks/tasks.service.spec.ts
index 5d9d57a11e..9357fd4ef2 100644
--- a/src/app/core/tasks/tasks.service.spec.ts
+++ b/src/app/core/tasks/tasks.service.spec.ts
@@ -35,7 +35,7 @@ class TestService extends TasksService<TestTask> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super('testtasks', requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
   }
 }
 
diff --git a/src/app/core/tasks/tasks.service.ts b/src/app/core/tasks/tasks.service.ts
index c2112d8e80..4a711f9c8b 100644
--- a/src/app/core/tasks/tasks.service.ts
+++ b/src/app/core/tasks/tasks.service.ts
@@ -26,16 +26,14 @@ export abstract class TasksService<T extends CacheableObject> extends Identifiab
   private searchData: SearchData<T>;
 
   protected constructor(
-    protected linkPath: string,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected responseMsToLive?: number,
   ) {
-    super(linkPath, requestService, rdbService, objectCache, halService);
+    super(requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl<T>(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl<T>(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, );
   }
 
   /**

From ba2f173199ea750706479ffd3fcc0abe23358b62 Mon Sep 17 00:00:00 2001
From: "Mark H. Wood" <mwood@IUPUI.Edu>
Date: Tue, 6 Sep 2022 13:56:04 -0400
Subject: [PATCH 35/48] Address review:  add missing templates, commented
 references to them, reference original templates by default.

---
 .../create-collection-parent-selector.component.html} |  0
 .../create-collection-parent-selector.component.scss  |  0
 .../create-collection-parent-selector.component.ts    |  6 ++++--
 .../create-community-parent-selector.component.ts     |  8 +++++---
 .../create-item-parent-selector.component.scss        |  0
 .../create-item-parent-selector.component.ts          |  6 ++++--
 .../edit-collection-selector.component.html           | 11 +++++++++++
 .../edit-collection-selector.component.scss           |  0
 .../edit-collection-selector.component.ts             |  6 ++++--
 .../edit-community-selector.component.html            | 11 +++++++++++
 .../edit-community-selector.component.scss            |  0
 .../edit-community-selector.component.ts              |  6 ++++--
 .../edit-item-selector.component.html                 | 11 +++++++++++
 .../edit-item-selector.component.scss                 |  0
 .../edit-item-selector.component.ts                   |  4 +++-
 15 files changed, 57 insertions(+), 12 deletions(-)
 rename src/themes/custom/app/shared/dso-selector/modal-wrappers/{dso-selector-modal-wrapper.component.html => create-collection-parent-selector/create-collection-parent-selector.component.html} (100%)
 create mode 100644 src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.scss
 create mode 100644 src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.scss
 create mode 100644 src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html
 create mode 100644 src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.scss
 create mode 100644 src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html
 create mode 100644 src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.scss
 create mode 100644 src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
 create mode 100644 src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.scss

diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html
similarity index 100%
rename from src/themes/custom/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
rename to src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.scss b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
index 6df8807cae..22d40ff539 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
@@ -1,11 +1,13 @@
 import { Component } from '@angular/core';
 import {
     CreateCollectionParentSelectorComponent as BaseComponent
-} from 'src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
+} from '../../../../../../../app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
 
 @Component({
   selector: 'ds-create-collection-parent-selector',
-  templateUrl: '../dso-selector-modal-wrapper.component.html',
+  // styleUrls: ['./create-collection-parent-selector.component.scss'],
+  // templateUrl: './create-collection-parent-selector.component.html',
+  templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html',
 })
 export class CreateCollectionParentSelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index bb2785eab9..8b28ee1bb8 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -1,12 +1,14 @@
 import { Component } from '@angular/core';
 import {
     CreateCommunityParentSelectorComponent as BaseComponent
-} from 'src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
+} from '../../../../../../../app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
 
 @Component({
   selector: 'ds-create-community-parent-selector',
-  styleUrls: ['./create-community-parent-selector.component.scss'],
-  templateUrl: './create-community-parent-selector.component.html',
+  // styleUrls: ['./create-community-parent-selector.component.scss'],
+  styleUrls: ['../../../../../../../app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.scss'],
+  // templateUrl: './create-community-parent-selector.component.html',
+  templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html',
 })
 export class CreateCommunityParentSelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.scss b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
index 44eb6edd18..f8e3401454 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
@@ -1,11 +1,13 @@
 import {Component} from '@angular/core';
 import {
     CreateItemParentSelectorComponent as BaseComponent
-} from 'src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
+} from '../../../../../../../app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
 
 @Component({
     selector: 'ds-create-item-parent-selector',
-    templateUrl: './create-item-parent-selector.component.html',
+    // styleUrls: ['./create-item-parent-selector.component.scss'],
+    // templateUrl: './create-item-parent-selector.component.html',
+    templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html',
 })
 export class CreateItemParentSelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html
new file mode 100644
index 0000000000..85d8797e66
--- /dev/null
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html
@@ -0,0 +1,11 @@
+<div>
+  <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
+    <button type="button" class="close" (click)="close()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+  </div>
+</div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.scss b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
index 3b463f2851..8f4a8dd5cd 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
@@ -1,11 +1,13 @@
 import { Component } from '@angular/core';
 import {
     EditCollectionSelectorComponent as BaseComponent
-} from 'src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
+} from '../../../../../../../app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
 
 @Component({
   selector: 'ds-edit-collection-selector',
-  templateUrl: '../dso-selector-modal-wrapper.component.html',
+  // styleUrls: ['./edit-collection-selector.component.scss'],
+  // templateUrl: './edit-collection-selector.component.html',
+  templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html',
 })
 export class EditCollectionSelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html
new file mode 100644
index 0000000000..85d8797e66
--- /dev/null
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html
@@ -0,0 +1,11 @@
+<div>
+  <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
+    <button type="button" class="close" (click)="close()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+  </div>
+</div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.scss b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
index cd9ea222f4..79d52fc350 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
@@ -1,11 +1,13 @@
 import { Component } from '@angular/core';
 import {
     EditCommunitySelectorComponent as BaseComponent
-} from 'src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
+} from '../../../../../../../app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
 
 @Component({
   selector: 'ds-edit-item-selector',
-  templateUrl: '../dso-selector-modal-wrapper.component.html',
+  // styleUrls: ['./edit-community-selector.component.scss'],
+  // templateUrl: './edit-community-selector.component.html',
+  templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html',
 })
 export class EditCommunitySelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
new file mode 100644
index 0000000000..85d8797e66
--- /dev/null
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
@@ -0,0 +1,11 @@
+<div>
+  <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
+    <button type="button" class="close" (click)="close()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+  </div>
+</div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.scss b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
index efff58d2a3..398dbc933c 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
@@ -5,7 +5,9 @@ import {
 
 @Component({
   selector: 'ds-edit-item-selector',
-  templateUrl: '../dso-selector-modal-wrapper.component.html',
+  // styleUrls: ['./edit-item-selector.component.scss'],
+  // templateUrl: './edit-item-selector.component.html',
+  templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html',
 })
 export class EditItemSelectorComponent extends BaseComponent {
 }

From 28fff891d2050265c701addd81abfb88b291f8f1 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Wed, 7 Sep 2022 15:34:16 +0200
Subject: [PATCH 36/48] 94322: Fix theme matching using handles

---
 src/app/core/shared/collection.model.ts       |  3 ++-
 src/app/core/shared/community.model.ts        |  3 ++-
 src/app/core/shared/handle-object.model.ts    |  8 ++++++
 src/app/core/shared/item.model.ts             |  3 ++-
 src/app/shared/theme-support/theme.service.ts |  5 ++--
 src/config/theme.model.spec.ts                | 25 ++++++++++++++++---
 src/config/theme.model.ts                     | 21 ++++++++++++----
 7 files changed, 54 insertions(+), 14 deletions(-)
 create mode 100644 src/app/core/shared/handle-object.model.ts

diff --git a/src/app/core/shared/collection.model.ts b/src/app/core/shared/collection.model.ts
index 30259b7dbe..d1c49c8d4b 100644
--- a/src/app/core/shared/collection.model.ts
+++ b/src/app/core/shared/collection.model.ts
@@ -15,10 +15,11 @@ import { RESOURCE_POLICY } from '../resource-policy/models/resource-policy.resou
 import { COMMUNITY } from './community.resource-type';
 import { Community } from './community.model';
 import { ChildHALResource } from './child-hal-resource.model';
+import { HandleObject } from './handle-object.model';
 
 @typedObject
 @inheritSerialization(DSpaceObject)
-export class Collection extends DSpaceObject implements ChildHALResource {
+export class Collection extends DSpaceObject implements ChildHALResource, HandleObject {
   static type = COLLECTION;
 
   /**
diff --git a/src/app/core/shared/community.model.ts b/src/app/core/shared/community.model.ts
index afe2c6dfef..f16aad9645 100644
--- a/src/app/core/shared/community.model.ts
+++ b/src/app/core/shared/community.model.ts
@@ -11,10 +11,11 @@ import { COMMUNITY } from './community.resource-type';
 import { DSpaceObject } from './dspace-object.model';
 import { HALLink } from './hal-link.model';
 import { ChildHALResource } from './child-hal-resource.model';
+import { HandleObject } from './handle-object.model';
 
 @typedObject
 @inheritSerialization(DSpaceObject)
-export class Community extends DSpaceObject implements ChildHALResource {
+export class Community extends DSpaceObject implements ChildHALResource, HandleObject {
   static type = COMMUNITY;
 
   /**
diff --git a/src/app/core/shared/handle-object.model.ts b/src/app/core/shared/handle-object.model.ts
new file mode 100644
index 0000000000..04a1f5e663
--- /dev/null
+++ b/src/app/core/shared/handle-object.model.ts
@@ -0,0 +1,8 @@
+/**
+ * Interface representing an object in DSpace that contains a handle
+ */
+export interface HandleObject {
+
+  handle: string;
+
+}
diff --git a/src/app/core/shared/item.model.ts b/src/app/core/shared/item.model.ts
index 49ca7750b4..28f0d7fd36 100644
--- a/src/app/core/shared/item.model.ts
+++ b/src/app/core/shared/item.model.ts
@@ -23,13 +23,14 @@ import { BITSTREAM } from './bitstream.resource-type';
 import { Bitstream } from './bitstream.model';
 import { ACCESS_STATUS } from 'src/app/shared/object-list/access-status-badge/access-status.resource-type';
 import { AccessStatusObject } from 'src/app/shared/object-list/access-status-badge/access-status.model';
+import { HandleObject } from './handle-object.model';
 
 /**
  * Class representing a DSpace Item
  */
 @typedObject
 @inheritSerialization(DSpaceObject)
-export class Item extends DSpaceObject implements ChildHALResource {
+export class Item extends DSpaceObject implements ChildHALResource, HandleObject {
   static type = ITEM;
 
   /**
diff --git a/src/app/shared/theme-support/theme.service.ts b/src/app/shared/theme-support/theme.service.ts
index 4a4f6ae986..99e1702dff 100644
--- a/src/app/shared/theme-support/theme.service.ts
+++ b/src/app/shared/theme-support/theme.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, Inject } from '@angular/core';
+import { Injectable, Inject, Injector } from '@angular/core';
 import { Store, createFeatureSelector, createSelector, select } from '@ngrx/store';
 import { EMPTY, Observable, of as observableOf } from 'rxjs';
 import { ThemeState } from './theme.reducer';
@@ -46,10 +46,11 @@ export class ThemeService {
     private store: Store<ThemeState>,
     private linkService: LinkService,
     private dSpaceObjectDataService: DSpaceObjectDataService,
+    protected injector: Injector,
     @Inject(GET_THEME_CONFIG_FOR_FACTORY) private gtcf: (str) => ThemeConfig
   ) {
     // Create objects from the theme configs in the environment file
-    this.themes = environment.themes.map((themeConfig: ThemeConfig) => themeFactory(themeConfig));
+    this.themes = environment.themes.map((themeConfig: ThemeConfig) => themeFactory(themeConfig, injector));
     this.hasDynamicTheme = environment.themes.some((themeConfig: any) =>
       hasValue(themeConfig.regex) ||
       hasValue(themeConfig.handle) ||
diff --git a/src/config/theme.model.spec.ts b/src/config/theme.model.spec.ts
index 16c76539d6..79b5a1f32b 100644
--- a/src/config/theme.model.spec.ts
+++ b/src/config/theme.model.spec.ts
@@ -8,6 +8,7 @@ import { Collection } from '../app/core/shared/collection.model';
 import { Item } from '../app/core/shared/item.model';
 import { ITEM } from '../app/core/shared/item.resource-type';
 import { getItemModuleRoute } from '../app/item-page/item-page-routing-paths';
+import { HandleService } from '../app/shared/handle.service';
 
 describe('Theme Models', () => {
   let theme: Theme;
@@ -67,24 +68,40 @@ describe('Theme Models', () => {
   });
 
   describe('HandleTheme', () => {
+    let handleService;
+    beforeEach(() => {
+      handleService = new HandleService();
+      });
     it('should return true when the DSO\'s handle matches the theme\'s handle', () => {
       theme = new HandleTheme({
         name: 'matching-handle',
         handle: '1234/5678',
-      });
-      const dso = Object.assign(new Item(), {
+      }, handleService);
+      const matchingDso = Object.assign(new Item(), {
         type: ITEM.value,
         uuid: 'item-uuid',
         handle: '1234/5678',
+      }, handleService);
+      expect(theme.matches('', matchingDso)).toEqual(true);
+    });
+    it('should return false when the DSO\'s handle contains the theme\'s handle as a subpart', () => {
+      theme = new HandleTheme({
+        name: 'matching-handle',
+        handle: '1234/5678',
+      }, handleService);
+      const dso = Object.assign(new Item(), {
+        type: ITEM.value,
+        uuid: 'item-uuid',
+        handle: '1234/567891011',
       });
-      expect(theme.matches('', dso)).toEqual(true);
+      expect(theme.matches('', dso)).toEqual(false);
     });
 
     it('should return false when the handles don\'t match', () => {
       theme = new HandleTheme({
         name: 'no-matching-handle',
         handle: '1234/5678',
-      });
+      }, handleService);
       const dso = Object.assign(new Item(), {
         type: ITEM.value,
         uuid: 'item-uuid',
diff --git a/src/config/theme.model.ts b/src/config/theme.model.ts
index b7654b1fd7..019540f18a 100644
--- a/src/config/theme.model.ts
+++ b/src/config/theme.model.ts
@@ -3,6 +3,9 @@ import { Config } from './config.interface';
 import { hasValue, hasNoValue, isNotEmpty } from '../app/shared/empty.util';
 import { DSpaceObject } from '../app/core/shared/dspace-object.model';
 import { getDSORoute } from '../app/app-routing-paths';
+import { HandleObject } from '../app/core/shared/handle-object.model';
+import { Injector } from '@angular/core';
+import { HandleService } from '../app/shared/handle.service';
 
 export interface NamedThemeConfig extends Config {
   name: string;
@@ -82,12 +85,20 @@ export class RegExTheme extends Theme {
 }
 
 export class HandleTheme extends Theme {
-  constructor(public config: HandleThemeConfig) {
+
+  private normalizedHandle;
+
+  constructor(public config: HandleThemeConfig,
+              protected handleService: HandleService
+              ) {
     super(config);
+    this.normalizedHandle = this.handleService.normalizeHandle(this.config.handle);
+
   }
 
-  matches(url: string, dso: any): boolean {
-    return hasValue(dso) && hasValue(dso.handle) && dso.handle.includes(this.config.handle);
+  matches<T extends DSpaceObject & HandleObject>(url: string, dso: T): boolean {
+    return hasValue(dso) && hasValue(dso.handle)
+      && this.handleService.normalizeHandle(dso.handle) === this.normalizedHandle;
   }
 }
 
@@ -101,11 +112,11 @@ export class UUIDTheme extends Theme {
   }
 }
 
-export const themeFactory = (config: ThemeConfig): Theme => {
+export const themeFactory = (config: ThemeConfig, injector: Injector): Theme => {
   if (hasValue((config as RegExThemeConfig).regex)) {
     return new RegExTheme(config as RegExThemeConfig);
   } else if (hasValue((config as HandleThemeConfig).handle)) {
-    return new HandleTheme(config as HandleThemeConfig);
+    return new HandleTheme(config as HandleThemeConfig, injector.get(HandleService));
   } else if (hasValue((config as UUIDThemeConfig).uuid)) {
     return new UUIDTheme(config as UUIDThemeConfig);
   } else {

From abc9bbeae3ca816d0d9329d2ce726e8b27e6dcfd Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Mon, 12 Sep 2022 12:29:04 +0200
Subject: [PATCH 37/48] Revert "93803: Update DataService constructor
 signatures"

This reverts commit a6fb4a6303ab47ac1f54218cdad1d05168d40af4.
---
 .../browse/browse-definition-data.service.ts  |  6 +--
 .../core/config/config-data.service.spec.ts   |  2 +-
 ...submission-accesses-config-data.service.ts |  4 +-
 .../submission-forms-config-data.service.ts   |  4 +-
 .../submission-uploads-config-data.service.ts |  4 +-
 .../core/data/access-status-data.service.ts   |  3 +-
 .../core/data/base/base-data.service.spec.ts  |  2 +-
 src/app/core/data/base/base-data.service.ts   | 45 +++----------------
 src/app/core/data/base/create-data.spec.ts    |  2 +-
 src/app/core/data/base/create-data.ts         |  4 +-
 src/app/core/data/base/delete-data.spec.ts    |  2 +-
 src/app/core/data/base/delete-data.ts         |  6 +--
 src/app/core/data/base/find-all-data.spec.ts  |  2 +-
 src/app/core/data/base/find-all-data.ts       |  4 +-
 .../base/identifiable-data.service.spec.ts    |  2 +-
 .../data/base/identifiable-data.service.ts    | 15 +++----
 src/app/core/data/base/patch-data.spec.ts     |  2 +-
 src/app/core/data/base/patch-data.ts          |  6 +--
 src/app/core/data/base/put-data.spec.ts       |  2 +-
 src/app/core/data/base/put-data.ts            |  4 +-
 src/app/core/data/base/search-data.spec.ts    |  2 +-
 src/app/core/data/base/search-data.ts         |  4 +-
 src/app/core/data/bitstream-data.service.ts   | 10 ++---
 .../data/bitstream-format-data.service.ts     |  7 +--
 src/app/core/data/bundle-data.service.ts      |  6 +--
 src/app/core/data/collection-data.service.ts  |  4 +-
 src/app/core/data/comcol-data.service.spec.ts |  7 +--
 src/app/core/data/comcol-data.service.ts      | 13 +++---
 src/app/core/data/community-data.service.ts   |  4 +-
 .../core/data/configuration-data.service.ts   |  3 +-
 src/app/core/data/dso-redirect.service.ts     | 14 +++---
 .../core/data/dspace-object-data.service.ts   | 13 +++---
 src/app/core/data/entity-type-data.service.ts |  8 ++--
 .../core/data/external-source-data.service.ts |  6 +--
 .../authorization-data.service.ts             |  5 +--
 .../feature-data.service.ts                   |  2 +-
 src/app/core/data/href-only-data.service.ts   |  2 +-
 src/app/core/data/item-data.service.ts        | 16 +++----
 .../core/data/item-request-data.service.ts    |  4 +-
 .../core/data/item-template-data.service.ts   | 10 ++---
 .../core/data/metadata-field-data.service.ts  | 12 +++--
 .../core/data/metadata-schema-data.service.ts | 12 +++--
 .../data/processes/process-data.service.ts    |  6 +--
 .../data/processes/script-data.service.ts     |  6 +--
 .../core/data/relationship-data.service.ts    |  9 ++--
 .../data/relationship-type-data.service.ts    |  8 ++--
 src/app/core/data/root-data.service.ts        |  5 +--
 src/app/core/data/site-data.service.ts        |  6 +--
 src/app/core/data/version-data.service.ts     |  5 +--
 .../core/data/version-history-data.service.ts |  3 +-
 .../core/data/workflow-action-data.service.ts |  2 +-
 src/app/core/eperson/eperson-data.service.ts  | 12 +++--
 src/app/core/eperson/group-data.service.ts    | 12 +++--
 .../core/feedback/feedback-data.service.ts    |  6 +--
 .../core/orcid/orcid-history-data.service.ts  |  4 +-
 .../core/orcid/orcid-queue-data.service.ts    |  9 ++--
 .../researcher-profile-data.service.ts        | 13 +++---
 .../resource-policy-data.service.ts           | 12 +++--
 src/app/core/shared/search/search.service.ts  |  4 +-
 .../statistics/usage-report-data.service.ts   |  6 +--
 .../submission-cc-license-data.service.ts     |  3 +-
 .../submission-cc-license-url-data.service.ts |  6 +--
 .../vocabulary-entry-details.data.service.ts  |  8 ++--
 .../vocabularies/vocabulary.data.service.ts   |  6 +--
 .../submission/workflowitem-data.service.ts   |  9 ++--
 .../submission/workspaceitem-data.service.ts  |  8 ++--
 .../core/tasks/claimed-task-data.service.ts   |  4 +-
 src/app/core/tasks/pool-task-data.service.ts  |  5 +--
 src/app/core/tasks/tasks.service.spec.ts      |  2 +-
 src/app/core/tasks/tasks.service.ts           |  6 ++-
 70 files changed, 180 insertions(+), 290 deletions(-)

diff --git a/src/app/core/browse/browse-definition-data.service.ts b/src/app/core/browse/browse-definition-data.service.ts
index 0bb60b1104..32c3b44e14 100644
--- a/src/app/core/browse/browse-definition-data.service.ts
+++ b/src/app/core/browse/browse-definition-data.service.ts
@@ -22,8 +22,6 @@ import { dataService } from '../data/base/data-service.decorator';
 })
 @dataService(BROWSE_DEFINITION)
 export class BrowseDefinitionDataService extends IdentifiableDataService<BrowseDefinition> implements FindAllData<BrowseDefinition> {
-  protected linkPath = 'browses';
-
   private findAllData: FindAllDataImpl<BrowseDefinition>;
 
   constructor(
@@ -32,9 +30,9 @@ export class BrowseDefinitionDataService extends IdentifiableDataService<BrowseD
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('browses', requestService, rdbService, objectCache, halService);
 
-    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
diff --git a/src/app/core/config/config-data.service.spec.ts b/src/app/core/config/config-data.service.spec.ts
index ca747d2255..38340d1ad5 100644
--- a/src/app/core/config/config-data.service.spec.ts
+++ b/src/app/core/config/config-data.service.spec.ts
@@ -24,7 +24,7 @@ class TestService extends ConfigDataService {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super(BROWSE, requestService, rdbService, objectCache, halService);
   }
 }
 
diff --git a/src/app/core/config/submission-accesses-config-data.service.ts b/src/app/core/config/submission-accesses-config-data.service.ts
index be236182d9..d2da0fce42 100644
--- a/src/app/core/config/submission-accesses-config-data.service.ts
+++ b/src/app/core/config/submission-accesses-config-data.service.ts
@@ -18,15 +18,13 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(SUBMISSION_ACCESSES_TYPE)
 export class SubmissionAccessesConfigDataService extends ConfigDataService {
-  protected linkPath = 'submissionaccessoptions';
-
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('submissionaccessoptions', requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/config/submission-forms-config-data.service.ts b/src/app/core/config/submission-forms-config-data.service.ts
index 6243a13c0a..f4c0690685 100644
--- a/src/app/core/config/submission-forms-config-data.service.ts
+++ b/src/app/core/config/submission-forms-config-data.service.ts
@@ -18,15 +18,13 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(SUBMISSION_FORMS_TYPE)
 export class SubmissionFormsConfigDataService extends ConfigDataService {
-  protected linkPath = 'submissionforms';
-
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('submissionforms', requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/config/submission-uploads-config-data.service.ts b/src/app/core/config/submission-uploads-config-data.service.ts
index 23ad1741e4..8f838352a9 100644
--- a/src/app/core/config/submission-uploads-config-data.service.ts
+++ b/src/app/core/config/submission-uploads-config-data.service.ts
@@ -18,15 +18,13 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(SUBMISSION_UPLOADS_TYPE)
 export class SubmissionUploadsConfigDataService extends ConfigDataService {
-  protected linkPath = 'submissionuploads';
-
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('submissionuploads', requestService, rdbService, objectCache, halService);
   }
 
   findByHref(href: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow): Observable<RemoteData<SubmissionUploadsModel>> {
diff --git a/src/app/core/data/access-status-data.service.ts b/src/app/core/data/access-status-data.service.ts
index 6635369726..2f641456fa 100644
--- a/src/app/core/data/access-status-data.service.ts
+++ b/src/app/core/data/access-status-data.service.ts
@@ -17,7 +17,6 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(ACCESS_STATUS)
 export class AccessStatusDataService extends BaseDataService<AccessStatusObject> {
-  protected linkPath = 'accessStatus';
 
   constructor(
     protected requestService: RequestService,
@@ -25,7 +24,7 @@ export class AccessStatusDataService extends BaseDataService<AccessStatusObject>
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('accessStatus', requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/base/base-data.service.spec.ts b/src/app/core/data/base/base-data.service.spec.ts
index 19310004fa..cd8b8c3e32 100644
--- a/src/app/core/data/base/base-data.service.spec.ts
+++ b/src/app/core/data/base/base-data.service.spec.ts
@@ -32,7 +32,7 @@ class TestService extends BaseDataService<any> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super(undefined, requestService, rdbService, objectCache, halService);
   }
 
   public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index 3618583428..d8caa6c1c8 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -8,7 +8,7 @@
 
 import { AsyncSubject, from as observableFrom, Observable, of as observableOf } from 'rxjs';
 import { map, mergeMap, skipWhile, switchMap, take, tap, toArray } from 'rxjs/operators';
-import { hasValue, isEmpty, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
+import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { RequestParam } from '../../cache/models/request-param.model';
@@ -31,23 +31,13 @@ import { HALDataService } from './hal-data-service.interface';
  *
  * All DataService (or DataService feature) classes must
  *   - extend this class (or {@link IdentifiableDataService})
- *   - specify a {@link linkPath}
- *   - implement any DataService features it requires in order to forward calls to it.
- *     {@link linkPath} and {@link responseMsToLive} must be passed through.
+ *   - implement any DataService features it requires in order to forward calls to it
  *
  * ```
  * export class SomeDataService extends BaseDataService<Something> implements CreateData<Something>, SearchData<Something> {
- *   protected linkPath = 'something';
- *   protected responseMsToLive = 3 * 60 * 1000;  // not required
- *
  *   private createData: CreateData<Something>;
  *   private searchData: SearchDataData<Something>;
  *
- *   constructor(...) {
- *      this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, ...);
- *      this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, ...);
- *   }
- *
  *   create(...) {
  *     return this.createData.create(...);
  *   }
@@ -59,40 +49,19 @@ import { HALDataService } from './hal-data-service.interface';
  * ```
  */
 export class BaseDataService<T extends CacheableObject> implements HALDataService<T> {
-  /**
-   * The REST endpoint this data service communicates with
-   */
-  protected linkPath: string;
-
-  /**
-   * Allows subclasses to reset the response cache time.
-   */
-  protected responseMsToLive?: number;
-
-  /**
-   * @param requestService
-   * @param rdbService
-   * @param objectCache
-   * @param halService
-   * @param linkPath          Optionally sets the {@link linkPath}; to be used by composable features.
-   * @param responseMsToLive  Optionally sets the {@link responseMsToLive}; to be used by composable features.
-   */
   constructor(
+    protected linkPath: string,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    linkPath?: string,
-    responseMsToLive?: number,
+    protected responseMsToLive?: number,
   ) {
-    if (isEmpty(this.linkPath) && isNotEmpty(linkPath)) {
-      this.linkPath = linkPath;
-    }
-    if (isEmpty(this.responseMsToLive) && isNotEmpty(responseMsToLive)) {
-      this.responseMsToLive = responseMsToLive;
-    }
   }
 
+  /**
+   * Allows subclasses to reset the response cache time.
+   */
 
   /**
    * Get the endpoint for browsing
diff --git a/src/app/core/data/base/create-data.spec.ts b/src/app/core/data/base/create-data.spec.ts
index 1936be5c98..ceefd3c51d 100644
--- a/src/app/core/data/base/create-data.spec.ts
+++ b/src/app/core/data/base/create-data.spec.ts
@@ -31,7 +31,7 @@ class TestService extends CreateDataImpl<any> {
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super(undefined, undefined, requestService, rdbService, objectCache, halService, notificationsService);
+    super(undefined, requestService, rdbService, objectCache, halService, notificationsService, undefined);
   }
 
   public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
diff --git a/src/app/core/data/base/create-data.ts b/src/app/core/data/base/create-data.ts
index faaadf45e7..3ffcd9adf2 100644
--- a/src/app/core/data/base/create-data.ts
+++ b/src/app/core/data/base/create-data.ts
@@ -45,14 +45,14 @@ export interface CreateData<T extends CacheableObject> {
 export class CreateDataImpl<T extends CacheableObject> extends BaseDataService<T> implements CreateData<T> {
   constructor(
     protected linkPath: string,
-    protected responseMsToLive: number,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
+    protected responseMsToLive: number,
   ) {
-    super(requestService, rdbService, objectCache, halService, linkPath, responseMsToLive);
+    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive);
   }
 
   /**
diff --git a/src/app/core/data/base/delete-data.spec.ts b/src/app/core/data/base/delete-data.spec.ts
index bdca855c98..4c4a2ded6d 100644
--- a/src/app/core/data/base/delete-data.spec.ts
+++ b/src/app/core/data/base/delete-data.spec.ts
@@ -36,7 +36,7 @@ class TestService extends DeleteDataImpl<any> {
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super(undefined, undefined, constructIdEndpointDefault, requestService, rdbService, objectCache, halService, notificationsService);
+    super(undefined, requestService, rdbService, objectCache, halService, notificationsService, undefined, constructIdEndpointDefault);
   }
 
   public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
diff --git a/src/app/core/data/base/delete-data.ts b/src/app/core/data/base/delete-data.ts
index 514a65dc2f..2e34f0957c 100644
--- a/src/app/core/data/base/delete-data.ts
+++ b/src/app/core/data/base/delete-data.ts
@@ -46,15 +46,15 @@ export interface DeleteData<T extends CacheableObject> {
 export class DeleteDataImpl<T extends CacheableObject> extends IdentifiableDataService<T> implements DeleteData<T> {
   constructor(
     protected linkPath: string,
-    protected responseMsToLive: number,
-    protected constructIdEndpoint: ConstructIdEndpoint,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
+    protected responseMsToLive: number,
+    protected constructIdEndpoint: ConstructIdEndpoint,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive, constructIdEndpoint);
     if (hasNoValue(constructIdEndpoint)) {
       throw new Error(`DeleteDataImpl initialized without a constructIdEndpoint method (linkPath: ${linkPath})`);
     }
diff --git a/src/app/core/data/base/find-all-data.spec.ts b/src/app/core/data/base/find-all-data.spec.ts
index 6312d70424..3caa8990f6 100644
--- a/src/app/core/data/base/find-all-data.spec.ts
+++ b/src/app/core/data/base/find-all-data.spec.ts
@@ -71,7 +71,7 @@ class TestService extends FindAllDataImpl<any> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(undefined, undefined, requestService, rdbService, objectCache, halService);
+    super(undefined, requestService, rdbService, objectCache, halService, undefined);
   }
 
   public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
diff --git a/src/app/core/data/base/find-all-data.ts b/src/app/core/data/base/find-all-data.ts
index 04ee426598..c2330af243 100644
--- a/src/app/core/data/base/find-all-data.ts
+++ b/src/app/core/data/base/find-all-data.ts
@@ -61,13 +61,13 @@ export interface FindAllData<T extends CacheableObject> {
 export class FindAllDataImpl<T extends CacheableObject> extends BaseDataService<T> implements FindAllData<T> {
   constructor(
     protected linkPath: string,
-    protected responseMsToLive: number,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
+    protected responseMsToLive: number,
   ) {
-    super(requestService, rdbService, objectCache, halService, linkPath, responseMsToLive);
+    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive);
   }
 
   /**
diff --git a/src/app/core/data/base/identifiable-data.service.spec.ts b/src/app/core/data/base/identifiable-data.service.spec.ts
index 015c7593b0..d08f1141fc 100644
--- a/src/app/core/data/base/identifiable-data.service.spec.ts
+++ b/src/app/core/data/base/identifiable-data.service.spec.ts
@@ -29,7 +29,7 @@ class TestService extends IdentifiableDataService<any> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super(undefined, requestService, rdbService, objectCache, halService);
   }
 
   public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
diff --git a/src/app/core/data/base/identifiable-data.service.ts b/src/app/core/data/base/identifiable-data.service.ts
index a2fb7cc1b7..904f925765 100644
--- a/src/app/core/data/base/identifiable-data.service.ts
+++ b/src/app/core/data/base/identifiable-data.service.ts
@@ -28,22 +28,21 @@ export const constructIdEndpointDefault = (endpoint, resourceID) => `${endpoint}
 
 /**
  * A type of data service that deals with objects that have an ID.
+ *
+ * The effective endpoint to use for the ID can be adjusted by providing a different {@link ConstructIdEndpoint} method.
+ * This method is passed as an argument so that it can be set on data service features without having to override them.
  */
 export class IdentifiableDataService<T extends CacheableObject> extends BaseDataService<T> {
-  /**
-   * A method to construct the effective endpoint to use for the ID.
-   * Also passed as an optional constructor argument so that it can be set on data service features without having to override them.
-   * @protected
-   */
-  protected constructIdEndpoint: ConstructIdEndpoint = constructIdEndpointDefault;
-
   constructor(
+    protected linkPath: string,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
+    protected responseMsToLive?: number,
+    protected constructIdEndpoint: ConstructIdEndpoint = constructIdEndpointDefault,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive);
   }
 
   /**
diff --git a/src/app/core/data/base/patch-data.spec.ts b/src/app/core/data/base/patch-data.spec.ts
index 4962d2e28a..601188ae7d 100644
--- a/src/app/core/data/base/patch-data.spec.ts
+++ b/src/app/core/data/base/patch-data.spec.ts
@@ -38,7 +38,7 @@ class TestService extends PatchDataImpl<any> {
     protected halService: HALEndpointService,
     protected comparator: ChangeAnalyzer<Item>,
   ) {
-    super(undefined, undefined, constructIdEndpointDefault, requestService, rdbService, objectCache, halService, comparator);
+    super(undefined, requestService, rdbService, objectCache, halService, comparator, undefined, constructIdEndpointDefault);
   }
 
   public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
diff --git a/src/app/core/data/base/patch-data.ts b/src/app/core/data/base/patch-data.ts
index f361629400..558de928c4 100644
--- a/src/app/core/data/base/patch-data.ts
+++ b/src/app/core/data/base/patch-data.ts
@@ -65,15 +65,15 @@ export interface PatchData<T extends CacheableObject> {
 export class PatchDataImpl<T extends CacheableObject> extends IdentifiableDataService<T> implements PatchData<T> {
   constructor(
     protected linkPath: string,
-    protected responseMsToLive: number,
-    protected constructIdEndpoint: ConstructIdEndpoint,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected comparator: ChangeAnalyzer<T>,
+    protected responseMsToLive: number,
+    protected constructIdEndpoint: ConstructIdEndpoint,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive, constructIdEndpoint);
     if (hasNoValue(constructIdEndpoint)) {
       throw new Error(`PatchDataImpl initialized without a constructIdEndpoint method (linkPath: ${linkPath})`);
     }
diff --git a/src/app/core/data/base/put-data.spec.ts b/src/app/core/data/base/put-data.spec.ts
index 173121572b..01b5caea5b 100644
--- a/src/app/core/data/base/put-data.spec.ts
+++ b/src/app/core/data/base/put-data.spec.ts
@@ -30,7 +30,7 @@ class TestService extends PutDataImpl<any> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(undefined, undefined, requestService, rdbService, objectCache, halService);
+    super(undefined, requestService, rdbService, objectCache, halService, undefined);
   }
 
   public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
diff --git a/src/app/core/data/base/put-data.ts b/src/app/core/data/base/put-data.ts
index 82491e9264..bd2a8d2929 100644
--- a/src/app/core/data/base/put-data.ts
+++ b/src/app/core/data/base/put-data.ts
@@ -39,13 +39,13 @@ export interface PutData<T extends CacheableObject> {
 export class PutDataImpl<T extends CacheableObject> extends BaseDataService<T> implements PutData<T> {
   constructor(
     protected linkPath: string,
-    protected responseMsToLive: number,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
+    protected responseMsToLive: number,
   ) {
-    super(requestService, rdbService, objectCache, halService, linkPath, responseMsToLive);
+    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive);
   }
 
   /**
diff --git a/src/app/core/data/base/search-data.spec.ts b/src/app/core/data/base/search-data.spec.ts
index b0ad185b73..7abf26b5b8 100644
--- a/src/app/core/data/base/search-data.spec.ts
+++ b/src/app/core/data/base/search-data.spec.ts
@@ -68,7 +68,7 @@ class TestService extends SearchDataImpl<any> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(undefined, undefined, requestService, rdbService, objectCache, halService);
+    super(undefined, requestService, rdbService, objectCache, halService, undefined);
   }
 
   public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
diff --git a/src/app/core/data/base/search-data.ts b/src/app/core/data/base/search-data.ts
index d0204e83a2..12cae77c3a 100644
--- a/src/app/core/data/base/search-data.ts
+++ b/src/app/core/data/base/search-data.ts
@@ -80,14 +80,14 @@ export class SearchDataImpl<T extends CacheableObject> extends BaseDataService<T
    */
   constructor(
     protected linkPath: string,
-    protected responseMsToLive: number,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
+    protected responseMsToLive: number,
     private constructSearchEndpoint: ConstructSearchEndpoint = constructSearchEndpointDefault,
   ) {
-    super(requestService, rdbService, objectCache, halService, linkPath, responseMsToLive);
+    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive);
     if (hasNoValue(constructSearchEndpoint)) {
       throw new Error(`SearchDataImpl initialized without a constructSearchEndpoint method (linkPath: ${linkPath})`);
     }
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index 2e8d8f9368..0e0c939d9e 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -42,8 +42,6 @@ import { dataService } from './base/data-service.decorator';
 })
 @dataService(BITSTREAM)
 export class BitstreamDataService extends IdentifiableDataService<Bitstream> implements SearchData<Bitstream>, PatchData<Bitstream>, DeleteData<Bitstream> {
-  protected linkPath = 'bitstreams';
-
   private searchData: SearchDataImpl<Bitstream>;
   private patchData: PatchDataImpl<Bitstream>;
   private deleteData: DeleteDataImpl<Bitstream>;
@@ -58,11 +56,11 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
     protected comparator: DSOChangeAnalyzer<Bitstream>,
     protected notificationsService: NotificationsService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('bitstreams', requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
-    this.patchData = new PatchDataImpl<Bitstream>(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, comparator);
-    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.patchData = new PatchDataImpl<Bitstream>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
diff --git a/src/app/core/data/bitstream-format-data.service.ts b/src/app/core/data/bitstream-format-data.service.ts
index 587100b1de..0104389815 100644
--- a/src/app/core/data/bitstream-format-data.service.ts
+++ b/src/app/core/data/bitstream-format-data.service.ts
@@ -41,6 +41,7 @@ const selectedBitstreamFormatSelector = createSelector(
 @Injectable()
 @dataService(BITSTREAM_FORMAT)
 export class BitstreamFormatDataService extends IdentifiableDataService<BitstreamFormat> implements FindAllData<BitstreamFormat>, DeleteData<BitstreamFormat> {
+
   protected linkPath = 'bitstreamformats';
 
   private findAllData: FindAllDataImpl<BitstreamFormat>;
@@ -54,10 +55,10 @@ export class BitstreamFormatDataService extends IdentifiableDataService<Bitstrea
     protected notificationsService: NotificationsService,
     protected store: Store<CoreState>,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('bitstreamformats', requestService, rdbService, objectCache, halService);
 
-    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
-    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
diff --git a/src/app/core/data/bundle-data.service.ts b/src/app/core/data/bundle-data.service.ts
index dbd5781446..e85c0c2bee 100644
--- a/src/app/core/data/bundle-data.service.ts
+++ b/src/app/core/data/bundle-data.service.ts
@@ -32,8 +32,6 @@ import { dataService } from './base/data-service.decorator';
 )
 @dataService(BUNDLE)
 export class BundleDataService extends IdentifiableDataService<Bundle> implements PatchData<Bundle> {
-  protected linkPath = 'bundles';
-
   private bitstreamsEndpoint = 'bitstreams';
 
   private patchData: PatchDataImpl<Bundle>;
@@ -45,9 +43,9 @@ export class BundleDataService extends IdentifiableDataService<Bundle> implement
     protected halService: HALEndpointService,
     protected comparator: DSOChangeAnalyzer<Bundle>,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('bundles', requestService, rdbService, objectCache, halService);
 
-    this.patchData = new PatchDataImpl<Bundle>(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, comparator);
+    this.patchData = new PatchDataImpl<Bundle>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
diff --git a/src/app/core/data/collection-data.service.ts b/src/app/core/data/collection-data.service.ts
index fd3d6f4066..405b35c1f9 100644
--- a/src/app/core/data/collection-data.service.ts
+++ b/src/app/core/data/collection-data.service.ts
@@ -38,8 +38,6 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(COLLECTION)
 export class CollectionDataService extends ComColDataService<Collection> {
-  protected linkPath = 'collections';
-
   protected errorTitle = 'collection.source.update.notifications.error.title';
   protected contentSourceError = 'collection.source.update.notifications.error.content';
 
@@ -54,7 +52,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
     protected communityDataService: CommunityDataService,
     protected translate: TranslateService,
   ) {
-    super(requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
+    super('collections', requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
   }
 
   /**
diff --git a/src/app/core/data/comcol-data.service.spec.ts b/src/app/core/data/comcol-data.service.spec.ts
index 8c70fd9895..758cbad97a 100644
--- a/src/app/core/data/comcol-data.service.spec.ts
+++ b/src/app/core/data/comcol-data.service.spec.ts
@@ -33,7 +33,6 @@ const communitiesEndpoint = 'https://rest.api/core/communities';
 const communityEndpoint = `${communitiesEndpoint}/${scopeID}`;
 
 class TestService extends ComColDataService<any> {
-  protected linkPath = 'something';
 
   constructor(
     protected requestService: RequestService,
@@ -46,8 +45,9 @@ class TestService extends ComColDataService<any> {
     protected http: HttpClient,
     protected bitstreamDataService: BitstreamDataService,
     protected comparator: DSOChangeAnalyzer<Community>,
+    protected linkPath: string
   ) {
-    super(requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
+    super('something', requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
   }
 
   protected getFindByParentHref(parentUUID: string): Observable<string> {
@@ -131,7 +131,8 @@ describe('ComColDataService', () => {
       notificationsService,
       http,
       bitstreamDataService,
-      comparator
+      comparator,
+      LINK_NAME
     );
   }
 
diff --git a/src/app/core/data/comcol-data.service.ts b/src/app/core/data/comcol-data.service.ts
index 7ad4836d43..6392f389b6 100644
--- a/src/app/core/data/comcol-data.service.ts
+++ b/src/app/core/data/comcol-data.service.ts
@@ -37,6 +37,7 @@ export abstract class ComColDataService<T extends Community | Collection> extend
   private deleteData: DeleteData<T>;
 
   protected constructor(
+    protected linkPath: string,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
@@ -45,13 +46,13 @@ export abstract class ComColDataService<T extends Community | Collection> extend
     protected notificationsService: NotificationsService,
     protected bitstreamDataService: BitstreamDataService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super(linkPath, requestService, rdbService, objectCache, halService);
 
-    this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService);
-    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, );
-    this.searchData = new SearchDataImpl<T>(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, );
-    this.patchData = new PatchDataImpl<T>(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, comparator);
-    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl<T>(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.patchData = new PatchDataImpl<T>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
diff --git a/src/app/core/data/community-data.service.ts b/src/app/core/data/community-data.service.ts
index 06792be2d9..8623d414b2 100644
--- a/src/app/core/data/community-data.service.ts
+++ b/src/app/core/data/community-data.service.ts
@@ -22,8 +22,6 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(COMMUNITY)
 export class CommunityDataService extends ComColDataService<Community> {
-  protected linkPath = 'communities';
-
   protected topLinkPath = 'search/top';
 
   constructor(
@@ -35,7 +33,7 @@ export class CommunityDataService extends ComColDataService<Community> {
     protected notificationsService: NotificationsService,
     protected bitstreamDataService: BitstreamDataService,
   ) {
-    super(requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
+    super('communities', requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
   }
 
   getEndpoint() {
diff --git a/src/app/core/data/configuration-data.service.ts b/src/app/core/data/configuration-data.service.ts
index 3dfdd5ef08..de044e25e3 100644
--- a/src/app/core/data/configuration-data.service.ts
+++ b/src/app/core/data/configuration-data.service.ts
@@ -17,7 +17,6 @@ import { dataService } from './base/data-service.decorator';
  * Data Service responsible for retrieving Configuration properties
  */
 export class ConfigurationDataService extends IdentifiableDataService<ConfigurationProperty> {
-  protected linkPath = 'properties';
 
   constructor(
     protected requestService: RequestService,
@@ -25,7 +24,7 @@ export class ConfigurationDataService extends IdentifiableDataService<Configurat
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('properties', requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/dso-redirect.service.ts b/src/app/core/data/dso-redirect.service.ts
index ed37e063c6..81ce678e43 100644
--- a/src/app/core/data/dso-redirect.service.ts
+++ b/src/app/core/data/dso-redirect.service.ts
@@ -31,18 +31,20 @@ const UUID_ENDPOINT = 'dso';
  * {@link setLinkPath} must be called before each request.
  */
 class DsoByIdOrUUIDDataService extends IdentifiableDataService<DSpaceObject> {
-  // interpolate id/uuid as query parameter
-  constructIdEndpoint = (endpoint: string, resourceID: string): string =>
-    endpoint.replace(/{\?id}/, `?id=${resourceID}`)
-            .replace(/{\?uuid}/, `?uuid=${resourceID}`);
-
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super(
+      undefined, requestService, rdbService, objectCache, halService, undefined,
+      // interpolate id/uuid as query parameter
+      (endpoint: string, resourceID: string): string => {
+        return endpoint.replace(/{\?id}/, `?id=${resourceID}`)
+                       .replace(/{\?uuid}/, `?uuid=${resourceID}`);
+      },
+    );
   }
 
   /**
diff --git a/src/app/core/data/dspace-object-data.service.ts b/src/app/core/data/dspace-object-data.service.ts
index ff815cb3df..2ad024133c 100644
--- a/src/app/core/data/dspace-object-data.service.ts
+++ b/src/app/core/data/dspace-object-data.service.ts
@@ -11,13 +11,6 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(DSPACE_OBJECT)
 export class DSpaceObjectDataService extends IdentifiableDataService<DSpaceObject> {
-  protected linkPath = 'dso';
-
-  // interpolate uuid as query parameter
-  protected constructIdEndpoint = (endpoint: string, resourceID: string): string => {
-    return endpoint.replace(/{\?uuid}/, `?uuid=${resourceID}`);
-  };
-
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
@@ -25,7 +18,11 @@ export class DSpaceObjectDataService extends IdentifiableDataService<DSpaceObjec
     protected halService: HALEndpointService,
   ) {
     super(
-      requestService, rdbService, objectCache, halService,
+      'dso', requestService, rdbService, objectCache, halService, undefined,
+      // interpolate uuid as query parameter
+      (endpoint: string, resourceID: string): string => {
+        return endpoint.replace(/{\?uuid}/, `?uuid=${resourceID}`);
+      },
     );
   }
 }
diff --git a/src/app/core/data/entity-type-data.service.ts b/src/app/core/data/entity-type-data.service.ts
index 9eb0cf5188..4020ff638d 100644
--- a/src/app/core/data/entity-type-data.service.ts
+++ b/src/app/core/data/entity-type-data.service.ts
@@ -22,8 +22,6 @@ import { FindAllData, FindAllDataImpl } from './base/find-all-data';
  */
 @Injectable()
 export class EntityTypeDataService extends BaseDataService<ItemType> implements FindAllData<ItemType>, SearchData<ItemType> {
-  protected linkPath = 'entitytypes';
-
   private findAllData: FindAllData<ItemType>;
   private searchData: SearchDataImpl<ItemType>;
 
@@ -34,10 +32,10 @@ export class EntityTypeDataService extends BaseDataService<ItemType> implements
     protected halService: HALEndpointService,
     protected relationshipTypeService: RelationshipTypeDataService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('entitytypes', requestService, rdbService, objectCache, halService);
 
-    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
-    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   getBrowseEndpoint(options, linkPath?: string): Observable<string> {
diff --git a/src/app/core/data/external-source-data.service.ts b/src/app/core/data/external-source-data.service.ts
index ec8e65777b..c7b71790a3 100644
--- a/src/app/core/data/external-source-data.service.ts
+++ b/src/app/core/data/external-source-data.service.ts
@@ -21,8 +21,6 @@ import { SearchData, SearchDataImpl } from './base/search-data';
  */
 @Injectable()
 export class ExternalSourceDataService extends IdentifiableDataService<ExternalSource> implements SearchData<ExternalSource> {
-  protected linkPath = 'externalsources';
-
   private searchData: SearchData<ExternalSource>;
 
   constructor(
@@ -31,9 +29,9 @@ export class ExternalSourceDataService extends IdentifiableDataService<ExternalS
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('externalsources', requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
diff --git a/src/app/core/data/feature-authorization/authorization-data.service.ts b/src/app/core/data/feature-authorization/authorization-data.service.ts
index 3f4c42df0c..a9aded4bfe 100644
--- a/src/app/core/data/feature-authorization/authorization-data.service.ts
+++ b/src/app/core/data/feature-authorization/authorization-data.service.ts
@@ -29,7 +29,6 @@ import { dataService } from '../base/data-service.decorator';
 @dataService(AUTHORIZATION)
 export class AuthorizationDataService extends BaseDataService<Authorization> implements SearchData<Authorization> {
   protected linkPath = 'authorizations';
-
   protected searchByObjectPath = 'object';
 
   private searchData: SearchDataImpl<Authorization>;
@@ -41,9 +40,9 @@ export class AuthorizationDataService extends BaseDataService<Authorization> imp
     protected halService: HALEndpointService,
     protected siteService: SiteDataService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('authorizations', requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
diff --git a/src/app/core/data/feature-authorization/feature-data.service.ts b/src/app/core/data/feature-authorization/feature-data.service.ts
index 3e84024785..eda8791153 100644
--- a/src/app/core/data/feature-authorization/feature-data.service.ts
+++ b/src/app/core/data/feature-authorization/feature-data.service.ts
@@ -22,6 +22,6 @@ export class FeatureDataService extends BaseDataService<Feature> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('features', requestService, rdbService, objectCache, halService);
   }
 }
diff --git a/src/app/core/data/href-only-data.service.ts b/src/app/core/data/href-only-data.service.ts
index 5192c45fa3..0a765de101 100644
--- a/src/app/core/data/href-only-data.service.ts
+++ b/src/app/core/data/href-only-data.service.ts
@@ -52,7 +52,7 @@ export class HrefOnlyDataService implements HALDataService<any> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    this.dataService = new BaseDataService(requestService, rdbService, objectCache, halService);
+    this.dataService = new BaseDataService(undefined, requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index 016c8c3625..11179d1e77 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -39,7 +39,7 @@ import { StatusCodeOnlyResponseParsingService } from './status-code-only-respons
 import { sendRequest } from '../shared/request.operators';
 import { RestRequest } from './rest-request.model';
 import { FindListOptions } from './find-list-options.model';
-import { IdentifiableDataService } from './base/identifiable-data.service';
+import { ConstructIdEndpoint, IdentifiableDataService } from './base/identifiable-data.service';
 import { PatchData, PatchDataImpl } from './base/patch-data';
 import { DeleteData, DeleteDataImpl } from './base/delete-data';
 import { RestRequestMethod } from './rest-request-method';
@@ -58,6 +58,7 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
   private deleteData: DeleteData<Item>;
 
   protected constructor(
+    protected linkPath,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
@@ -66,12 +67,13 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
     protected comparator: DSOChangeAnalyzer<Item>,
     protected browseService: BrowseService,
     protected bundleService: BundleDataService,
+    protected constructIdEndpoint: ConstructIdEndpoint = (endpoint, resourceID) => `${endpoint}/${resourceID}`,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super(linkPath, requestService, rdbService, objectCache, halService, undefined, constructIdEndpoint);
 
-    this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService);
-    this.patchData = new PatchDataImpl<Item>(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, comparator);
-    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.patchData = new PatchDataImpl<Item>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
@@ -386,8 +388,6 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
 @Injectable()
 @dataService(ITEM)
 export class ItemDataService extends BaseItemDataService {
-  protected linkPath = 'items';
-
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
@@ -398,6 +398,6 @@ export class ItemDataService extends BaseItemDataService {
     protected browseService: BrowseService,
     protected bundleService: BundleDataService,
   ) {
-    super(requestService, rdbService, objectCache, halService, notificationsService, comparator, browseService, bundleService);
+    super('items', requestService, rdbService, objectCache, halService, notificationsService, comparator, browseService, bundleService);
   }
 }
diff --git a/src/app/core/data/item-request-data.service.ts b/src/app/core/data/item-request-data.service.ts
index 6781badfb0..ff6025f7ac 100644
--- a/src/app/core/data/item-request-data.service.ts
+++ b/src/app/core/data/item-request-data.service.ts
@@ -23,15 +23,13 @@ import { IdentifiableDataService } from './base/identifiable-data.service';
   providedIn: 'root',
 })
 export class ItemRequestDataService extends IdentifiableDataService<ItemRequest> {
-  protected linkPath = 'itemrequests';
-
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('itemrequests', requestService, rdbService, objectCache, halService);
   }
 
   getItemRequestEndpoint(): Observable<string> {
diff --git a/src/app/core/data/item-template-data.service.ts b/src/app/core/data/item-template-data.service.ts
index b8e8ec6301..634c966dba 100644
--- a/src/app/core/data/item-template-data.service.ts
+++ b/src/app/core/data/item-template-data.service.ts
@@ -22,8 +22,6 @@ import { CreateDataImpl } from './base/create-data';
  * Data service for interacting with Item templates via their Collection
  */
 class CollectionItemTemplateDataService extends IdentifiableDataService<Item> {
-  protected linkPath = 'itemtemplates';
-
   private createData: CreateDataImpl<Item>;
 
   constructor(
@@ -34,10 +32,10 @@ class CollectionItemTemplateDataService extends IdentifiableDataService<Item> {
     protected notificationsService: NotificationsService,
     protected collectionService: CollectionDataService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('itemtemplates', requestService, rdbService, objectCache, halService, undefined);
 
     // We only intend to use createOnEndpoint, so this inner data service feature doesn't need an endpoint at all
-    this.createData = new CreateDataImpl<Item>(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService);
+    this.createData = new CreateDataImpl<Item>(undefined, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
   }
 
   /**
@@ -67,8 +65,6 @@ class CollectionItemTemplateDataService extends IdentifiableDataService<Item> {
  */
 @Injectable()
 export class ItemTemplateDataService extends BaseItemDataService {
-  protected linkPath = 'itemtemplates';
-
   private byCollection: CollectionItemTemplateDataService;
 
   constructor(
@@ -82,7 +78,7 @@ export class ItemTemplateDataService extends BaseItemDataService {
     protected bundleService: BundleDataService,
     protected collectionService: CollectionDataService,
   ) {
-    super(requestService, rdbService, objectCache, halService, notificationsService, comparator, browseService, bundleService);
+    super('itemtemplates', requestService, rdbService, objectCache, halService, notificationsService, comparator, browseService, bundleService);
 
     this.byCollection = new CollectionItemTemplateDataService(requestService, rdbService, objectCache, halService, notificationsService, collectionService);
   }
diff --git a/src/app/core/data/metadata-field-data.service.ts b/src/app/core/data/metadata-field-data.service.ts
index 519b68f40c..db9361ee4c 100644
--- a/src/app/core/data/metadata-field-data.service.ts
+++ b/src/app/core/data/metadata-field-data.service.ts
@@ -29,8 +29,6 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(METADATA_FIELD)
 export class MetadataFieldDataService extends IdentifiableDataService<MetadataField> implements CreateData<MetadataField>, PutData<MetadataField>, DeleteData<MetadataField>, SearchData<MetadataField> {
-  protected linkPath = 'metadatafields';
-
   private createData: CreateData<MetadataField>;
   private searchData: SearchData<MetadataField>;
   private putData: PutData<MetadataField>;
@@ -46,12 +44,12 @@ export class MetadataFieldDataService extends IdentifiableDataService<MetadataFi
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('metadatafields', requestService, rdbService, objectCache, halService);
 
-    this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService, );
-    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
-    this.putData = new PutDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
-    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.putData = new PutDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
diff --git a/src/app/core/data/metadata-schema-data.service.ts b/src/app/core/data/metadata-schema-data.service.ts
index ffb9763386..6bd633b8c6 100644
--- a/src/app/core/data/metadata-schema-data.service.ts
+++ b/src/app/core/data/metadata-schema-data.service.ts
@@ -27,8 +27,6 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(METADATA_SCHEMA)
 export class MetadataSchemaDataService extends IdentifiableDataService<MetadataSchema> implements FindAllData<MetadataSchema>, DeleteData<MetadataSchema> {
-  protected linkPath = 'metadataschemas';
-
   private createData: CreateData<MetadataSchema>;
   private findAllData: FindAllData<MetadataSchema>;
   private putData: PutData<MetadataSchema>;
@@ -41,12 +39,12 @@ export class MetadataSchemaDataService extends IdentifiableDataService<MetadataS
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('metadataschemas', requestService, rdbService, objectCache, halService);
 
-    this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService);
-    this.putData = new PutDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
-    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
-    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.putData = new PutDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
diff --git a/src/app/core/data/processes/process-data.service.ts b/src/app/core/data/processes/process-data.service.ts
index 33e7e3c7e8..9c484fed2d 100644
--- a/src/app/core/data/processes/process-data.service.ts
+++ b/src/app/core/data/processes/process-data.service.ts
@@ -20,8 +20,6 @@ import { dataService } from '../base/data-service.decorator';
 @Injectable()
 @dataService(PROCESS)
 export class ProcessDataService extends IdentifiableDataService<Process> implements FindAllData<Process> {
-  protected linkPath = 'processes';
-
   private findAllData: FindAllData<Process>;
 
   constructor(
@@ -31,9 +29,9 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
     protected halService: HALEndpointService,
     protected bitstreamDataService: BitstreamDataService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('processes', requestService, rdbService, objectCache, halService);
 
-    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
diff --git a/src/app/core/data/processes/script-data.service.ts b/src/app/core/data/processes/script-data.service.ts
index 39666da86b..ed228612ef 100644
--- a/src/app/core/data/processes/script-data.service.ts
+++ b/src/app/core/data/processes/script-data.service.ts
@@ -28,8 +28,6 @@ export const METADATA_EXPORT_SCRIPT_NAME = 'metadata-export';
 @Injectable()
 @dataService(SCRIPT)
 export class ScriptDataService extends IdentifiableDataService<Script> implements FindAllData<Script> {
-  protected linkPath = 'scripts';
-
   private findAllData: FindAllDataImpl<Script>;
 
   constructor(
@@ -38,9 +36,9 @@ export class ScriptDataService extends IdentifiableDataService<Script> implement
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('scripts', requestService, rdbService, objectCache, halService);
 
-    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   public invoke(scriptName: string, parameters: ProcessParameter[], files: File[]): Observable<RemoteData<Process>> {
diff --git a/src/app/core/data/relationship-data.service.ts b/src/app/core/data/relationship-data.service.ts
index e60ddb068c..cab6a1ae13 100644
--- a/src/app/core/data/relationship-data.service.ts
+++ b/src/app/core/data/relationship-data.service.ts
@@ -75,9 +75,6 @@ const compareItemsByUUID = (itemCheck: Item) =>
 @Injectable()
 @dataService(RELATIONSHIP)
 export class RelationshipDataService extends IdentifiableDataService<Relationship> implements SearchData<Relationship> {
-  protected linkPath = 'relationships';
-  protected responseMsToLive = 15 * 60 * 1000;
-
   private searchData: SearchData<Relationship>;
   private putData: PutData<Relationship>;
 
@@ -90,10 +87,10 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
     protected appStore: Store<AppState>,
     @Inject(PAGINATED_RELATIONS_TO_ITEMS_OPERATOR) private paginatedRelationsToItems: (thisId: string) => (source: Observable<RemoteData<PaginatedList<Relationship>>>) => Observable<RemoteData<PaginatedList<Item>>>,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('relationships', requestService, rdbService, objectCache, halService, 15 * 60 * 1000);
 
-    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
-    this.putData = new PutDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.putData = new PutDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
diff --git a/src/app/core/data/relationship-type-data.service.ts b/src/app/core/data/relationship-type-data.service.ts
index 66da843bac..3020e52d47 100644
--- a/src/app/core/data/relationship-type-data.service.ts
+++ b/src/app/core/data/relationship-type-data.service.ts
@@ -33,8 +33,6 @@ const checkSide = (typeRd: RemoteData<ItemType>, label: string): boolean =>
 @Injectable()
 @dataService(RELATIONSHIP_TYPE)
 export class RelationshipTypeDataService extends BaseDataService<RelationshipType> {
-  protected linkPath = 'relationshiptypes';
-
   private searchData: SearchDataImpl<RelationshipType>;
   private findAllData: FindAllDataImpl<RelationshipType>;
 
@@ -44,10 +42,10 @@ export class RelationshipTypeDataService extends BaseDataService<RelationshipTyp
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('relationshiptypes', requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
-    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
diff --git a/src/app/core/data/root-data.service.ts b/src/app/core/data/root-data.service.ts
index b17e349ae5..54fe614d3e 100644
--- a/src/app/core/data/root-data.service.ts
+++ b/src/app/core/data/root-data.service.ts
@@ -20,9 +20,6 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(ROOT)
 export class RootDataService extends BaseDataService<Root> {
-  protected linkPath = '';
-  protected responseMsToLive =  6 * 60 * 60 * 1000;
-
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
@@ -30,7 +27,7 @@ export class RootDataService extends BaseDataService<Root> {
     protected halService: HALEndpointService,
     protected restService: DspaceRestService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('', requestService, rdbService, objectCache, halService, 6 * 60 * 60 * 1000);
   }
 
   /**
diff --git a/src/app/core/data/site-data.service.ts b/src/app/core/data/site-data.service.ts
index 38cb86a9c2..c2c4ffa466 100644
--- a/src/app/core/data/site-data.service.ts
+++ b/src/app/core/data/site-data.service.ts
@@ -22,8 +22,6 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(SITE)
 export class SiteDataService extends BaseDataService<Site> implements FindAllData<Site> {
-  protected linkPath = 'sites';
-
   private findAllData: FindAllData<Site>;
 
   constructor(
@@ -32,9 +30,9 @@ export class SiteDataService extends BaseDataService<Site> implements FindAllDat
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('sites', requestService, rdbService, objectCache, halService);
 
-    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
diff --git a/src/app/core/data/version-data.service.ts b/src/app/core/data/version-data.service.ts
index a1765f8e94..ee7bdb2028 100644
--- a/src/app/core/data/version-data.service.ts
+++ b/src/app/core/data/version-data.service.ts
@@ -24,7 +24,6 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(VERSION)
 export class VersionDataService extends IdentifiableDataService<Version> implements PatchData<Version> {
-  protected linkPath = 'versions';
   private patchData: PatchData<Version>;
 
   constructor(
@@ -34,9 +33,9 @@ export class VersionDataService extends IdentifiableDataService<Version> impleme
     protected halService: HALEndpointService,
     protected comparator: DefaultChangeAnalyzer<Version>,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('versions', requestService, rdbService, objectCache, halService);
 
-    this.patchData = new PatchDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, comparator);
+    this.patchData = new PatchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts
index e475c32edd..b331c4f2e4 100644
--- a/src/app/core/data/version-history-data.service.ts
+++ b/src/app/core/data/version-history-data.service.ts
@@ -32,7 +32,6 @@ import { dataService } from './base/data-service.decorator';
 @Injectable()
 @dataService(VERSION_HISTORY)
 export class VersionHistoryDataService extends IdentifiableDataService<VersionHistory> {
-  protected linkPath = 'versionhistories';
   protected versionsEndpoint = 'versions';
 
   constructor(
@@ -42,7 +41,7 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
     protected halService: HALEndpointService,
     protected versionDataService: VersionDataService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('versionhistories', requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/data/workflow-action-data.service.ts b/src/app/core/data/workflow-action-data.service.ts
index fbea353d63..b2c4f0bd7b 100644
--- a/src/app/core/data/workflow-action-data.service.ts
+++ b/src/app/core/data/workflow-action-data.service.ts
@@ -22,6 +22,6 @@ export class WorkflowActionDataService extends BaseDataService<WorkflowAction> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('workflowactions', requestService, rdbService, objectCache, halService);
   }
 }
diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts
index e20717ef8a..2313d2b20e 100644
--- a/src/app/core/eperson/eperson-data.service.ts
+++ b/src/app/core/eperson/eperson-data.service.ts
@@ -41,8 +41,6 @@ const editEPersonSelector = createSelector(ePeopleRegistryStateSelector, (ePeopl
 @Injectable()
 @dataService(EPERSON)
 export class EPersonDataService extends IdentifiableDataService<EPerson> implements CreateData<EPerson>, SearchData<EPerson>, PatchData<EPerson>, DeleteData<EPerson> {
-  protected linkPath = 'epersons';
-
   protected searchByEmailPath = 'byEmail';
   protected searchByMetadataPath = 'byMetadata';
 
@@ -60,12 +58,12 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
     protected notificationsService: NotificationsService,
     protected store: Store<any>,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('epersons', requestService, rdbService, objectCache, halService);
 
-    this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService);
-    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
-    this.patchData = new PatchDataImpl<EPerson>(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, comparator);
-    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.patchData = new PatchDataImpl<EPerson>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
diff --git a/src/app/core/eperson/group-data.service.ts b/src/app/core/eperson/group-data.service.ts
index a2ce1f7544..6e6d1fbb9b 100644
--- a/src/app/core/eperson/group-data.service.ts
+++ b/src/app/core/eperson/group-data.service.ts
@@ -50,8 +50,6 @@ const editGroupSelector = createSelector(groupRegistryStateSelector, (groupRegis
 @Injectable()
 @dataService(GROUP)
 export class GroupDataService extends IdentifiableDataService<Group> {
-  protected linkPath = 'metadatafields';
-
   protected browseEndpoint = '';
   public ePersonsEndpoint = 'epersons';
   public subgroupsEndpoint = 'subgroups';
@@ -71,12 +69,12 @@ export class GroupDataService extends IdentifiableDataService<Group> {
     protected nameService: DSONameService,
     protected store: Store<any>,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('groups', requestService, rdbService, objectCache, halService);
 
-    this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService);
-    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
-    this.patchData = new PatchDataImpl<Group>(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, comparator);
-    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.patchData = new PatchDataImpl<Group>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
diff --git a/src/app/core/feedback/feedback-data.service.ts b/src/app/core/feedback/feedback-data.service.ts
index 9a3a1a235e..3cc7df7653 100644
--- a/src/app/core/feedback/feedback-data.service.ts
+++ b/src/app/core/feedback/feedback-data.service.ts
@@ -21,8 +21,6 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(FEEDBACK)
 export class FeedbackDataService extends IdentifiableDataService<Feedback> implements CreateData<Feedback> {
-  protected linkPath = 'feedbacks';
-
   private createData: CreateDataImpl<Feedback>;
 
   constructor(
@@ -33,9 +31,9 @@ export class FeedbackDataService extends IdentifiableDataService<Feedback> imple
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('feedbacks', requestService, rdbService, objectCache, halService);
 
-    this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
   }
 
   /**
diff --git a/src/app/core/orcid/orcid-history-data.service.ts b/src/app/core/orcid/orcid-history-data.service.ts
index 973fd19891..f06a270a44 100644
--- a/src/app/core/orcid/orcid-history-data.service.ts
+++ b/src/app/core/orcid/orcid-history-data.service.ts
@@ -23,8 +23,6 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(ORCID_HISTORY)
 export class OrcidHistoryDataService extends IdentifiableDataService<OrcidHistory> {
-  protected linkPath = 'orcidhistories';
-  protected responseMsToLive = 10 * 1000;
 
   constructor(
     protected requestService: RequestService,
@@ -32,7 +30,7 @@ export class OrcidHistoryDataService extends IdentifiableDataService<OrcidHistor
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('orcidhistories', requestService, rdbService, objectCache, halService, 10 * 1000);
   }
 
   sendToORCID(orcidQueue: OrcidQueue): Observable<RemoteData<OrcidHistory>> {
diff --git a/src/app/core/orcid/orcid-queue-data.service.ts b/src/app/core/orcid/orcid-queue-data.service.ts
index 41806ba0f5..77149c4bf8 100644
--- a/src/app/core/orcid/orcid-queue-data.service.ts
+++ b/src/app/core/orcid/orcid-queue-data.service.ts
@@ -23,9 +23,6 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(ORCID_QUEUE)
 export class OrcidQueueDataService extends IdentifiableDataService<OrcidQueue> {
-  protected linkPath = 'orcidqueues';
-  protected responseMsToLive = 10 * 1000;
-
   private searchData: SearchData<OrcidQueue>;
   private deleteData: DeleteData<OrcidQueue>;
 
@@ -36,10 +33,10 @@ export class OrcidQueueDataService extends IdentifiableDataService<OrcidQueue> {
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('orcidqueues', requestService, rdbService, objectCache, halService, 10 * 1000);
 
-    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
-    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
diff --git a/src/app/core/profile/researcher-profile-data.service.ts b/src/app/core/profile/researcher-profile-data.service.ts
index a1a9a39fbd..8c62879c37 100644
--- a/src/app/core/profile/researcher-profile-data.service.ts
+++ b/src/app/core/profile/researcher-profile-data.service.ts
@@ -40,9 +40,6 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(RESEARCHER_PROFILE)
 export class ResearcherProfileDataService extends IdentifiableDataService<ResearcherProfile> implements CreateData<ResearcherProfile>, SearchData<ResearcherProfile>, PatchData<ResearcherProfile>, DeleteData<ResearcherProfile> {
-  protected linkPath = 'profiles';
-  protected responseMsToLive = 10 * 1000;
-
   private createData: CreateDataImpl<ResearcherProfile>;
   private searchData: SearchDataImpl<ResearcherProfile>;
   private patchData: PatchDataImpl<ResearcherProfile>;
@@ -58,12 +55,12 @@ export class ResearcherProfileDataService extends IdentifiableDataService<Resear
     protected comparator: DefaultChangeAnalyzer<ResearcherProfile>,
     protected itemService: ItemDataService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('profiles', requestService, rdbService, objectCache, halService, 10 * 1000);
 
-    this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService);
-    this.patchData = new PatchDataImpl<ResearcherProfile>(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, comparator);
-    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
-    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.patchData = new PatchDataImpl<ResearcherProfile>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
diff --git a/src/app/core/resource-policy/resource-policy-data.service.ts b/src/app/core/resource-policy/resource-policy-data.service.ts
index 9dfa19c709..5190ff30ed 100644
--- a/src/app/core/resource-policy/resource-policy-data.service.ts
+++ b/src/app/core/resource-policy/resource-policy-data.service.ts
@@ -40,8 +40,6 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(RESOURCE_POLICY)
 export class ResourcePolicyDataService extends IdentifiableDataService<ResourcePolicy> {
-  protected linkPath = 'resourcepolicies';
-
   protected searchByEPersonMethod = 'eperson';
   protected searchByGroupMethod = 'group';
   protected searchByResourceMethod = 'resource';
@@ -61,12 +59,12 @@ export class ResourcePolicyDataService extends IdentifiableDataService<ResourceP
     protected ePersonService: EPersonDataService,
     protected groupService: GroupDataService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('resourcepolicies', requestService, rdbService, objectCache, halService);
 
-    this.createData = new CreateDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, notificationsService);
-    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
-    this.patchData = new PatchDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, comparator);
-    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.patchData = new PatchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
diff --git a/src/app/core/shared/search/search.service.ts b/src/app/core/shared/search/search.service.ts
index 1405e8b0ca..7911db026d 100644
--- a/src/app/core/shared/search/search.service.ts
+++ b/src/app/core/shared/search/search.service.ts
@@ -42,10 +42,8 @@ import { BaseDataService } from '../../data/base/base-data.service';
  * Therefore, equest/response handling methods won't work even though they're defined
  */
 class SearchDataService extends BaseDataService<any> {
-  protected linkPath = 'discover';
-
   constructor() {
-    super(undefined, undefined, undefined, undefined);
+    super('discover', undefined, undefined, undefined, undefined);
   }
 
   /**
diff --git a/src/app/core/statistics/usage-report-data.service.ts b/src/app/core/statistics/usage-report-data.service.ts
index afb183ffaa..fde8298488 100644
--- a/src/app/core/statistics/usage-report-data.service.ts
+++ b/src/app/core/statistics/usage-report-data.service.ts
@@ -22,8 +22,6 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(USAGE_REPORT)
 export class UsageReportDataService extends IdentifiableDataService<UsageReport> implements SearchData<UsageReport> {
-  protected linkPath = 'usagereports';
-
   private searchData: SearchDataImpl<UsageReport>;
 
   constructor(
@@ -32,9 +30,9 @@ export class UsageReportDataService extends IdentifiableDataService<UsageReport>
     protected halService: HALEndpointService,
     protected objectCache: ObjectCacheService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('usagereports', requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   getStatistic(scope: string, type: string): Observable<UsageReport> {
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 df3b19b502..976f2acf90 100644
--- a/src/app/core/submission/submission-cc-license-data.service.ts
+++ b/src/app/core/submission/submission-cc-license-data.service.ts
@@ -17,6 +17,7 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(SUBMISSION_CC_LICENSE)
 export class SubmissionCcLicenseDataService extends BaseDataService<SubmissionCcLicence> implements FindAllData<SubmissionCcLicence> {
+
   protected linkPath = 'submissioncclicenses';
 
   constructor(
@@ -25,7 +26,7 @@ export class SubmissionCcLicenseDataService extends BaseDataService<SubmissionCc
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('submissioncclicenses', requestService, rdbService, objectCache, halService);
   }
 
   /**
diff --git a/src/app/core/submission/submission-cc-license-url-data.service.ts b/src/app/core/submission/submission-cc-license-url-data.service.ts
index 276112cbbd..3934ea7cb2 100644
--- a/src/app/core/submission/submission-cc-license-url-data.service.ts
+++ b/src/app/core/submission/submission-cc-license-url-data.service.ts
@@ -20,8 +20,6 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(SUBMISSION_CC_LICENSE_URL)
 export class SubmissionCcLicenseUrlDataService extends BaseDataService<SubmissionCcLicenceUrl> implements SearchData<SubmissionCcLicenceUrl> {
-  protected linkPath = 'submissioncclicenseUrls-search';
-
   private searchData: SearchData<SubmissionCcLicenceUrl>;
 
   constructor(
@@ -30,9 +28,9 @@ export class SubmissionCcLicenseUrlDataService extends BaseDataService<Submissio
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('submissioncclicenseUrls-search', requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, (href, searchMethod) => `${href}/${searchMethod}`);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive, (href, searchMethod) => `${href}/${searchMethod}`);
   }
 
   /**
diff --git a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
index 412e9819e4..ab7646042e 100644
--- a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
@@ -28,8 +28,6 @@ import { dataService } from '../../data/base/data-service.decorator';
 @Injectable()
 @dataService(VOCABULARY_ENTRY_DETAIL)
 export class VocabularyEntryDetailsDataService extends IdentifiableDataService<VocabularyEntryDetail> implements FindAllData<VocabularyEntryDetail>, SearchData<VocabularyEntryDetail> {
-  protected linkPath = 'vocabularyEntryDetails';
-
   private findAllData: FindAllData<VocabularyEntryDetail>;
   private searchData: SearchData<VocabularyEntryDetail>;
 
@@ -39,10 +37,10 @@ export class VocabularyEntryDetailsDataService extends IdentifiableDataService<V
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('vocabularyEntryDetails', requestService, rdbService, objectCache, halService);
 
-    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
-    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
diff --git a/src/app/core/submission/vocabularies/vocabulary.data.service.ts b/src/app/core/submission/vocabularies/vocabulary.data.service.ts
index b2d6ce704b..ef642a6793 100644
--- a/src/app/core/submission/vocabularies/vocabulary.data.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.data.service.ts
@@ -27,8 +27,6 @@ import { dataService } from '../../data/base/data-service.decorator';
 @Injectable()
 @dataService(VOCABULARY)
 export class VocabularyDataService extends IdentifiableDataService<Vocabulary> implements FindAllData<Vocabulary> {
-  protected linkPath = 'vocabularies';
-
   private findAllData: FindAllData<Vocabulary>;
 
   constructor(
@@ -37,9 +35,9 @@ export class VocabularyDataService extends IdentifiableDataService<Vocabulary> i
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('vocabularies', requestService, rdbService, objectCache, halService);
 
-    this.findAllData = new FindAllDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
diff --git a/src/app/core/submission/workflowitem-data.service.ts b/src/app/core/submission/workflowitem-data.service.ts
index de2ff884d8..c8cf9dd02f 100644
--- a/src/app/core/submission/workflowitem-data.service.ts
+++ b/src/app/core/submission/workflowitem-data.service.ts
@@ -29,9 +29,8 @@ import { dataService } from '../data/base/data-service.decorator';
 @dataService(WorkflowItem.type)
 export class WorkflowItemDataService extends IdentifiableDataService<WorkflowItem> implements SearchData<WorkflowItem>, DeleteData<WorkflowItem> {
   protected linkPath = 'workflowitems';
-  protected responseMsToLive = 10 * 1000;
-
   protected searchByItemLinkPath = 'item';
+  protected responseMsToLive = 10 * 1000;
 
   private searchData: SearchDataImpl<WorkflowItem>;
   private deleteData: DeleteDataImpl<WorkflowItem>;
@@ -43,10 +42,10 @@ export class WorkflowItemDataService extends IdentifiableDataService<WorkflowIte
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('workspaceitems', requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
-    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
diff --git a/src/app/core/submission/workspaceitem-data.service.ts b/src/app/core/submission/workspaceitem-data.service.ts
index a13fbfcd89..f285fb6eca 100644
--- a/src/app/core/submission/workspaceitem-data.service.ts
+++ b/src/app/core/submission/workspaceitem-data.service.ts
@@ -23,8 +23,6 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(WorkspaceItem.type)
 export class WorkspaceitemDataService extends IdentifiableDataService<WorkspaceItem> implements SearchData<WorkspaceItem>, DeleteData<WorkspaceItem> {
-  protected linkPath = 'workspaceitems';
-
   protected searchByItemLinkPath = 'item';
 
   private searchData: SearchDataImpl<WorkspaceItem>;
@@ -37,10 +35,10 @@ export class WorkspaceitemDataService extends IdentifiableDataService<WorkspaceI
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('workspaceitems', requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService);
-    this.deleteData = new DeleteDataImpl(this.linkPath, this.responseMsToLive, this.constructIdEndpoint, requestService, rdbService, objectCache, halService, notificationsService);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
diff --git a/src/app/core/tasks/claimed-task-data.service.ts b/src/app/core/tasks/claimed-task-data.service.ts
index 5b8ac0c7fc..4e5c43c146 100644
--- a/src/app/core/tasks/claimed-task-data.service.ts
+++ b/src/app/core/tasks/claimed-task-data.service.ts
@@ -22,8 +22,6 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(CLAIMED_TASK)
 export class ClaimedTaskDataService extends TasksService<ClaimedTask> {
-  protected linkPath = 'claimedtasks';
-  protected responseMsToLive = 1000;
 
   /**
    * Initialize instance variables
@@ -39,7 +37,7 @@ export class ClaimedTaskDataService extends TasksService<ClaimedTask> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('claimedtasks', requestService, rdbService, objectCache, halService, 1000);
   }
 
   /**
diff --git a/src/app/core/tasks/pool-task-data.service.ts b/src/app/core/tasks/pool-task-data.service.ts
index 3464b570e9..ec44184934 100644
--- a/src/app/core/tasks/pool-task-data.service.ts
+++ b/src/app/core/tasks/pool-task-data.service.ts
@@ -20,9 +20,6 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(POOL_TASK)
 export class PoolTaskDataService extends TasksService<PoolTask> {
-  protected linkPath = 'pooltasks';
-  protected responseMsToLive = 1000;
-
   /**
    * Initialize instance variables
    *
@@ -37,7 +34,7 @@ export class PoolTaskDataService extends TasksService<PoolTask> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('pooltasks', requestService, rdbService, objectCache, halService, 1000);
   }
 
   /**
diff --git a/src/app/core/tasks/tasks.service.spec.ts b/src/app/core/tasks/tasks.service.spec.ts
index 9357fd4ef2..5d9d57a11e 100644
--- a/src/app/core/tasks/tasks.service.spec.ts
+++ b/src/app/core/tasks/tasks.service.spec.ts
@@ -35,7 +35,7 @@ class TestService extends TasksService<TestTask> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super('testtasks', requestService, rdbService, objectCache, halService);
   }
 }
 
diff --git a/src/app/core/tasks/tasks.service.ts b/src/app/core/tasks/tasks.service.ts
index 4a711f9c8b..c2112d8e80 100644
--- a/src/app/core/tasks/tasks.service.ts
+++ b/src/app/core/tasks/tasks.service.ts
@@ -26,14 +26,16 @@ export abstract class TasksService<T extends CacheableObject> extends Identifiab
   private searchData: SearchData<T>;
 
   protected constructor(
+    protected linkPath: string,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
+    protected responseMsToLive?: number,
   ) {
-    super(requestService, rdbService, objectCache, halService);
+    super(linkPath, requestService, rdbService, objectCache, halService);
 
-    this.searchData = new SearchDataImpl<T>(this.linkPath, this.responseMsToLive, requestService, rdbService, objectCache, halService, );
+    this.searchData = new SearchDataImpl<T>(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**

From c32e4ad7c794ce76b7441411abcf6139f1898b90 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Mon, 12 Sep 2022 14:15:28 +0200
Subject: [PATCH 38/48] 93803: Add tests for create, search & put

---
 src/app/core/data/base/create-data.spec.ts | 119 ++++++++++++++---
 src/app/core/data/base/put-data.spec.ts    |  70 +++++++---
 src/app/core/data/base/search-data.spec.ts | 141 +++++++++++----------
 src/app/core/data/base/search-data.ts      |   2 +-
 4 files changed, 229 insertions(+), 103 deletions(-)

diff --git a/src/app/core/data/base/create-data.spec.ts b/src/app/core/data/base/create-data.spec.ts
index ceefd3c51d..0ae31e37ab 100644
--- a/src/app/core/data/base/create-data.spec.ts
+++ b/src/app/core/data/base/create-data.spec.ts
@@ -16,10 +16,11 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
 import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { TestScheduler } from 'rxjs/testing';
 import { RemoteData } from '../remote-data';
 import { RequestEntryState } from '../request-entry-state.model';
+import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { RestRequestMethod } from '../rest-request-method';
 
 const endpoint = 'https://rest.api/core';
 
@@ -31,10 +32,10 @@ class TestService extends CreateDataImpl<any> {
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super(undefined, requestService, rdbService, objectCache, halService, notificationsService, undefined);
+    super('test', requestService, rdbService, objectCache, halService, notificationsService, undefined);
   }
 
-  public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+  public getEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
     return observableOf(endpoint);
   }
 }
@@ -46,10 +47,14 @@ describe('CreateDataImpl', () => {
   let rdbService;
   let objectCache;
   let notificationsService;
-  let selfLink;
-  let linksToFollow;
-  let testScheduler;
   let remoteDataMocks;
+  let obj;
+
+  let MOCK_SUCCEEDED_RD;
+  let MOCK_FAILED_RD;
+
+  let buildFromRequestUUIDSpy: jasmine.Spy;
+  let createOnEndpointSpy: jasmine.Spy;
 
   function initTestService(): TestService {
     requestService = getMockRequestService();
@@ -67,19 +72,14 @@ describe('CreateDataImpl', () => {
         /* empty */
       },
     } as any;
-    notificationsService = {} as NotificationsService;
-    selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
-    linksToFollow = [
-      followLink('a'),
-      followLink('b'),
-    ];
-
-    testScheduler = new TestScheduler((actual, expected) => {
-      // asserting the two objects are equal
-      // e.g. using chai.
-      expect(actual).toEqual(expected);
+    notificationsService = jasmine.createSpyObj('notificationsService', {
+      error: undefined,
     });
 
+    obj = {
+      uuid: '1698f1d3-be98-4c51-9fd8-6bfedcbd59b7',
+    };
+
     const timeStamp = new Date().getTime();
     const msToLive = 15 * 60 * 1000;
     const payload = { foo: 'bar' };
@@ -106,7 +106,88 @@ describe('CreateDataImpl', () => {
 
   beforeEach(() => {
     service = initTestService();
+
+    buildFromRequestUUIDSpy = spyOn(rdbService, 'buildFromRequestUUID').and.callThrough();
+    createOnEndpointSpy = spyOn(service, 'createOnEndpoint').and.callThrough();
+
+    MOCK_SUCCEEDED_RD = createSuccessfulRemoteDataObject({});
+    MOCK_FAILED_RD = createFailedRemoteDataObject('something went wrong');
   });
 
-  // todo: add specs (there were no ceate specs in original DataService suite!)
+  describe('create', () => {
+    it('should POST the object to the root endpoint with the given parameters and return the remote data', (done) => {
+      const params = [
+        new RequestParam('abc', 123), new RequestParam('def', 456)
+      ];
+      buildFromRequestUUIDSpy.and.returnValue(observableOf(remoteDataMocks.Success));
+
+      service.create(obj, ...params).subscribe(out => {
+        expect(createOnEndpointSpy).toHaveBeenCalledWith(obj, jasmine.anything());
+        expect(requestService.send).toHaveBeenCalledWith(jasmine.objectContaining({
+          method: RestRequestMethod.POST,
+          uuid: requestService.generateRequestId(),
+          href: 'https://rest.api/core?abc=123&def=456',
+          body: JSON.stringify(obj),
+        }));
+        expect(buildFromRequestUUIDSpy).toHaveBeenCalledWith(requestService.generateRequestId());
+        expect(out).toEqual(remoteDataMocks.Success);
+        done();
+      });
+    });
+  });
+
+  describe('createOnEndpoint', () => {
+    beforeEach(() => {
+      buildFromRequestUUIDSpy.and.returnValue(observableOf(remoteDataMocks.Success));
+    });
+
+    it('should send a POST request with the object as JSON', (done) => {
+      service.createOnEndpoint(obj, observableOf('https://rest.api/core/custom?search')).subscribe(out => {
+        expect(requestService.send).toHaveBeenCalledWith(jasmine.objectContaining({
+          method: RestRequestMethod.POST,
+          body: JSON.stringify(obj),
+        }));
+        done();
+      });
+    });
+
+    it('should send the POST request to the given endpoint', (done) => {
+
+      service.createOnEndpoint(obj, observableOf('https://rest.api/core/custom?search')).subscribe(out => {
+        expect(requestService.send).toHaveBeenCalledWith(jasmine.objectContaining({
+          method: RestRequestMethod.POST,
+          href: 'https://rest.api/core/custom?search',
+        }));
+        done();
+      });
+    });
+
+    it('should return the remote data for the sent request', (done) => {
+      service.createOnEndpoint(obj, observableOf('https://rest.api/core/custom?search')).subscribe(out => {
+        expect(requestService.send).toHaveBeenCalledWith(jasmine.objectContaining({
+          method: RestRequestMethod.POST,
+          uuid: requestService.generateRequestId(),
+        }));
+        expect(buildFromRequestUUIDSpy).toHaveBeenCalledWith(requestService.generateRequestId());
+        expect(notificationsService.error).not.toHaveBeenCalled();
+        expect(out).toEqual(remoteDataMocks.Success);
+        done();
+      });
+    });
+
+    it('should show an error notification if the request fails', (done) => {
+      buildFromRequestUUIDSpy.and.returnValue(observableOf(remoteDataMocks.Error));
+
+      service.createOnEndpoint(obj, observableOf('https://rest.api/core/custom?search')).subscribe(out => {
+        expect(requestService.send).toHaveBeenCalledWith(jasmine.objectContaining({
+          method: RestRequestMethod.POST,
+          uuid: requestService.generateRequestId(),
+        }));
+        expect(buildFromRequestUUIDSpy).toHaveBeenCalledWith(requestService.generateRequestId());
+        expect(notificationsService.error).toHaveBeenCalled();
+        expect(out).toEqual(remoteDataMocks.Error);
+        done();
+      });
+    });
+  });
 });
diff --git a/src/app/core/data/base/put-data.spec.ts b/src/app/core/data/base/put-data.spec.ts
index 01b5caea5b..5e2f836776 100644
--- a/src/app/core/data/base/put-data.spec.ts
+++ b/src/app/core/data/base/put-data.spec.ts
@@ -15,11 +15,11 @@ import { Observable, of as observableOf } from 'rxjs';
 import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
 import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { TestScheduler } from 'rxjs/testing';
 import { RemoteData } from '../remote-data';
 import { RequestEntryState } from '../request-entry-state.model';
 import { PutDataImpl } from './put-data';
+import { RestRequestMethod } from '../rest-request-method';
+import { DSpaceObject } from '../../shared/dspace-object.model';
 
 const endpoint = 'https://rest.api/core';
 
@@ -45,10 +45,11 @@ describe('PutDataImpl', () => {
   let rdbService;
   let objectCache;
   let selfLink;
-  let linksToFollow;
-  let testScheduler;
   let remoteDataMocks;
 
+  let obj;
+  let buildFromRequestUUIDSpy: jasmine.Spy;
+
   function initTestService(): TestService {
     requestService = getMockRequestService();
     halService = new HALEndpointServiceStub('url') as any;
@@ -66,16 +67,6 @@ describe('PutDataImpl', () => {
       },
     } as any;
     selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
-    linksToFollow = [
-      followLink('a'),
-      followLink('b'),
-    ];
-
-    testScheduler = new TestScheduler((actual, expected) => {
-      // asserting the two objects are equal
-      // e.g. using chai.
-      expect(actual).toEqual(expected);
-    });
 
     const timeStamp = new Date().getTime();
     const msToLive = 15 * 60 * 1000;
@@ -102,7 +93,56 @@ describe('PutDataImpl', () => {
 
   beforeEach(() => {
     service = initTestService();
+
+    obj = Object.assign(new DSpaceObject(), {
+      uuid: '1698f1d3-be98-4c51-9fd8-6bfedcbd59b7',
+      metadata: {           // recognized properties will be serialized
+        ['dc.title']: [
+          { language: 'en', value: 'some object' },
+        ]
+      },
+      data: [ 1, 2, 3, 4 ], // unrecognized properties won't be serialized
+      _links: { self: { href: selfLink } },
+    });
+
+
+    buildFromRequestUUIDSpy = spyOn(rdbService, 'buildFromRequestUUID').and.returnValue(observableOf(remoteDataMocks.Success));
   });
 
-  // todo: add specs (there were no put specs in original DataService suite!)
+  describe('put', () => {
+    it('should send a PUT request with the serialized object', (done) => {
+      service.put(obj).subscribe(() => {
+        expect(requestService.send).toHaveBeenCalledWith(jasmine.objectContaining({
+          method: RestRequestMethod.PUT,
+          body: {  // _links are not serialized
+            uuid: obj.uuid,
+            metadata: obj.metadata
+          },
+        }));
+        done();
+      });
+    });
+
+    it('should send the PUT request to the object\'s self link', (done) => {
+      service.put(obj).subscribe(() => {
+        expect(requestService.send).toHaveBeenCalledWith(jasmine.objectContaining({
+          method: RestRequestMethod.PUT,
+          href: selfLink,
+        }));
+        done();
+      });
+    });
+
+    it('should return the remote data for the sent request', (done) => {
+      service.put(obj).subscribe(out => {
+        expect(requestService.send).toHaveBeenCalledWith(jasmine.objectContaining({
+          method: RestRequestMethod.PUT,
+          uuid: requestService.generateRequestId(),
+        }));
+        expect(buildFromRequestUUIDSpy).toHaveBeenCalledWith(requestService.generateRequestId());
+        expect(out).toEqual(remoteDataMocks.Success);
+        done();
+      });
+    });
+  });
 });
diff --git a/src/app/core/data/base/search-data.spec.ts b/src/app/core/data/base/search-data.spec.ts
index 7abf26b5b8..37ad589740 100644
--- a/src/app/core/data/base/search-data.spec.ts
+++ b/src/app/core/data/base/search-data.spec.ts
@@ -5,21 +5,13 @@
  *
  * http://www.dspace.org/license/
  */
-import { SearchData, SearchDataImpl } from './search-data';
-import createSpyObj = jasmine.createSpyObj;
+import { constructSearchEndpointDefault, SearchData, SearchDataImpl } from './search-data';
 import { FindListOptions } from '../find-list-options.model';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { RequestService } from '../request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../../cache/object-cache.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { Observable, of as observableOf } from 'rxjs';
+import { of as observableOf } from 'rxjs';
 import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
-import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
 import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
-import { TestScheduler } from 'rxjs/testing';
-import { RemoteData } from '../remote-data';
-import { RequestEntryState } from '../request-entry-state.model';
+import createSpyObj = jasmine.createSpyObj;
 
 /**
  * Tests whether calls to `SearchData` methods are correctly patched through in a concrete data service that implements it
@@ -61,80 +53,42 @@ export function testSearchDataImplementation(service: SearchData<any>, methods =
 
 const endpoint = 'https://rest.api/core';
 
-class TestService extends SearchDataImpl<any> {
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-  ) {
-    super(undefined, requestService, rdbService, objectCache, halService, undefined);
-  }
-
-  public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
-    return observableOf(endpoint);
-  }
-}
-
 describe('SearchDataImpl', () => {
-  let service: TestService;
+  let service: SearchDataImpl<any>;
   let requestService;
   let halService;
   let rdbService;
-  let objectCache;
-  let selfLink;
   let linksToFollow;
-  let testScheduler;
-  let remoteDataMocks;
 
-  function initTestService(): TestService {
+  let constructSearchEndpointSpy;
+  let options;
+
+  function initTestService(): SearchDataImpl<any> {
     requestService = getMockRequestService();
-    halService = new HALEndpointServiceStub('url') as any;
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: observableOf(endpoint),
+    });
     rdbService = getMockRemoteDataBuildService();
-    objectCache = {
-
-      addPatch: () => {
-        /* empty */
-      },
-      getObjectBySelfLink: () => {
-        /* empty */
-      },
-      getByHref: () => {
-        /* empty */
-      },
-    } as any;
-    selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
     linksToFollow = [
       followLink('a'),
       followLink('b'),
     ];
 
-    testScheduler = new TestScheduler((actual, expected) => {
-      // asserting the two objects are equal
-      // e.g. using chai.
-      expect(actual).toEqual(expected);
+    constructSearchEndpointSpy = jasmine.createSpy('constructSearchEndpointSpy').and.callFake(constructSearchEndpointDefault);
+
+    options = Object.assign(new FindListOptions(), {
+      elementsPerPage: 5,
+      currentPage: 3,
     });
 
-    const timeStamp = new Date().getTime();
-    const msToLive = 15 * 60 * 1000;
-    const payload = { foo: 'bar' };
-    const statusCodeSuccess = 200;
-    const statusCodeError = 404;
-    const errorMessage = 'not found';
-    remoteDataMocks = {
-      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
-      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
-      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
-      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
-      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
-      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
-    };
-
-    return new TestService(
+    return new SearchDataImpl(
+      'test',
       requestService,
       rdbService,
-      objectCache,
+      undefined,
       halService,
+      undefined,
+      constructSearchEndpointSpy,
     );
   }
 
@@ -142,5 +96,56 @@ describe('SearchDataImpl', () => {
     service = initTestService();
   });
 
-  // todo: add specs (there were no search specs in original DataService suite!)
+  describe('getSearchEndpoint', () => {
+    it('should return the search endpoint for the given method', (done) => {
+      (service as any).getSearchEndpoint('testMethod').subscribe(searchEndpoint => {
+        expect(halService.getEndpoint).toHaveBeenCalledWith('test');
+        expect(searchEndpoint).toBe('https://rest.api/core/search/testMethod');
+        done();
+      });
+    });
+
+    it('should use constructSearchEndpoint to construct the search endpoint', (done) => {
+      (service as any).getSearchEndpoint('testMethod').subscribe(() => {
+        expect(constructSearchEndpointSpy).toHaveBeenCalledWith('https://rest.api/core', 'testMethod');
+        done();
+      });
+    });
+  });
+
+  describe('getSearchByHref', () => {
+    beforeEach(() => {
+      spyOn(service as any, 'getSearchEndpoint').and.callThrough();
+      spyOn(service, 'buildHrefFromFindOptions').and.callThrough();
+    });
+
+    it('should return the search endpoint with additional query parameters', (done) => {
+      service.getSearchByHref('testMethod', options, ...linksToFollow).subscribe(href => {
+        expect((service as any).getSearchEndpoint).toHaveBeenCalledWith('testMethod');
+        expect(service.buildHrefFromFindOptions).toHaveBeenCalledWith(
+          'https://rest.api/core/search/testMethod',
+          options,
+          [],
+          ...linksToFollow,
+        );
+
+        expect(href).toBe('https://rest.api/core/search/testMethod?page=2&size=5&embed=a&embed=b');
+
+        done();
+      });
+    });
+  });
+
+  describe('searchBy', () => {
+    it('should patch getSearchEndpoint into findListByHref and return the result', () => {
+      spyOn(service, 'getSearchByHref').and.returnValue('endpoint' as any);
+      spyOn(service, 'findListByHref').and.returnValue('resulting remote data' as any);
+
+      const out: any = service.searchBy('testMethod', options, false, true, ...linksToFollow);
+
+      expect(service.getSearchByHref).toHaveBeenCalledWith('testMethod', options, ...linksToFollow);
+      expect(service.findListByHref).toHaveBeenCalledWith('endpoint', undefined, false, true);
+      expect(out).toBe('resulting remote data');
+    });
+  });
 });
diff --git a/src/app/core/data/base/search-data.ts b/src/app/core/data/base/search-data.ts
index 12cae77c3a..ba8fac9888 100644
--- a/src/app/core/data/base/search-data.ts
+++ b/src/app/core/data/base/search-data.ts
@@ -110,7 +110,7 @@ export class SearchDataImpl<T extends CacheableObject> extends BaseDataService<T
   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.findListByHref(hrefObs, undefined, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+    return this.findListByHref(hrefObs, undefined, useCachedVersionIfAvailable, reRequestOnStale);
   }
 
   /**

From 8b4dbbad55265ba61c4995b65db14c4984bbc0be Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Mon, 12 Sep 2022 17:34:25 +0200
Subject: [PATCH 39/48] 93219: Simplify DataService feature interfaces

Get rid of optional methods
- createPatchFromCache is useful -> make required
- leave getFindAllHref and getSearchByHref out & use implementation directly or refactor usages
---
 src/app/core/data/base/find-all-data.ts       | 11 ------
 src/app/core/data/base/patch-data.ts          |  2 +-
 src/app/core/data/base/search-data.ts         | 11 ------
 src/app/core/data/bitstream-data.service.ts   |  9 +++++
 src/app/core/data/bundle-data.service.ts      |  8 +++++
 src/app/core/data/comcol-data.service.ts      | 35 +++++--------------
 src/app/core/data/community-data.service.ts   |  7 ++--
 src/app/core/data/item-data.service.ts        |  8 +++++
 .../core/data/metadata-field-data.service.ts  | 13 -------
 .../core/data/relationship-data.service.ts    | 13 -------
 src/app/core/data/version-data.service.ts     | 10 ++++++
 .../core/eperson/eperson-data.service.spec.ts |  8 ++---
 src/app/core/eperson/eperson-data.service.ts  | 31 ++++++++--------
 src/app/core/eperson/group-data.service.ts    |  6 +---
 .../submission-cc-license-url-data.service.ts | 17 ++-------
 .../vocabulary-entry-details.data.service.ts  | 26 --------------
 .../vocabularies/vocabulary.data.service.ts   | 13 -------
 .../vocabularies/vocabulary.service.spec.ts   |  6 ++--
 .../vocabularies/vocabulary.service.ts        |  6 ++--
 .../workflowitem-data.service.spec.ts         |  2 +-
 .../submission/workflowitem-data.service.ts   | 15 +-------
 src/app/core/tasks/tasks.service.spec.ts      |  4 +--
 src/app/core/tasks/tasks.service.ts           | 17 ++-------
 23 files changed, 86 insertions(+), 192 deletions(-)

diff --git a/src/app/core/data/base/find-all-data.ts b/src/app/core/data/base/find-all-data.ts
index c2330af243..57884e537e 100644
--- a/src/app/core/data/base/find-all-data.ts
+++ b/src/app/core/data/base/find-all-data.ts
@@ -39,17 +39,6 @@ export interface FindAllData<T extends CacheableObject> {
    *    Return an observable that emits object list
    */
   findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>>;
-
-  /**
-   * 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
-   */
-  getFindAllHref?(options: FindListOptions, linkPath?: string, ...linksToFollow: FollowLinkConfig<T>[]): Observable<string>;
 }
 
 /**
diff --git a/src/app/core/data/base/patch-data.ts b/src/app/core/data/base/patch-data.ts
index 558de928c4..732f71636e 100644
--- a/src/app/core/data/base/patch-data.ts
+++ b/src/app/core/data/base/patch-data.ts
@@ -50,7 +50,7 @@ export interface PatchData<T extends CacheableObject> {
    * Return a list of operations representing the difference between an object and its latest value in the cache.
    * @param object  the object to resolve to a list of patch operations
    */
-  createPatchFromCache?(object: T): Observable<Operation[]>;
+  createPatchFromCache(object: T): Observable<Operation[]>;
 }
 
 /**
diff --git a/src/app/core/data/base/search-data.ts b/src/app/core/data/base/search-data.ts
index ba8fac9888..751bff5c3a 100644
--- a/src/app/core/data/base/search-data.ts
+++ b/src/app/core/data/base/search-data.ts
@@ -48,17 +48,6 @@ export interface SearchData<T extends CacheableObject> {
    *    Return an observable that emits response from the server
    */
   searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>>;
-
-  /**
-   * 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
-   */
-  getSearchByHref?(searchMethod: string, options?: FindListOptions, ...linksToFollow: FollowLinkConfig<T>[]): Observable<string>;
 }
 
 /**
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index 0e0c939d9e..6bdcefe187 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -33,6 +33,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { NoContent } from '../shared/NoContent.model';
 import { IdentifiableDataService } from './base/identifiable-data.service';
 import { dataService } from './base/data-service.decorator';
+import { Operation } from 'fast-json-patch';
 
 /**
  * A service to retrieve {@link Bitstream}s from the REST API
@@ -244,6 +245,14 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
     return this.patchData.update(object);
   }
 
+  /**
+   * Return a list of operations representing the difference between an object and its latest value in the cache.
+   * @param object  the object to resolve to a list of patch operations
+   */
+  public createPatchFromCache(object: Bitstream): Observable<Operation[]> {
+    return this.patchData.createPatchFromCache(object);
+  }
+
   /**
    * Delete an existing object on the server
    * @param   objectId The id of the object to be removed
diff --git a/src/app/core/data/bundle-data.service.ts b/src/app/core/data/bundle-data.service.ts
index e85c0c2bee..19f0e73706 100644
--- a/src/app/core/data/bundle-data.service.ts
+++ b/src/app/core/data/bundle-data.service.ts
@@ -167,4 +167,12 @@ export class BundleDataService extends IdentifiableDataService<Bundle> implement
   public update(object: Bundle): Observable<RemoteData<Bundle>> {
     return this.patchData.update(object);
   }
+
+  /**
+   * Return a list of operations representing the difference between an object and its latest value in the cache.
+   * @param object  the object to resolve to a list of patch operations
+   */
+  public createPatchFromCache(object: Bundle): Observable<Operation[]> {
+    return this.patchData.createPatchFromCache(object);
+  }
 }
diff --git a/src/app/core/data/comcol-data.service.ts b/src/app/core/data/comcol-data.service.ts
index 6392f389b6..abc9046cd0 100644
--- a/src/app/core/data/comcol-data.service.ts
+++ b/src/app/core/data/comcol-data.service.ts
@@ -28,6 +28,7 @@ import { RequestService } from './request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
+import { Operation } from 'fast-json-patch';
 
 export abstract class ComColDataService<T extends Community | Collection> extends IdentifiableDataService<T> implements CreateData<T>, FindAllData<T>, SearchData<T>, PatchData<T>, DeleteData<T> {
   private createData: CreateData<T>;
@@ -191,32 +192,6 @@ export abstract class ComColDataService<T extends Community | Collection> extend
     return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
-  /**
-   * 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> {
-    return this.findAllData.getFindAllHref(options, linkPath, ...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> {
-    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
-  }
-
   /**
    * Make a new FindListRequest with given search method
    *
@@ -261,6 +236,14 @@ export abstract class ComColDataService<T extends Community | Collection> extend
     return this.patchData.update(object);
   }
 
+  /**
+   * Return a list of operations representing the difference between an object and its latest value in the cache.
+   * @param object  the object to resolve to a list of patch operations
+   */
+  public createPatchFromCache(object: T): Observable<Operation[]> {
+    return this.patchData.createPatchFromCache(object);
+  }
+
   /**
    * Delete an existing object on the server
    * @param   objectId The id of the object to be removed
diff --git a/src/app/core/data/community-data.service.ts b/src/app/core/data/community-data.service.ts
index 8623d414b2..efb6d50e84 100644
--- a/src/app/core/data/community-data.service.ts
+++ b/src/app/core/data/community-data.service.ts
@@ -36,13 +36,16 @@ export class CommunityDataService extends ComColDataService<Community> {
     super('communities', requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
   }
 
+  // this method is overridden in order to make it public
   getEndpoint() {
     return this.halService.getEndpoint(this.linkPath);
   }
 
   findTop(options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<Community>[]): Observable<RemoteData<PaginatedList<Community>>> {
-    const hrefObs = this.getFindAllHref(options, this.topLinkPath);
-    return this.findListByHref(hrefObs, undefined, true, true, ...linksToFollow);
+    return this.getEndpoint().pipe(
+      map(href => `${href}/search/top`),
+      switchMap(href => this.findListByHref(href, options, true, true, ...linksToFollow))
+    );
   }
 
   protected getFindByParentHref(parentUUID: string): Observable<string> {
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index 11179d1e77..09268a0282 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -345,6 +345,14 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
     return this.patchData.update(object);
   }
 
+  /**
+   * Return a list of operations representing the difference between an object and its latest value in the cache.
+   * @param object  the object to resolve to a list of patch operations
+   */
+  public createPatchFromCache(object: Item): Observable<Operation[]> {
+    return this.patchData.createPatchFromCache(object);
+  }
+
   /**
    * Delete an existing object on the server
    * @param   objectId The id of the object to be removed
diff --git a/src/app/core/data/metadata-field-data.service.ts b/src/app/core/data/metadata-field-data.service.ts
index db9361ee4c..d05e3533d3 100644
--- a/src/app/core/data/metadata-field-data.service.ts
+++ b/src/app/core/data/metadata-field-data.service.ts
@@ -165,19 +165,6 @@ export class MetadataFieldDataService extends IdentifiableDataService<MetadataFi
     return this.createData.create(object, ...params);
   }
 
-  /**
-   * 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<MetadataField>[]): Observable<string> {
-    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
-  }
-
   /**
    * Make a new FindListRequest with given search method
    *
diff --git a/src/app/core/data/relationship-data.service.ts b/src/app/core/data/relationship-data.service.ts
index cab6a1ae13..d14a609a96 100644
--- a/src/app/core/data/relationship-data.service.ts
+++ b/src/app/core/data/relationship-data.service.ts
@@ -546,17 +546,4 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
   searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Relationship>[]): Observable<RemoteData<PaginatedList<Relationship>>> {
     return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...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
-   */
-  getSearchByHref(searchMethod: string, options: FindListOptions, ...linksToFollow: FollowLinkConfig<Relationship>[]): Observable<string> {
-    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
-  }
 }
diff --git a/src/app/core/data/version-data.service.ts b/src/app/core/data/version-data.service.ts
index ee7bdb2028..67c249fe0a 100644
--- a/src/app/core/data/version-data.service.ts
+++ b/src/app/core/data/version-data.service.ts
@@ -17,6 +17,7 @@ import { RestRequestMethod } from './rest-request-method';
 import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { IdentifiableDataService } from './base/identifiable-data.service';
 import { dataService } from './base/data-service.decorator';
+import { Operation } from 'fast-json-patch';
 
 /**
  * Service responsible for handling requests related to the Version object
@@ -89,4 +90,13 @@ export class VersionDataService extends IdentifiableDataService<Version> impleme
   public commitUpdates(method?: RestRequestMethod): void {
     this.patchData.commitUpdates(method);
   }
+
+  /**
+   * Return a list of operations representing the difference between an object and its latest value in the cache.
+   * @param object  the object to resolve to a list of patch operations
+   */
+  public createPatchFromCache(object: Version): Observable<Operation[]> {
+    return this.patchData.createPatchFromCache(object);
+  }
+
 }
diff --git a/src/app/core/eperson/eperson-data.service.spec.ts b/src/app/core/eperson/eperson-data.service.spec.ts
index aa07194992..ce0b1f3ee4 100644
--- a/src/app/core/eperson/eperson-data.service.spec.ts
+++ b/src/app/core/eperson/eperson-data.service.spec.ts
@@ -118,24 +118,24 @@ describe('EPersonDataService', () => {
     });
 
     it('search email scope and no query', () => {
-      spyOn(service, 'getSearchByHref').and.returnValue(epersonsEndpoint);
+      spyOn((service as any).searchData, 'getSearchByHref').and.returnValue(epersonsEndpoint);
       spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(null));
       service.searchByScope('email', '');
       const options = Object.assign(new FindListOptions(), {
         searchParams: [Object.assign(new RequestParam('email', encodeURIComponent('')))]
       });
-      expect(service.getSearchByHref).toHaveBeenCalledWith('byEmail', options);
+      expect((service as any).searchData.getSearchByHref).toHaveBeenCalledWith('byEmail', options);
       expect(service.findByHref).toHaveBeenCalledWith(epersonsEndpoint, true, true);
     });
 
     it('search email scope with a query', () => {
-      spyOn(service, 'getSearchByHref').and.returnValue(epersonsEndpoint);
+      spyOn((service as any).searchData, 'getSearchByHref').and.returnValue(epersonsEndpoint);
       spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(EPersonMock));
       service.searchByScope('email', EPersonMock.email);
       const options = Object.assign(new FindListOptions(), {
         searchParams: [Object.assign(new RequestParam('email', encodeURIComponent(EPersonMock.email)))]
       });
-      expect(service.getSearchByHref).toHaveBeenCalledWith('byEmail', options);
+      expect((service as any).searchData.getSearchByHref).toHaveBeenCalledWith('byEmail', options);
       expect(service.findByHref).toHaveBeenCalledWith(epersonsEndpoint, true, true);
     });
   });
diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts
index 2313d2b20e..8f9312d732 100644
--- a/src/app/core/eperson/eperson-data.service.ts
+++ b/src/app/core/eperson/eperson-data.service.ts
@@ -45,7 +45,7 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
   protected searchByMetadataPath = 'byMetadata';
 
   private createData: CreateData<EPerson>;
-  private searchData: SearchData<EPerson>;
+  private searchData: SearchDataImpl<EPerson>;
   private patchData: PatchData<EPerson>;
   private deleteData: DeleteData<EPerson>;
 
@@ -128,7 +128,7 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
   public getEPersonByEmail(query: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<EPerson>[]): Observable<RemoteData<EPerson | NoContent>> {
     const findListOptions = new FindListOptions();
     findListOptions.searchParams = [new RequestParam('email', encodeURIComponent(query))];
-    const href$ = this.getSearchByHref(this.searchByEmailPath, findListOptions, ...linksToFollow);
+    const href$ = this.searchData.getSearchByHref(this.searchByEmailPath, findListOptions, ...linksToFollow);
     return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
@@ -363,19 +363,6 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
     return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...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
-   */
-  getSearchByHref(searchMethod: string, options?: FindListOptions, ...linksToFollow: FollowLinkConfig<EPerson>[]): Observable<string> {
-    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
-  }
-
   /**
    * Return a list of operations representing the difference between an object and its latest value in the cache.
    * @param object  the object to resolve to a list of patch operations
@@ -384,14 +371,28 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
     return this.patchData.createPatchFromCache(object);
   }
 
+  /**
+   * 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: EPerson, operations: Operation[]): Observable<RemoteData<EPerson>> {
     return this.patchData.patch(object, operations);
   }
 
+  /**
+   * 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: EPerson): Observable<RemoteData<EPerson>> {
     return this.patchData.update(object);
   }
 
+  /**
+   * Commit current object changes to the server
+   * @param method The RestRequestMethod for which de server sync buffer should be committed
+   */
   commitUpdates(method?: RestRequestMethod): void {
     this.patchData.commitUpdates(method);
   }
diff --git a/src/app/core/eperson/group-data.service.ts b/src/app/core/eperson/group-data.service.ts
index 6e6d1fbb9b..2ea3ffeef3 100644
--- a/src/app/core/eperson/group-data.service.ts
+++ b/src/app/core/eperson/group-data.service.ts
@@ -342,15 +342,11 @@ export class GroupDataService extends IdentifiableDataService<Group> {
     return this.createData.create(object, ...params);
   }
 
-  //
+
   searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Group>[]): Observable<RemoteData<PaginatedList<Group>>> {
     return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
-  getSearchByHref(searchMethod: string, options?: FindListOptions, ...linksToFollow: FollowLinkConfig<Group>[]): Observable<string> {
-    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
-  }
-
   public createPatchFromCache(object: Group): Observable<Operation[]> {
     return this.patchData.createPatchFromCache(object);
   }
diff --git a/src/app/core/submission/submission-cc-license-url-data.service.ts b/src/app/core/submission/submission-cc-license-url-data.service.ts
index 3934ea7cb2..3d5dedb505 100644
--- a/src/app/core/submission/submission-cc-license-url-data.service.ts
+++ b/src/app/core/submission/submission-cc-license-url-data.service.ts
@@ -20,7 +20,7 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(SUBMISSION_CC_LICENSE_URL)
 export class SubmissionCcLicenseUrlDataService extends BaseDataService<SubmissionCcLicenceUrl> implements SearchData<SubmissionCcLicenceUrl> {
-  private searchData: SearchData<SubmissionCcLicenceUrl>;
+  private searchData: SearchDataImpl<SubmissionCcLicenceUrl>;
 
   constructor(
     protected requestService: RequestService,
@@ -40,7 +40,7 @@ export class SubmissionCcLicenseUrlDataService extends BaseDataService<Submissio
    */
   getCcLicenseLink(ccLicense: SubmissionCcLicence, options: Map<Field, Option>): Observable<string> {
 
-    return this.getSearchByHref(
+    return this.searchData.getSearchByHref(
       'rightsByQuestions',{
         searchParams: [
           {
@@ -64,19 +64,6 @@ export class SubmissionCcLicenseUrlDataService extends BaseDataService<Submissio
     );
   }
 
-  /**
-   * 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<SubmissionCcLicenceUrl>[]): Observable<string> {
-    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
-  }
-
   /**
    * Make a new FindListRequest with given search method
    *
diff --git a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
index ab7646042e..184b4c1e97 100644
--- a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
@@ -43,19 +43,6 @@ export class VocabularyEntryDetailsDataService extends IdentifiableDataService<V
     this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
-  /**
-   * 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<VocabularyEntryDetail>[]): Observable<string> {
-    return this.findAllData.getFindAllHref(options, linkPath, ...linksToFollow);
-  }
-
   /**
    * Returns {@link RemoteData} of all object with a list of {@link FollowLinkConfig}, to indicate which embedded
    * info should be added to the objects
@@ -91,17 +78,4 @@ export class VocabularyEntryDetailsDataService extends IdentifiableDataService<V
   public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<VocabularyEntryDetail>[]): Observable<RemoteData<PaginatedList<VocabularyEntryDetail>>> {
     return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...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): Observable<string> {
-    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
-  }
 }
diff --git a/src/app/core/submission/vocabularies/vocabulary.data.service.ts b/src/app/core/submission/vocabularies/vocabulary.data.service.ts
index ef642a6793..a67b67ced7 100644
--- a/src/app/core/submission/vocabularies/vocabulary.data.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.data.service.ts
@@ -40,19 +40,6 @@ export class VocabularyDataService extends IdentifiableDataService<Vocabulary> i
     this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
-  /**
-   * 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<Vocabulary>[]): Observable<string> {
-    return this.findAllData.getFindAllHref(options, linkPath, ...linksToFollow);
-  }
-
   /**
    * Returns {@link RemoteData} of all object with a list of {@link FollowLinkConfig}, to indicate which embedded
    * info should be added to the objects
diff --git a/src/app/core/submission/vocabularies/vocabulary.service.spec.ts b/src/app/core/submission/vocabularies/vocabulary.service.spec.ts
index ed379c812a..faa5823520 100644
--- a/src/app/core/submission/vocabularies/vocabulary.service.spec.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.service.spec.ts
@@ -253,7 +253,7 @@ describe('VocabularyService', () => {
         spyOn((service as any).vocabularyDataService, 'findById').and.callThrough();
         spyOn((service as any).vocabularyDataService, 'findAll').and.callThrough();
         spyOn((service as any).vocabularyDataService, 'findByHref').and.callThrough();
-        spyOn((service as any).vocabularyDataService, 'getFindAllHref').and.returnValue(observableOf(entriesRequestURL));
+        spyOn((service as any).vocabularyDataService.findAllData, 'getFindAllHref').and.returnValue(observableOf(entriesRequestURL));
       });
 
       afterEach(() => {
@@ -421,8 +421,8 @@ describe('VocabularyService', () => {
       spyOn((service as any).vocabularyEntryDetailDataService, 'findByHref').and.callThrough();
       spyOn((service as any).vocabularyEntryDetailDataService, 'findListByHref').and.callThrough();
       spyOn((service as any).vocabularyEntryDetailDataService, 'searchBy').and.callThrough();
-      spyOn((service as any).vocabularyEntryDetailDataService, 'getSearchByHref').and.returnValue(observableOf(searchRequestURL));
-      spyOn((service as any).vocabularyEntryDetailDataService, 'getFindAllHref').and.returnValue(observableOf(entryDetailChildrenRequestURL));
+      spyOn((service as any).vocabularyEntryDetailDataService.searchData, 'getSearchByHref').and.returnValue(observableOf(searchRequestURL));
+      spyOn((service as any).vocabularyEntryDetailDataService.findAllData, 'getFindAllHref').and.returnValue(observableOf(entryDetailChildrenRequestURL));
       spyOn((service as any).vocabularyEntryDetailDataService, 'getBrowseEndpoint').and.returnValue(observableOf(entryDetailEndpointURL));
     });
 
diff --git a/src/app/core/submission/vocabularies/vocabulary.service.ts b/src/app/core/submission/vocabularies/vocabulary.service.ts
index d29b19d97b..4a0b161f68 100644
--- a/src/app/core/submission/vocabularies/vocabulary.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.service.ts
@@ -281,8 +281,10 @@ export class VocabularyService {
       pageInfo.elementsPerPage,
       pageInfo.currentPage
     );
-    return this.vocabularyEntryDetailDataService.getFindAllHref(options, linkPath).pipe(
-      mergeMap((href) => this.vocabularyEntryDetailDataService.findListByHref(href, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
+
+    return this.vocabularyEntryDetailDataService.getBrowseEndpoint().pipe(
+      map(href => `${href}/${name}:${value}/children`),
+      switchMap(href => this.vocabularyEntryDetailDataService.findListByHref(href, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow))
     );
   }
 
diff --git a/src/app/core/submission/workflowitem-data.service.spec.ts b/src/app/core/submission/workflowitem-data.service.spec.ts
index 7d1bcbb381..3f6ec54fda 100644
--- a/src/app/core/submission/workflowitem-data.service.spec.ts
+++ b/src/app/core/submission/workflowitem-data.service.spec.ts
@@ -118,7 +118,7 @@ describe('WorkflowItemDataService test', () => {
       service = initTestService();
 
       spyOn((service as any), 'findByHref').and.callThrough();
-      spyOn((service as any), 'getSearchByHref').and.returnValue(searchRequestURL$);
+      spyOn((service as any).searchData, 'getSearchByHref').and.returnValue(searchRequestURL$);
     });
 
     afterEach(() => {
diff --git a/src/app/core/submission/workflowitem-data.service.ts b/src/app/core/submission/workflowitem-data.service.ts
index c8cf9dd02f..47d18470d3 100644
--- a/src/app/core/submission/workflowitem-data.service.ts
+++ b/src/app/core/submission/workflowitem-data.service.ts
@@ -108,23 +108,10 @@ export class WorkflowItemDataService extends IdentifiableDataService<WorkflowIte
   public findByItem(uuid: string, useCachedVersionIfAvailable = false, reRequestOnStale = true, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<WorkspaceItem>[]): Observable<RemoteData<WorkspaceItem>> {
     const findListOptions = new FindListOptions();
     findListOptions.searchParams = [new RequestParam('uuid', encodeURIComponent(uuid))];
-    const href$ = this.getSearchByHref(this.searchByItemLinkPath, findListOptions, ...linksToFollow);
+    const href$ = this.searchData.getSearchByHref(this.searchByItemLinkPath, findListOptions, ...linksToFollow);
     return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...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): Observable<string> {
-    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
-  }
-
   /**
    * Make a new FindListRequest with given search method
    *
diff --git a/src/app/core/tasks/tasks.service.spec.ts b/src/app/core/tasks/tasks.service.spec.ts
index 5d9d57a11e..88b573e098 100644
--- a/src/app/core/tasks/tasks.service.spec.ts
+++ b/src/app/core/tasks/tasks.service.spec.ts
@@ -111,7 +111,7 @@ describe('TasksService', () => {
 
     it('should call findByHref with the href generated by getSearchByHref', () => {
 
-      spyOn(service, 'getSearchByHref').and.returnValue(observableOf('generatedHref'));
+      spyOn((service as any).searchData, 'getSearchByHref').and.returnValue(observableOf('generatedHref'));
       spyOn(service, 'findByHref').and.returnValue(observableOf(null));
 
       const followLinks = {};
@@ -121,7 +121,7 @@ describe('TasksService', () => {
       scheduler.schedule(() => service.searchTask('method', options, followLinks as any).subscribe());
       scheduler.flush();
 
-      expect(service.getSearchByHref).toHaveBeenCalledWith('method', options, followLinks as any);
+      expect((service as any).searchData.getSearchByHref).toHaveBeenCalledWith('method', options, followLinks as any);
       expect(service.findByHref).toHaveBeenCalledWith('generatedHref', false, true);
     });
   });
diff --git a/src/app/core/tasks/tasks.service.ts b/src/app/core/tasks/tasks.service.ts
index c2112d8e80..aaad31af21 100644
--- a/src/app/core/tasks/tasks.service.ts
+++ b/src/app/core/tasks/tasks.service.ts
@@ -23,7 +23,7 @@ import { IdentifiableDataService } from '../data/base/identifiable-data.service'
  * An abstract class that provides methods to handle task requests.  todo: data in name
  */
 export abstract class TasksService<T extends CacheableObject> extends IdentifiableDataService<T> implements SearchData<T> {
-  private searchData: SearchData<T>;
+  private searchData: SearchDataImpl<T>;
 
   protected constructor(
     protected linkPath: string,
@@ -119,7 +119,7 @@ export abstract class TasksService<T extends CacheableObject> extends Identifiab
    *   links to follow
    */
   public searchTask(searchMethod: string, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<T>> {
-    const hrefObs = this.getSearchByHref(searchMethod, options, ...linksToFollow);
+    const hrefObs = this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
     return hrefObs.pipe(
       find((href: string) => hasValue(href)),
       mergeMap((href) => this.findByHref(href, false, true).pipe(
@@ -161,19 +161,6 @@ export abstract class TasksService<T extends CacheableObject> extends Identifiab
     return options;
   }
 
-  /**
-   * 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> {
-    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
-  }
-
   /**
    * Make a new FindListRequest with given search method
    *

From 147c7180d0684e93eea06daa5ccb85889616f925 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Mon, 12 Sep 2022 17:37:54 +0200
Subject: [PATCH 40/48] 93219: Add (more) reusable functions to test
 DataService composition

Data services that implement *Data interfaces should include the appropriate test functions in their specs.
These go over all methods in the interface & check that they're "wired up" correctly.

See e.g. the change in ExternalSourceDataService for an issue that is easy to miss but was highlighted by these new tests
---
 src/app/core/data/base/create-data.spec.ts    | 34 ++++++++++-
 src/app/core/data/base/delete-data.spec.ts    | 39 ++++++++++++-
 src/app/core/data/base/find-all-data.spec.ts  | 32 ++++-------
 src/app/core/data/base/patch-data.spec.ts     | 57 ++++++++++++++++++-
 src/app/core/data/base/put-data.spec.ts       | 30 +++++++++-
 src/app/core/data/base/search-data.spec.ts    | 32 ++++-------
 .../core/data/bitstream-data.service.spec.ts  | 10 ++++
 .../bitstream-format-data.service.spec.ts     | 15 +++--
 src/app/core/data/bundle-data.service.spec.ts |  7 +++
 .../core/data/collection-data.service.spec.ts | 21 +++++--
 src/app/core/data/comcol-data.service.spec.ts | 21 +++++--
 .../data/entity-type-data.service.spec.ts     | 19 +++++++
 .../data/external-source-data.service.spec.ts |  6 ++
 .../core/data/external-source-data.service.ts |  2 +-
 .../authorization-data.service.spec.ts        |  6 ++
 src/app/core/data/item-data.service.spec.ts   | 12 +++-
 .../data/item-template-data.service.spec.ts   | 10 ++++
 .../data/metadata-field-data.service.spec.ts  | 12 ++++
 .../data/metadata-schema-data.service.spec.ts |  9 +++
 .../processes/process-data.service.spec.ts    | 17 ++++++
 .../processes/script-data.service.spec.ts     | 17 ++++++
 .../data/relationship-data.service.spec.ts    |  7 +++
 src/app/core/data/site-data.service.spec.ts   |  7 +++
 .../core/data/version-data.service.spec.ts    |  6 ++
 src/app/core/eperson/group-data.service.ts    |  2 +-
 .../feedback/feedback-data.service.spec.ts    |  5 ++
 .../researcher-profile-data.service.spec.ts   | 18 ++++--
 .../usage-report-data.service.spec.ts         | 17 ++++++
 ...abulary-entry-details.data.service.spec.ts | 11 +++-
 .../vocabulary.data.service.spec.ts           | 10 +++-
 .../workspaceitem-data.service.spec.ts        |  8 +++
 .../tasks/claimed-task-data.service.spec.ts   |  6 ++
 .../core/tasks/pool-task-data.service.spec.ts |  6 ++
 src/app/core/tasks/tasks.service.spec.ts      |  6 ++
 34 files changed, 442 insertions(+), 75 deletions(-)
 create mode 100644 src/app/core/data/entity-type-data.service.spec.ts
 create mode 100644 src/app/core/data/processes/process-data.service.spec.ts
 create mode 100644 src/app/core/data/processes/script-data.service.spec.ts
 create mode 100644 src/app/core/statistics/usage-report-data.service.spec.ts

diff --git a/src/app/core/data/base/create-data.spec.ts b/src/app/core/data/base/create-data.spec.ts
index 0ae31e37ab..0b2e0f3930 100644
--- a/src/app/core/data/base/create-data.spec.ts
+++ b/src/app/core/data/base/create-data.spec.ts
@@ -11,7 +11,7 @@ import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { FindListOptions } from '../find-list-options.model';
 import { Observable, of as observableOf } from 'rxjs';
-import { CreateDataImpl } from './create-data';
+import { CreateData, CreateDataImpl } from './create-data';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
@@ -21,6 +21,38 @@ import { RequestEntryState } from '../request-entry-state.model';
 import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
 import { RequestParam } from '../../cache/models/request-param.model';
 import { RestRequestMethod } from '../rest-request-method';
+import { DSpaceObject } from '../../shared/dspace-object.model';
+
+/**
+ * Tests whether calls to `CreateData` methods are correctly patched through in a concrete data service that implements it
+ */
+export function testCreateDataImplementation(serviceFactory: () => CreateData<any>) {
+  let service;
+
+  describe('CreateData implementation', () => {
+    const OBJ = Object.assign(new DSpaceObject(), {
+      uuid: '08eec68f-45e4-47a3-80c5-f0beb5627079',
+    });
+    const PARAMS = [
+      new RequestParam('abc', 123), new RequestParam('def', 456),
+    ];
+
+    beforeAll(() => {
+      service = serviceFactory();
+
+      (service as any).createData = jasmine.createSpyObj('createData', {
+        create: 'TEST create',
+      });
+    });
+
+    it('should handle calls to create', () => {
+      const out: any = service.create(OBJ, ...PARAMS);
+
+      expect((service as any).createData.create).toHaveBeenCalledWith(OBJ, ...PARAMS);
+      expect(out).toBe('TEST create');
+    });
+  });
+}
 
 const endpoint = 'https://rest.api/core';
 
diff --git a/src/app/core/data/base/delete-data.spec.ts b/src/app/core/data/base/delete-data.spec.ts
index 4c4a2ded6d..7bffef18e6 100644
--- a/src/app/core/data/base/delete-data.spec.ts
+++ b/src/app/core/data/base/delete-data.spec.ts
@@ -19,11 +19,48 @@ import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { TestScheduler } from 'rxjs/testing';
 import { RemoteData } from '../remote-data';
 import { RequestEntryState } from '../request-entry-state.model';
-import { DeleteDataImpl } from './delete-data';
+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';
 
+/**
+ * Tests whether calls to `DeleteData` methods are correctly patched through in a concrete data service that implements it
+ */
+export function testDeleteDataImplementation(serviceFactory: () => DeleteData<any>) {
+  let service;
+
+  describe('DeleteData implementation', () => {
+    const ID = '2ce78f3a-791b-4d70-b5eb-753d587bbadd';
+    const HREF = 'https://rest.api/core/items/' + ID;
+    const COPY_VIRTUAL_METADATA = [
+      'a', 'b', 'c'
+    ];
+
+    beforeAll(() => {
+      service = serviceFactory();
+      (service as any).deleteData = jasmine.createSpyObj('deleteData', {
+        delete: 'TEST delete',
+        deleteByHref: 'TEST deleteByHref',
+      });
+    });
+
+    it('should handle calls to delete', () => {
+      const out: any = service.delete(ID, COPY_VIRTUAL_METADATA);
+
+      expect((service as any).deleteData.delete).toHaveBeenCalledWith(ID, COPY_VIRTUAL_METADATA);
+      expect(out).toBe('TEST delete');
+    });
+
+    it('should handle calls to deleteByHref', () => {
+      const out: any = service.deleteByHref(HREF, COPY_VIRTUAL_METADATA);
+
+      expect((service as any).deleteData.deleteByHref).toHaveBeenCalledWith(HREF, COPY_VIRTUAL_METADATA);
+      expect(out).toBe('TEST deleteByHref');
+    });
+  });
+}
+
 const endpoint = 'https://rest.api/core';
 
 const BOOLEAN = { f: false, t: true };
diff --git a/src/app/core/data/base/find-all-data.spec.ts b/src/app/core/data/base/find-all-data.spec.ts
index 3caa8990f6..866c3279dc 100644
--- a/src/app/core/data/base/find-all-data.spec.ts
+++ b/src/app/core/data/base/find-all-data.spec.ts
@@ -6,7 +6,6 @@
  * http://www.dspace.org/license/
  */
 import { FindAllData, FindAllDataImpl } from './find-all-data';
-import createSpyObj = jasmine.createSpyObj;
 import { FindListOptions } from '../find-list-options.model';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
@@ -27,7 +26,9 @@ import { Observable, of as observableOf } from 'rxjs';
 /**
  * Tests whether calls to `FindAllData` methods are correctly patched through in a concrete data service that implements it
  */
-export function testFindAllDataImplementation(service: FindAllData<any>, methods = ['findAll', 'getFindAllHref']) {
+export function testFindAllDataImplementation(serviceFactory: () => FindAllData<any>) {
+  let service;
+
   describe('FindAllData implementation', () => {
     const OPTIONS = Object.assign(new FindListOptions(), { elementsPerPage: 10, currentPage: 3 });
     const FOLLOWLINKS = [
@@ -35,30 +36,19 @@ export function testFindAllDataImplementation(service: FindAllData<any>, methods
       followLink('something'),
     ];
 
-    beforeEach(() => {
-      (service as any).findAllData = createSpyObj('findAllData', {
+    beforeAll(() => {
+      service = serviceFactory();
+      (service as any).findAllData =  jasmine.createSpyObj('findAllData', {
         findAll: 'TEST findAll',
-        getFindAllHref: 'TEST getFindAllHref',
       });
     });
 
-    if ('findAll' in methods) {
-      it('should handle calls to findAll', () => {
-        const out: any = service.findAll(OPTIONS, false, true, ...FOLLOWLINKS);
+    it('should handle calls to findAll', () => {
+      const out: any = service.findAll(OPTIONS, false, true, ...FOLLOWLINKS);
 
-        expect((service as any).findAllData.findAll).toHaveBeenCalledWith(OPTIONS, false, true, ...FOLLOWLINKS);
-        expect(out).toBe('TEST findAll');
-      });
-    }
-
-    if ('getFindAllHref' in methods) {
-      it('should handle calls to getFindAllHref', () => {
-        const out: any = service.getFindAllHref(OPTIONS, 'linkPath', ...FOLLOWLINKS);
-
-        expect((service as any).findAllData.getFindAllHref).toHaveBeenCalledWith(OPTIONS, 'linkPath', ...FOLLOWLINKS);
-        expect(out).toBe('TEST getFindAllHref');
-      });
-    }
+      expect((service as any).findAllData.findAll).toHaveBeenCalledWith(OPTIONS, false, true, ...FOLLOWLINKS);
+      expect(out).toBe('TEST findAll');
+    });
   });
 }
 
diff --git a/src/app/core/data/base/patch-data.spec.ts b/src/app/core/data/base/patch-data.spec.ts
index 601188ae7d..53f2083dab 100644
--- a/src/app/core/data/base/patch-data.spec.ts
+++ b/src/app/core/data/base/patch-data.spec.ts
@@ -19,7 +19,7 @@ import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { TestScheduler } from 'rxjs/testing';
 import { RemoteData } from '../remote-data';
 import { RequestEntryState } from '../request-entry-state.model';
-import { PatchDataImpl } from './patch-data';
+import { PatchData, PatchDataImpl } from './patch-data';
 import { ChangeAnalyzer } from '../change-analyzer';
 import { Item } from '../../shared/item.model';
 import { compare, Operation } from 'fast-json-patch';
@@ -27,6 +27,61 @@ import { PatchRequest } from '../request.models';
 import { DSpaceObject } from '../../shared/dspace-object.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { constructIdEndpointDefault } from './identifiable-data.service';
+import { RestRequestMethod } from '../rest-request-method';
+
+/**
+ * Tests whether calls to `PatchData` methods are correctly patched through in a concrete data service that implements it
+ */
+export function testPatchDataImplementation(serviceFactory: () => PatchData<any>) {
+  let service;
+
+  describe('PatchData implementation', () => {
+    const OBJ = Object.assign(new DSpaceObject(), {
+      uuid: '08eec68f-45e4-47a3-80c5-f0beb5627079',
+    });
+    const OPERATIONS = [
+      { op: 'replace', path: '/0/value', value: 'test' },
+      { op: 'add', path: '/2/value', value: 'test2' },
+    ] as Operation[];
+    const METHOD = RestRequestMethod.POST;
+
+    beforeAll(() => {
+      service = serviceFactory();
+      (service as any).patchData = jasmine.createSpyObj('patchData', {
+        patch: 'TEST patch',
+        update: 'TEST update',
+        commitUpdates: undefined,
+        createPatchFromCache: 'TEST createPatchFromCache',
+      });
+    });
+
+    it('should handle calls to patch', () => {
+      const out: any = service.patch(OBJ, OPERATIONS);
+
+      expect((service as any).patchData.patch).toHaveBeenCalledWith(OBJ, OPERATIONS);
+      expect(out).toBe('TEST patch');
+    });
+
+    it('should handle calls to update', () => {
+      const out: any = service.update(OBJ);
+
+      expect((service as any).patchData.update).toHaveBeenCalledWith(OBJ);
+      expect(out).toBe('TEST update');
+    });
+
+    it('should handle calls to commitUpdates', () => {
+      service.commitUpdates(METHOD);
+      expect((service as any).patchData.commitUpdates).toHaveBeenCalledWith(METHOD);
+    });
+
+    it('should handle calls to createPatchFromCache', () => {
+      const out: any = service.createPatchFromCache(OBJ);
+
+      expect((service as any).patchData.createPatchFromCache).toHaveBeenCalledWith(OBJ);
+      expect(out).toBe('TEST createPatchFromCache');
+    });
+  });
+}
 
 const endpoint = 'https://rest.api/core';
 
diff --git a/src/app/core/data/base/put-data.spec.ts b/src/app/core/data/base/put-data.spec.ts
index 5e2f836776..6287fe91b1 100644
--- a/src/app/core/data/base/put-data.spec.ts
+++ b/src/app/core/data/base/put-data.spec.ts
@@ -17,10 +17,38 @@ import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-ser
 import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
 import { RemoteData } from '../remote-data';
 import { RequestEntryState } from '../request-entry-state.model';
-import { PutDataImpl } from './put-data';
+import { PutData, PutDataImpl } from './put-data';
 import { RestRequestMethod } from '../rest-request-method';
 import { DSpaceObject } from '../../shared/dspace-object.model';
 
+/**
+ * Tests whether calls to `PutData` methods are correctly patched through in a concrete data service that implements it
+ */
+export function testPutDataImplementation(serviceFactory: () => PutData<any>) {
+  let service;
+
+  describe('PutData implementation', () => {
+    const OBJ = Object.assign(new DSpaceObject(), {
+      uuid: '08eec68f-45e4-47a3-80c5-f0beb5627079',
+    });
+
+    beforeAll(() => {
+      service = serviceFactory();
+      (service as any).putData = jasmine.createSpyObj('putData', {
+        put: 'TEST put',
+      });
+    });
+
+    it('should handle calls to put', () => {
+      const out: any = service.put(OBJ);
+
+      expect((service as any).putData.put).toHaveBeenCalledWith(OBJ);
+      expect(out).toBe('TEST put');
+    });
+  });
+}
+
+
 const endpoint = 'https://rest.api/core';
 
 class TestService extends PutDataImpl<any> {
diff --git a/src/app/core/data/base/search-data.spec.ts b/src/app/core/data/base/search-data.spec.ts
index 37ad589740..d314960e97 100644
--- a/src/app/core/data/base/search-data.spec.ts
+++ b/src/app/core/data/base/search-data.spec.ts
@@ -11,12 +11,13 @@ import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { of as observableOf } from 'rxjs';
 import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
-import createSpyObj = jasmine.createSpyObj;
 
 /**
  * Tests whether calls to `SearchData` methods are correctly patched through in a concrete data service that implements it
  */
-export function testSearchDataImplementation(service: SearchData<any>, methods = ['searchBy', 'getSearchByHref']) {
+export function testSearchDataImplementation(serviceFactory: () => SearchData<any>) {
+  let service;
+
   describe('SearchData implementation', () => {
     const OPTIONS = Object.assign(new FindListOptions(), { elementsPerPage: 10, currentPage: 3 });
     const FOLLOWLINKS = [
@@ -24,30 +25,19 @@ export function testSearchDataImplementation(service: SearchData<any>, methods =
       followLink('something'),
     ];
 
-    beforeEach(() => {
-      (service as any).searchData = createSpyObj('searchData', {
+    beforeAll(() => {
+      service = serviceFactory();
+      (service as any).searchData = jasmine.createSpyObj('searchData', {
         searchBy: 'TEST searchBy',
-        getSearchByHref: 'TEST getSearchByHref',
       });
     });
 
-    if ('searchBy' in methods) {
-      it('should handle calls to searchBy', () => {
-        const out: any = service.searchBy('searchMethod', OPTIONS, false, true, ...FOLLOWLINKS);
+    it('should handle calls to searchBy', () => {
+      const out: any = service.searchBy('searchMethod', OPTIONS, false, true, ...FOLLOWLINKS);
 
-        expect((service as any).searchData.searchBy).toHaveBeenCalledWith('searchMethod', OPTIONS, false, true, ...FOLLOWLINKS);
-        expect(out).toBe('TEST searchBy');
-      });
-    }
-
-    if ('getSearchByHref' in methods) {
-      it('should handle calls to getSearchByHref', () => {
-        const out: any = service.getSearchByHref('searchMethod', OPTIONS, ...FOLLOWLINKS);
-
-        expect((service as any).searchData.getSearchByHref).toHaveBeenCalledWith('searchMethod', OPTIONS, ...FOLLOWLINKS);
-        expect(out).toBe('TEST getSearchByHref');
-      });
-    }
+      expect((service as any).searchData.searchBy).toHaveBeenCalledWith('searchMethod', OPTIONS, false, true, ...FOLLOWLINKS);
+      expect(out).toBe('TEST searchBy');
+    });
   });
 }
 
diff --git a/src/app/core/data/bitstream-data.service.spec.ts b/src/app/core/data/bitstream-data.service.spec.ts
index 07d02f84ae..c67eaa2d68 100644
--- a/src/app/core/data/bitstream-data.service.spec.ts
+++ b/src/app/core/data/bitstream-data.service.spec.ts
@@ -12,6 +12,9 @@ import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
+import { testSearchDataImplementation } from './base/search-data.spec';
+import { testPatchDataImplementation } from './base/patch-data.spec';
+import { testDeleteDataImplementation } from './base/delete-data.spec';
 
 describe('BitstreamDataService', () => {
   let service: BitstreamDataService;
@@ -50,6 +53,13 @@ describe('BitstreamDataService', () => {
     service = new BitstreamDataService(requestService, rdbService, objectCache, halService, null, bitstreamFormatService, null, null);
   });
 
+  describe('composition', () => {
+    const initService = () => new BitstreamDataService(null, null, null, null, null, null, null, null);
+    testSearchDataImplementation(initService);
+    testPatchDataImplementation(initService);
+    testDeleteDataImplementation(initService);
+  });
+
   describe('when updating the bitstream\'s format', () => {
     beforeEach(() => {
       service.updateFormat(bitstream, format);
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 d1c48ab82e..662a3f6f1d 100644
--- a/src/app/core/data/bitstream-format-data.service.spec.ts
+++ b/src/app/core/data/bitstream-format-data.service.spec.ts
@@ -6,19 +6,16 @@ import { ObjectCacheService } from '../cache/object-cache.service';
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { BitstreamFormat } from '../shared/bitstream-format.model';
 import { waitForAsync } from '@angular/core/testing';
-import {
-  BitstreamFormatsRegistryDeselectAction,
-  BitstreamFormatsRegistryDeselectAllAction,
-  BitstreamFormatsRegistrySelectAction
-} from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions';
+import { BitstreamFormatsRegistryDeselectAction, BitstreamFormatsRegistryDeselectAllAction, BitstreamFormatsRegistrySelectAction } from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions';
 import { TestScheduler } from 'rxjs/testing';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { CoreState } from '../core-state.model';
 import { RequestEntry } from './request-entry.model';
+import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { testDeleteDataImplementation } from './base/delete-data.spec';
 
 describe('BitstreamFormatDataService', () => {
   let service: BitstreamFormatDataService;
@@ -70,6 +67,12 @@ describe('BitstreamFormatDataService', () => {
     );
   }
 
+  describe('composition', () => {
+    const initService = () => new BitstreamFormatDataService(null, null, null, null, null, null);
+    testFindAllDataImplementation(initService);
+    testDeleteDataImplementation(initService);
+  });
+
   describe('getBrowseEndpoint', () => {
     beforeEach(waitForAsync(() => {
       scheduler = getTestScheduler();
diff --git a/src/app/core/data/bundle-data.service.spec.ts b/src/app/core/data/bundle-data.service.spec.ts
index 2f047a1054..e3ba438f9b 100644
--- a/src/app/core/data/bundle-data.service.spec.ts
+++ b/src/app/core/data/bundle-data.service.spec.ts
@@ -13,6 +13,7 @@ import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.util
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { Bundle } from '../shared/bundle.model';
 import { CoreState } from '../core-state.model';
+import { testPatchDataImplementation } from './base/patch-data.spec';
 
 class DummyChangeAnalyzer implements ChangeAnalyzer<Item> {
   diff(object1: Item, object2: Item): Operation[] {
@@ -71,6 +72,12 @@ describe('BundleDataService', () => {
     service = initTestService();
   });
 
+  describe('composition', () => {
+    const initService = () => new BundleDataService(null, null, null, null, null);
+
+    testPatchDataImplementation(initService);
+  });
+
   describe('findAllByItem', () => {
     beforeEach(() => {
       spyOn(service, 'findListByHref');
diff --git a/src/app/core/data/collection-data.service.spec.ts b/src/app/core/data/collection-data.service.spec.ts
index 6d43d5475c..65f8b3ab2c 100644
--- a/src/app/core/data/collection-data.service.spec.ts
+++ b/src/app/core/data/collection-data.service.spec.ts
@@ -13,16 +13,17 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { Collection } from '../shared/collection.model';
 import { PageInfo } from '../shared/page-info.model';
 import { buildPaginatedList } from './paginated-list.model';
-import {
-  createFailedRemoteDataObject$,
-  createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
-} from '../../shared/remote-data.utils';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
 import { Observable } from 'rxjs';
 import { RemoteData } from './remote-data';
 import { hasNoValue } from '../../shared/empty.util';
+import { testCreateDataImplementation } from './base/create-data.spec';
+import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { testSearchDataImplementation } from './base/search-data.spec';
+import { testPatchDataImplementation } from './base/patch-data.spec';
+import { testDeleteDataImplementation } from './base/delete-data.spec';
 
 const url = 'fake-url';
 const collectionId = 'fake-collection-id';
@@ -75,6 +76,16 @@ describe('CollectionDataService', () => {
   const paginatedList = buildPaginatedList(pageInfo, array);
   const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
 
+  describe('composition', () => {
+    const initService = () => new CollectionDataService(null, null, null, null, null, null, null, null, null);
+
+    testCreateDataImplementation(initService);
+    testFindAllDataImplementation(initService);
+    testSearchDataImplementation(initService);
+    testPatchDataImplementation(initService);
+    testDeleteDataImplementation(initService);
+  });
+
   describe('when the requests are successful', () => {
     beforeEach(() => {
       createService();
diff --git a/src/app/core/data/comcol-data.service.spec.ts b/src/app/core/data/comcol-data.service.spec.ts
index 758cbad97a..0f9f0fa740 100644
--- a/src/app/core/data/comcol-data.service.spec.ts
+++ b/src/app/core/data/comcol-data.service.spec.ts
@@ -13,16 +13,16 @@ import { ComColDataService } from './comcol-data.service';
 import { CommunityDataService } from './community-data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
 import { RequestService } from './request.service';
-import {
-  createFailedRemoteDataObject$,
-  createSuccessfulRemoteDataObject$,
-  createFailedRemoteDataObject,
-  createSuccessfulRemoteDataObject
-} from '../../shared/remote-data.utils';
+import { createFailedRemoteDataObject, createFailedRemoteDataObject$, createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { BitstreamDataService } from './bitstream-data.service';
 import { CoreState } from '../core-state.model';
 import { FindListOptions } from './find-list-options.model';
 import { Bitstream } from '../shared/bitstream.model';
+import { testCreateDataImplementation } from './base/create-data.spec';
+import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { testSearchDataImplementation } from './base/search-data.spec';
+import { testPatchDataImplementation } from './base/patch-data.spec';
+import { testDeleteDataImplementation } from './base/delete-data.spec';
 
 const LINK_NAME = 'test';
 
@@ -154,6 +154,15 @@ describe('ComColDataService', () => {
     service = initTestService();
   });
 
+  describe('composition', () => {
+    const initService = () => new TestService(null, null, null, null, null, null, null, null, null, null, null);
+    testCreateDataImplementation(initService);
+    testFindAllDataImplementation(initService);
+    testSearchDataImplementation(initService);
+    testPatchDataImplementation(initService);
+    testDeleteDataImplementation(initService);
+  });
+
   describe('getBrowseEndpoint', () => {
     it(`should call createAndSendGetRequest with the scope Community's self link`, () => {
       testScheduler.run(({ cold, flush, expectObservable }) => {
diff --git a/src/app/core/data/entity-type-data.service.spec.ts b/src/app/core/data/entity-type-data.service.spec.ts
new file mode 100644
index 0000000000..cf164adb84
--- /dev/null
+++ b/src/app/core/data/entity-type-data.service.spec.ts
@@ -0,0 +1,19 @@
+/**
+ * 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 { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { testSearchDataImplementation } from './base/search-data.spec';
+import { EntityTypeDataService } from './entity-type-data.service';
+
+describe('EntityTypeDataService', () => {
+  describe('composition', () => {
+    const initService = () => new EntityTypeDataService(null, null, null, null, null);
+    testFindAllDataImplementation(initService);
+    testSearchDataImplementation(initService);
+  });
+});
diff --git a/src/app/core/data/external-source-data.service.spec.ts b/src/app/core/data/external-source-data.service.spec.ts
index 86bbca59c9..cdbdbaa006 100644
--- a/src/app/core/data/external-source-data.service.spec.ts
+++ b/src/app/core/data/external-source-data.service.spec.ts
@@ -4,6 +4,7 @@ import { createPaginatedList } from '../../shared/testing/utils.test';
 import { ExternalSourceEntry } from '../shared/external-source-entry.model';
 import { of as observableOf } from 'rxjs';
 import { GetRequest } from './request.models';
+import { testSearchDataImplementation } from './base/search-data.spec';
 
 describe('ExternalSourceService', () => {
   let service: ExternalSourceDataService;
@@ -57,6 +58,11 @@ describe('ExternalSourceService', () => {
     init();
   });
 
+  describe('composition', () => {
+    const initService = () => new ExternalSourceDataService(null, null, null, null);
+    testSearchDataImplementation(initService);
+  });
+
   describe('getExternalSourceEntries', () => {
     let result;
 
diff --git a/src/app/core/data/external-source-data.service.ts b/src/app/core/data/external-source-data.service.ts
index c7b71790a3..c0552aeaec 100644
--- a/src/app/core/data/external-source-data.service.ts
+++ b/src/app/core/data/external-source-data.service.ts
@@ -92,6 +92,6 @@ export class ExternalSourceDataService extends IdentifiableDataService<ExternalS
    *    Return an observable that emits response from the server
    */
   public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<ExternalSource>[]): Observable<RemoteData<PaginatedList<ExternalSource>>> {
-    return undefined;
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 }
diff --git a/src/app/core/data/feature-authorization/authorization-data.service.spec.ts b/src/app/core/data/feature-authorization/authorization-data.service.spec.ts
index 38b71a5c46..ff9b542e44 100644
--- a/src/app/core/data/feature-authorization/authorization-data.service.spec.ts
+++ b/src/app/core/data/feature-authorization/authorization-data.service.spec.ts
@@ -11,6 +11,7 @@ import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from
 import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { Feature } from '../../shared/feature.model';
 import { FindListOptions } from '../find-list-options.model';
+import { testSearchDataImplementation } from '../base/search-data.spec';
 
 describe('AuthorizationDataService', () => {
   let service: AuthorizationDataService;
@@ -45,6 +46,11 @@ describe('AuthorizationDataService', () => {
     spyOn(service, 'searchBy').and.returnValue(observableOf(undefined));
   });
 
+  describe('composition', () => {
+    const initService = () => new AuthorizationDataService(null, null, null, null, null);
+    testSearchDataImplementation(initService);
+  });
+
   it('should call setStaleByHrefSubstring method', () => {
     service.invalidateAuthorizationsRequestCache();
     expect((service as any).requestService.setStaleByHrefSubstring).toHaveBeenCalledWith((service as any).linkPath);
diff --git a/src/app/core/data/item-data.service.spec.ts b/src/app/core/data/item-data.service.spec.ts
index 01ccfe8c3b..2c20ed0fb6 100644
--- a/src/app/core/data/item-data.service.spec.ts
+++ b/src/app/core/data/item-data.service.spec.ts
@@ -10,13 +10,16 @@ import { ObjectCacheService } from '../cache/object-cache.service';
 import { RestResponse } from '../cache/response.models';
 import { ExternalSourceEntry } from '../shared/external-source-entry.model';
 import { ItemDataService } from './item-data.service';
-import { DeleteRequest, GetRequest, PostRequest } from './request.models';
+import { DeleteRequest, PostRequest } from './request.models';
 import { RequestService } from './request.service';
 import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { CoreState } from '../core-state.model';
 import { RequestEntry } from './request-entry.model';
 import { FindListOptions } from './find-list-options.model';
 import { HALEndpointServiceStub } from 'src/app/shared/testing/hal-endpoint-service.stub';
+import { testCreateDataImplementation } from './base/create-data.spec';
+import { testPatchDataImplementation } from './base/patch-data.spec';
+import { testDeleteDataImplementation } from './base/delete-data.spec';
 
 describe('ItemDataService', () => {
   let scheduler: TestScheduler;
@@ -87,6 +90,13 @@ describe('ItemDataService', () => {
     );
   }
 
+  describe('composition', () => {
+    const initService = () => new ItemDataService(null, null, null, null, null, null, null, null);
+    testCreateDataImplementation(initService);
+    testPatchDataImplementation(initService);
+    testDeleteDataImplementation(initService);
+  });
+
   describe('getBrowseEndpoint', () => {
     beforeEach(() => {
       scheduler = getTestScheduler();
diff --git a/src/app/core/data/item-template-data.service.spec.ts b/src/app/core/data/item-template-data.service.spec.ts
index b73287f50f..16cf0dbd99 100644
--- a/src/app/core/data/item-template-data.service.spec.ts
+++ b/src/app/core/data/item-template-data.service.spec.ts
@@ -14,6 +14,9 @@ import { Item } from '../shared/item.model';
 import { RestRequest } from './rest-request.model';
 import { CoreState } from '../core-state.model';
 import { RequestEntry } from './request-entry.model';
+import { testCreateDataImplementation } from './base/create-data.spec';
+import { testPatchDataImplementation } from './base/patch-data.spec';
+import { testDeleteDataImplementation } from './base/delete-data.spec';
 import createSpyObj = jasmine.createSpyObj;
 
 describe('ItemTemplateDataService', () => {
@@ -92,6 +95,13 @@ describe('ItemTemplateDataService', () => {
     initTestService();
   });
 
+  describe('composition', () => {
+    const initService = () => new ItemTemplateDataService(null, null, null, null, null, null, null, null, null);
+    testCreateDataImplementation(initService);
+    testPatchDataImplementation(initService);
+    testDeleteDataImplementation(initService);
+  });
+
   describe('findByCollectionID', () => {
     it('should call findByCollectionID on the collection-based data service', () => {
       spyOn(byCollection, 'findById');
diff --git a/src/app/core/data/metadata-field-data.service.spec.ts b/src/app/core/data/metadata-field-data.service.spec.ts
index 09cbcb908a..1ce078f5d5 100644
--- a/src/app/core/data/metadata-field-data.service.spec.ts
+++ b/src/app/core/data/metadata-field-data.service.spec.ts
@@ -11,6 +11,10 @@ import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.util
 import { RequestParam } from '../cache/models/request-param.model';
 import { FindListOptions } from './find-list-options.model';
 import { createPaginatedList } from '../../shared/testing/utils.test';
+import { testCreateDataImplementation } from './base/create-data.spec';
+import { testSearchDataImplementation } from './base/search-data.spec';
+import { testPutDataImplementation } from './base/put-data.spec';
+import { testDeleteDataImplementation } from './base/delete-data.spec';
 
 describe('MetadataFieldDataService', () => {
   let metadataFieldService: MetadataFieldDataService;
@@ -53,6 +57,14 @@ describe('MetadataFieldDataService', () => {
     init();
   });
 
+  describe('composition', () => {
+    const initService = () => new MetadataFieldDataService(null, null, null, null, null);
+    testCreateDataImplementation(initService);
+    testSearchDataImplementation(initService);
+    testPutDataImplementation(initService);
+    testDeleteDataImplementation(initService);
+  });
+
   describe('findBySchema', () => {
     beforeEach(() => {
       spyOn(metadataFieldService, 'searchBy');
diff --git a/src/app/core/data/metadata-schema-data.service.spec.ts b/src/app/core/data/metadata-schema-data.service.spec.ts
index 9c8fb9ca00..1bcf4e1104 100644
--- a/src/app/core/data/metadata-schema-data.service.spec.ts
+++ b/src/app/core/data/metadata-schema-data.service.spec.ts
@@ -9,6 +9,8 @@ import { MetadataSchema } from '../metadata/metadata-schema.model';
 import { CreateRequest, PutRequest } from './request.models';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
+import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { testDeleteDataImplementation } from './base/delete-data.spec';
 
 describe('MetadataSchemaDataService', () => {
   let metadataSchemaService: MetadataSchemaDataService;
@@ -44,6 +46,13 @@ describe('MetadataSchemaDataService', () => {
     init();
   });
 
+  describe('composition', () => {
+    const initService = () => new MetadataSchemaDataService(null, null, null, null, null);
+
+    testFindAllDataImplementation(initService);
+    testDeleteDataImplementation(initService);
+  });
+
   describe('createOrUpdateMetadataSchema', () => {
     let schema: MetadataSchema;
 
diff --git a/src/app/core/data/processes/process-data.service.spec.ts b/src/app/core/data/processes/process-data.service.spec.ts
new file mode 100644
index 0000000000..eeec7ed6aa
--- /dev/null
+++ b/src/app/core/data/processes/process-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 { testFindAllDataImplementation } from '../base/find-all-data.spec';
+import { ProcessDataService } from './process-data.service';
+
+describe('ProcessDataService', () => {
+  describe('composition', () => {
+    const initService = () => new ProcessDataService(null, null, null, null, null);
+    testFindAllDataImplementation(initService);
+  });
+});
diff --git a/src/app/core/data/processes/script-data.service.spec.ts b/src/app/core/data/processes/script-data.service.spec.ts
new file mode 100644
index 0000000000..0aee3cfb46
--- /dev/null
+++ b/src/app/core/data/processes/script-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 { testFindAllDataImplementation } from '../base/find-all-data.spec';
+import { ScriptDataService } from './script-data.service';
+
+describe('ScriptDataService', () => {
+  describe('composition', () => {
+    const initService = () => new ScriptDataService(null, null, null, null);
+    testFindAllDataImplementation(initService);
+  });
+});
diff --git a/src/app/core/data/relationship-data.service.spec.ts b/src/app/core/data/relationship-data.service.spec.ts
index d65df832a8..2f0ecd9cf4 100644
--- a/src/app/core/data/relationship-data.service.spec.ts
+++ b/src/app/core/data/relationship-data.service.spec.ts
@@ -16,6 +16,7 @@ import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { RequestEntry } from './request-entry.model';
 import { FindListOptions } from './find-list-options.model';
+import { testSearchDataImplementation } from './base/search-data.spec';
 
 describe('RelationshipDataService', () => {
   let service: RelationshipDataService;
@@ -144,6 +145,12 @@ describe('RelationshipDataService', () => {
     service = initTestService();
   });
 
+  describe('composition', () => {
+    const initService = () => new RelationshipDataService(null, null, null, null, null, null, null);
+
+    testSearchDataImplementation(initService);
+  });
+
   describe('deleteRelationship', () => {
     beforeEach(() => {
       spyOn(service, 'findById').and.returnValue(createSuccessfulRemoteDataObject$(relationship1));
diff --git a/src/app/core/data/site-data.service.spec.ts b/src/app/core/data/site-data.service.spec.ts
index d3ff37a442..42bdfedb8a 100644
--- a/src/app/core/data/site-data.service.spec.ts
+++ b/src/app/core/data/site-data.service.spec.ts
@@ -9,6 +9,7 @@ import { TestScheduler } from 'rxjs/testing';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { FindListOptions } from './find-list-options.model';
+import { testFindAllDataImplementation } from './base/find-all-data.spec';
 
 describe('SiteDataService', () => {
   let scheduler: TestScheduler;
@@ -53,6 +54,12 @@ describe('SiteDataService', () => {
     );
   });
 
+  describe('composition', () => {
+    const initService = () => new SiteDataService(null, null, null, null);
+
+    testFindAllDataImplementation(initService);
+  });
+
   describe('getBrowseEndpoint', () => {
     it('should return the Static Page endpoint', () => {
 
diff --git a/src/app/core/data/version-data.service.spec.ts b/src/app/core/data/version-data.service.spec.ts
index 3b7d239f2d..dd3f9eec94 100644
--- a/src/app/core/data/version-data.service.spec.ts
+++ b/src/app/core/data/version-data.service.spec.ts
@@ -15,6 +15,7 @@ import { Version } from '../shared/version.model';
 import { VersionHistory } from '../shared/version-history.model';
 import { followLink } from '../../shared/utils/follow-link-config.model';
 import { RequestEntry } from './request-entry.model';
+import { testPatchDataImplementation } from './base/patch-data.spec';
 
 describe('VersionDataService test', () => {
   let scheduler: TestScheduler;
@@ -87,6 +88,11 @@ describe('VersionDataService test', () => {
     );
   }
 
+  describe('composition', () => {
+    const initService = () => new VersionDataService(null, null, null, null, null);
+    testPatchDataImplementation(initService);
+  });
+
   describe('', () => {
     beforeEach(() => {
 
diff --git a/src/app/core/eperson/group-data.service.ts b/src/app/core/eperson/group-data.service.ts
index 2ea3ffeef3..d37ce32873 100644
--- a/src/app/core/eperson/group-data.service.ts
+++ b/src/app/core/eperson/group-data.service.ts
@@ -49,7 +49,7 @@ const editGroupSelector = createSelector(groupRegistryStateSelector, (groupRegis
  */
 @Injectable()
 @dataService(GROUP)
-export class GroupDataService extends IdentifiableDataService<Group> {
+export class GroupDataService extends IdentifiableDataService<Group> implements CreateData<Group>, SearchData<Group>, PatchData<Group>, DeleteData<Group> {
   protected browseEndpoint = '';
   public ePersonsEndpoint = 'epersons';
   public subgroupsEndpoint = 'subgroups';
diff --git a/src/app/core/feedback/feedback-data.service.spec.ts b/src/app/core/feedback/feedback-data.service.spec.ts
index c5fa5d4aa7..4b76d06cec 100644
--- a/src/app/core/feedback/feedback-data.service.spec.ts
+++ b/src/app/core/feedback/feedback-data.service.spec.ts
@@ -8,6 +8,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { Store } from '@ngrx/store';
 import { Feedback } from './models/feedback.model';
 import { CoreState } from '../core-state.model';
+import { testCreateDataImplementation } from '../data/base/create-data.spec';
 
 describe('FeedbackDataService', () => {
   let service: FeedbackDataService;
@@ -65,6 +66,10 @@ describe('FeedbackDataService', () => {
     service = initTestService();
   });
 
+  describe('composition', () => {
+    const initService = () => new FeedbackDataService(null, null, null, null, null, null);
+    testCreateDataImplementation(initService);
+  });
 
   describe('getFeedback', () => {
     beforeEach(() => {
diff --git a/src/app/core/profile/researcher-profile-data.service.spec.ts b/src/app/core/profile/researcher-profile-data.service.spec.ts
index 1e2f453d2c..b93e33e2c5 100644
--- a/src/app/core/profile/researcher-profile-data.service.spec.ts
+++ b/src/app/core/profile/researcher-profile-data.service.spec.ts
@@ -11,11 +11,7 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RequestService } from '../data/request.service';
 import { PageInfo } from '../shared/page-info.model';
 import { buildPaginatedList } from '../data/paginated-list.model';
-import {
-  createNoContentRemoteDataObject$,
-  createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
-} from '../../shared/remote-data.utils';
+import { createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { RestResponse } from '../cache/response.models';
 import { RequestEntry } from '../data/request-entry.model';
 import { ResearcherProfileDataService } from './researcher-profile-data.service';
@@ -28,6 +24,10 @@ import { PostRequest } from '../data/request.models';
 import { followLink } from '../../shared/utils/follow-link-config.model';
 import { ConfigurationProperty } from '../shared/configuration-property.model';
 import { createPaginatedList } from '../../shared/testing/utils.test';
+import { testCreateDataImplementation } from '../data/base/create-data.spec';
+import { testSearchDataImplementation } from '../data/base/search-data.spec';
+import { testPatchDataImplementation } from '../data/base/patch-data.spec';
+import { testDeleteDataImplementation } from '../data/base/delete-data.spec';
 
 describe('ResearcherProfileService', () => {
   let scheduler: TestScheduler;
@@ -268,6 +268,14 @@ describe('ResearcherProfileService', () => {
     spyOn((service as any).deleteData, 'delete').and.callThrough();
   });
 
+  describe('composition', () => {
+    const initService = () => new ResearcherProfileDataService(null, null, null, null, null, null, null, null);
+    testCreateDataImplementation(initService);
+    testSearchDataImplementation(initService);
+    testPatchDataImplementation(initService);
+    testDeleteDataImplementation(initService);
+  });
+
   describe('create', () => {
     it('should proxy the call to createData.create with eperson UUID', () => {
       scheduler.schedule(() => service.create());
diff --git a/src/app/core/statistics/usage-report-data.service.spec.ts b/src/app/core/statistics/usage-report-data.service.spec.ts
new file mode 100644
index 0000000000..cc9be18e9b
--- /dev/null
+++ b/src/app/core/statistics/usage-report-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 { testSearchDataImplementation } from '../data/base/search-data.spec';
+import { UsageReportDataService } from './usage-report-data.service';
+
+describe('UsageReportDataService', () => {
+  describe('composition', () => {
+    const initService = () => new UsageReportDataService(null, null, null, null);
+    testSearchDataImplementation(initService);
+  });
+});
diff --git a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.spec.ts b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.spec.ts
index 8f9ed030d3..bafd8bbdc7 100644
--- a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.spec.ts
+++ b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.spec.ts
@@ -11,6 +11,13 @@ import { VocabularyEntryDetailsDataService } from './vocabulary-entry-details.da
 import { testSearchDataImplementation } from '../../data/base/search-data.spec';
 
 describe('VocabularyEntryDetailsDataService', () => {
-  testFindAllDataImplementation(new VocabularyEntryDetailsDataService(null, null, null, null));
-  testSearchDataImplementation(new VocabularyEntryDetailsDataService(null, null, null, null));
+  function initTestService() {
+    return new VocabularyEntryDetailsDataService(null, null, null, null);
+  }
+
+  describe('composition', () => {
+    const initService = () => new VocabularyEntryDetailsDataService(null, null, null, null);
+    testFindAllDataImplementation(initService);
+    testSearchDataImplementation(initService);
+  });
 });
diff --git a/src/app/core/submission/vocabularies/vocabulary.data.service.spec.ts b/src/app/core/submission/vocabularies/vocabulary.data.service.spec.ts
index d918ea8352..4b35871418 100644
--- a/src/app/core/submission/vocabularies/vocabulary.data.service.spec.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.data.service.spec.ts
@@ -8,7 +8,13 @@
 import { VocabularyDataService } from './vocabulary.data.service';
 import { testFindAllDataImplementation } from '../../data/base/find-all-data.spec';
 
-
 describe('VocabularyDataService', () => {
-  testFindAllDataImplementation(new VocabularyDataService(null, null, null, null));
+  function initTestService() {
+    return new VocabularyDataService(null, null, null, null);
+  }
+
+  describe('composition', () => {
+    const initService = () => new VocabularyDataService(null, null, null, null);
+    testFindAllDataImplementation(initService);
+  });
 });
diff --git a/src/app/core/submission/workspaceitem-data.service.spec.ts b/src/app/core/submission/workspaceitem-data.service.spec.ts
index 2338d15257..e766a6a039 100644
--- a/src/app/core/submission/workspaceitem-data.service.spec.ts
+++ b/src/app/core/submission/workspaceitem-data.service.spec.ts
@@ -19,6 +19,8 @@ import { Item } from '../shared/item.model';
 import { WorkspaceItem } from './models/workspaceitem.model';
 import { RequestEntry } from '../data/request-entry.model';
 import { CoreState } from '../core-state.model';
+import { testSearchDataImplementation } from '../data/base/search-data.spec';
+import { testDeleteDataImplementation } from '../data/base/delete-data.spec';
 
 describe('WorkspaceitemDataService test', () => {
   let scheduler: TestScheduler;
@@ -90,6 +92,12 @@ describe('WorkspaceitemDataService test', () => {
     );
   }
 
+  describe('composition', () => {
+    const initService = () => new WorkspaceitemDataService(null, null, null, null, null);
+    testSearchDataImplementation(initService);
+    testDeleteDataImplementation(initService);
+  });
+
   describe('', () => {
     beforeEach(() => {
 
diff --git a/src/app/core/tasks/claimed-task-data.service.spec.ts b/src/app/core/tasks/claimed-task-data.service.spec.ts
index e49bbef96e..8ff8b38fa8 100644
--- a/src/app/core/tasks/claimed-task-data.service.spec.ts
+++ b/src/app/core/tasks/claimed-task-data.service.spec.ts
@@ -11,6 +11,7 @@ import { TestScheduler } from 'rxjs/testing';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { FindListOptions } from '../data/find-list-options.model';
+import { testSearchDataImplementation } from '../data/base/search-data.spec';
 
 describe('ClaimedTaskDataService', () => {
   let scheduler: TestScheduler;
@@ -48,6 +49,11 @@ describe('ClaimedTaskDataService', () => {
     options.headers = headers;
   });
 
+  describe('composition', () => {
+    const initService = () => new ClaimedTaskDataService(null, null, null, null);
+    testSearchDataImplementation(initService);
+  });
+
   describe('submitTask', () => {
     it('should call postToEndpoint method', () => {
       const scopeId = '1234';
diff --git a/src/app/core/tasks/pool-task-data.service.spec.ts b/src/app/core/tasks/pool-task-data.service.spec.ts
index 6845dff5b9..c346e81150 100644
--- a/src/app/core/tasks/pool-task-data.service.spec.ts
+++ b/src/app/core/tasks/pool-task-data.service.spec.ts
@@ -11,6 +11,7 @@ import { RequestParam } from '../cache/models/request-param.model';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { FindListOptions } from '../data/find-list-options.model';
+import { testSearchDataImplementation } from '../data/base/search-data.spec';
 
 describe('PoolTaskDataService', () => {
   let scheduler: TestScheduler;
@@ -47,6 +48,11 @@ describe('PoolTaskDataService', () => {
     options.headers = headers;
   });
 
+  describe('composition', () => {
+    const initService = () => new PoolTaskDataService(null, null, null, null);
+    testSearchDataImplementation(initService);
+  });
+
   describe('findByItem', () => {
 
     it('should call searchTask method', () => {
diff --git a/src/app/core/tasks/tasks.service.spec.ts b/src/app/core/tasks/tasks.service.spec.ts
index 88b573e098..249a5e01f2 100644
--- a/src/app/core/tasks/tasks.service.spec.ts
+++ b/src/app/core/tasks/tasks.service.spec.ts
@@ -20,6 +20,7 @@ import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { CoreState } from '../core-state.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { testSearchDataImplementation } from '../data/base/search-data.spec';
 
 const LINK_NAME = 'test';
 
@@ -84,6 +85,11 @@ describe('TasksService', () => {
 
   });
 
+  describe('composition', () => {
+    const initService = () => new TestService(null, null, null, null);
+    testSearchDataImplementation(initService);
+  });
+
   describe('postToEndpoint', () => {
 
     it('should send a new TaskPostRequest', () => {

From 335d613df7b5aaf05ea38cf3e271b4739a1db901 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 12 Sep 2022 12:43:03 -0500
Subject: [PATCH 41/48] Ensure all data is read, not just first chunk

---
 scripts/test-rest.ts | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/scripts/test-rest.ts b/scripts/test-rest.ts
index b2a3ebd1af..51822cf939 100644
--- a/scripts/test-rest.ts
+++ b/scripts/test-rest.ts
@@ -22,7 +22,13 @@ console.log(`...Testing connection to REST API at ${restUrl}...\n`);
 if (appConfig.rest.ssl) {
     const req = https.request(restUrl, (res) => {
         console.log(`RESPONSE: ${res.statusCode} ${res.statusMessage} \n`);
-        res.on('data', (data) => {
+        // We will keep reading data until the 'end' event fires.
+        // This ensures we don't just read the first chunk.
+        let data = '';
+        res.on('data', (chunk) => {
+            data += chunk;
+        });
+        res.on('end', () => {
             checkJSONResponse(data);
         });
     });
@@ -35,7 +41,13 @@ if (appConfig.rest.ssl) {
 } else {
     const req = http.request(restUrl, (res) => {
         console.log(`RESPONSE: ${res.statusCode} ${res.statusMessage} \n`);
-        res.on('data', (data) => {
+        // We will keep reading data until the 'end' event fires.
+        // This ensures we don't just read the first chunk.
+        let data = '';
+        res.on('data', (chunk) => {
+            data += chunk;
+        });
+        res.on('end', () => {
             checkJSONResponse(data);
         });
     });

From cc697041ebd14830aa65c2e8e9c97d92f9188127 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Tue, 13 Sep 2022 14:23:09 +0200
Subject: [PATCH 42/48] Remove unused variable

---
 src/app/core/submission/vocabularies/vocabulary.service.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/core/submission/vocabularies/vocabulary.service.ts b/src/app/core/submission/vocabularies/vocabulary.service.ts
index 4a0b161f68..f2c1747658 100644
--- a/src/app/core/submission/vocabularies/vocabulary.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.service.ts
@@ -272,7 +272,6 @@ export class VocabularyService {
    *    Return an observable that emits a PaginatedList of VocabularyEntryDetail
    */
   getEntryDetailChildren(value: string, name: string, pageInfo: PageInfo, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<VocabularyEntryDetail>[]): Observable<RemoteData<PaginatedList<VocabularyEntryDetail>>> {
-    const linkPath = `${name}:${value}/children`;
     const options: VocabularyFindOptions = new VocabularyFindOptions(
       null,
       null,

From ac2922e59d03b5e83c3003a901e338cff64f71a2 Mon Sep 17 00:00:00 2001
From: gaurav <gaurav@d2t.co>
Date: Wed, 14 Sep 2022 11:35:29 +0530
Subject: [PATCH 43/48] no recent submissions should be displayed if pageSize
 is 0 and changing the configuration structure

---
 config/config.example.yml                         |  5 +++--
 src/app/home-page/home-page.component.html        |  2 +-
 src/app/home-page/home-page.component.ts          |  5 +++--
 .../recent-item-list.component.ts                 |  6 +++---
 src/config/default-app-config.ts                  | 10 ++++++----
 src/config/homepage-config.interface.ts           | 15 +++++++++------
 src/environments/environment.test.ts              |  9 +++++----
 7 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index b48b509a4d..4814c826f1 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -260,7 +260,8 @@ info:
   enablePrivacyStatement: true
 # Home Page
 homePage:
+  recentSubmissions:
 	# The number of item showing in recent submission components
-  recentSubmissionsRpp: 5
+      pageSize: 5
 	# Sort record of recent submission
-  recentSubmissionsSortField: 'dc.date.accessioned'
+      sortField: 'dc.date.accessioned'
diff --git a/src/app/home-page/home-page.component.html b/src/app/home-page/home-page.component.html
index f8073f4571..1000dbe9a4 100644
--- a/src/app/home-page/home-page.component.html
+++ b/src/app/home-page/home-page.component.html
@@ -5,5 +5,5 @@
   </ng-container>
   <ds-search-form [inPlaceSearch]="false" [searchPlaceholder]="'home.search-form.placeholder' | translate"></ds-search-form>
   <ds-top-level-community-list></ds-top-level-community-list>
-  <ds-recent-item-list></ds-recent-item-list>
+  <ds-recent-item-list *ngIf="recentSubmissionspageSize>0"></ds-recent-item-list>
 </div>
diff --git a/src/app/home-page/home-page.component.ts b/src/app/home-page/home-page.component.ts
index 65caa01430..c151cbbb16 100644
--- a/src/app/home-page/home-page.component.ts
+++ b/src/app/home-page/home-page.component.ts
@@ -3,7 +3,7 @@ import { map } from 'rxjs/operators';
 import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { Site } from '../core/shared/site.model';
-
+import { environment } from '../../environments/environment';
 @Component({
   selector: 'ds-home-page',
   styleUrls: ['./home-page.component.scss'],
@@ -12,10 +12,11 @@ import { Site } from '../core/shared/site.model';
 export class HomePageComponent implements OnInit {
 
   site$: Observable<Site>;
-
+  recentSubmissionspageSize: number;
   constructor(
     private route: ActivatedRoute,
   ) {
+    this.recentSubmissionspageSize = environment.homePage.recentSubmissions.pageSize;
   }
 
   ngOnInit(): void {
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.ts b/src/app/home-page/recent-item-list/recent-item-list.component.ts
index 294dac3954..df5359386a 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.ts
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.ts
@@ -43,11 +43,11 @@ export class RecentItemListComponent implements OnInit {
 
     this.paginationConfig = Object.assign(new PaginationComponentOptions(), {
       id: 'hp',
-      pageSize: environment.homePage.recentSubmissionsRpp,
+      pageSize: environment.homePage.recentSubmissions.pageSize,
       currentPage: 1,
       maxSize: 1
     });
-    this.sortConfig = new SortOptions(environment.homePage.recentSubmissionsSortField, SortDirection.DESC);
+    this.sortConfig = new SortOptions(environment.homePage.recentSubmissions.sortField, SortDirection.DESC);
   }
   ngOnInit(): void {
     this.itemRD$ = this.searchService.search(
@@ -62,7 +62,7 @@ export class RecentItemListComponent implements OnInit {
   }
   onLoadMore(): void {
     this.paginationService.updateRouteWithUrl(this.searchConfigurationService.paginationID, ['search'], {
-      sortField: environment.homePage.recentSubmissionsSortField,
+      sortField: environment.homePage.recentSubmissions.sortField,
       sortDirection: 'DESC' as SortDirection,
       page: 1
     });
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index f57425a79a..b1b64d1c87 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -340,9 +340,11 @@ export class DefaultAppConfig implements AppConfig {
   };
   // Home Pages
   homePage: HomeConfig = {
-    //The number of item showing in recent submission components
-    recentSubmissionsRpp: 5,
-    //sort record of recent submission
-    recentSubmissionsSortField: 'dc.date.accessioned',
+    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 564cd7f9fb..1f955358e0 100644
--- a/src/config/homepage-config.interface.ts
+++ b/src/config/homepage-config.interface.ts
@@ -4,14 +4,17 @@ import { Config } from './config.interface';
  * Config that determines how the dropdown list of years are created for browse-by-date components
  */
 export interface HomeConfig extends Config {
-  /**
+  recentSubmissions: {
+    /**
    * The number of item showing in recent submission components
    */
-   recentSubmissionsRpp: number;
+    pageSize: number;
+
+    /**
+     * sort record of recent submission
+     */
+    sortField: string;
+  }
 
-  /**
-   * sort record of recent submission
-   */
-   recentSubmissionsSortField: string;
 
 }
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index bb7f8a2962..6fe4dd6516 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -250,9 +250,10 @@ export const environment: BuildConfig = {
   },
   //Home Page
   homePage: {
-    //The number of item showing in recent submission components
-    recentSubmissionsRpp: 5,
-    //sort record of recent submission
-    recentSubmissionsSortField: 'dc.date.accessioned',
+    recentSubmissions: {
+      pageSize: 5,
+      //sort record of recent submission
+      sortField: 'dc.date.accessioned',
+    }
   }
 };

From 919b4062602c32eec3a19187505e7561e7a28b99 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Wed, 14 Sep 2022 08:32:04 +0200
Subject: [PATCH 44/48] 93803: Make ProcessDataService implement DeleteData

---
 .../processes/process-data.service.spec.ts    |  4 ++-
 .../data/processes/process-data.service.ts    | 33 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/app/core/data/processes/process-data.service.spec.ts b/src/app/core/data/processes/process-data.service.spec.ts
index eeec7ed6aa..88e5bd5791 100644
--- a/src/app/core/data/processes/process-data.service.spec.ts
+++ b/src/app/core/data/processes/process-data.service.spec.ts
@@ -8,10 +8,12 @@
 
 import { testFindAllDataImplementation } from '../base/find-all-data.spec';
 import { ProcessDataService } from './process-data.service';
+import { testDeleteDataImplementation } from '../base/delete-data.spec';
 
 describe('ProcessDataService', () => {
   describe('composition', () => {
-    const initService = () => new ProcessDataService(null, null, null, null, null);
+    const initService = () => new ProcessDataService(null, null, null, null, null, null);
     testFindAllDataImplementation(initService);
+    testDeleteDataImplementation(initService);
   });
 });
diff --git a/src/app/core/data/processes/process-data.service.ts b/src/app/core/data/processes/process-data.service.ts
index 9c484fed2d..99d4076ce1 100644
--- a/src/app/core/data/processes/process-data.service.ts
+++ b/src/app/core/data/processes/process-data.service.ts
@@ -16,11 +16,15 @@ import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model
 import { FindAllData, FindAllDataImpl } from '../base/find-all-data';
 import { FindListOptions } from '../find-list-options.model';
 import { dataService } from '../base/data-service.decorator';
+import { DeleteData, DeleteDataImpl } from '../base/delete-data';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { NoContent } from '../../shared/NoContent.model';
 
 @Injectable()
 @dataService(PROCESS)
-export class ProcessDataService extends IdentifiableDataService<Process> implements FindAllData<Process> {
+export class ProcessDataService extends IdentifiableDataService<Process> implements FindAllData<Process>, DeleteData<Process> {
   private findAllData: FindAllData<Process>;
+  private deleteData: DeleteData<Process>;
 
   constructor(
     protected requestService: RequestService,
@@ -28,10 +32,12 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected bitstreamDataService: BitstreamDataService,
+    protected notificationsService: NotificationsService,
   ) {
     super('processes', requestService, rdbService, objectCache, halService);
 
     this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
@@ -70,4 +76,29 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
   findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Process>[]): Observable<RemoteData<PaginatedList<Process>>> {
     return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
+
+  /**
+   * Delete an existing 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
+   */
+  public delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.delete(objectId, copyVirtualMetadata);
+  }
+
+  /**
+   * Delete an existing 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.
+   */
+  public deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.deleteByHref(href, copyVirtualMetadata);
+  }
 }

From c517ed0dfabd9f973d8ca89c6223eeba621eba8f Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Wed, 14 Sep 2022 10:30:34 +0200
Subject: [PATCH 45/48] 93803: Fix broken SearchDataImpl

I'd originally removed this `...linksToFollow` but it's actually required here because it's used when constructing the RemoteData

Added cypress/downloads to .gitignore because I'd accidentally committed a downloads.html file after running e2e tests locally
---
 cypress/.gitignore                         | 1 +
 src/app/core/data/base/search-data.spec.ts | 2 +-
 src/app/core/data/base/search-data.ts      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cypress/.gitignore b/cypress/.gitignore
index 99bd2a6312..645beff45f 100644
--- a/cypress/.gitignore
+++ b/cypress/.gitignore
@@ -1,2 +1,3 @@
 screenshots/
 videos/
+downloads/
diff --git a/src/app/core/data/base/search-data.spec.ts b/src/app/core/data/base/search-data.spec.ts
index d314960e97..31dddeddfc 100644
--- a/src/app/core/data/base/search-data.spec.ts
+++ b/src/app/core/data/base/search-data.spec.ts
@@ -134,7 +134,7 @@ describe('SearchDataImpl', () => {
       const out: any = service.searchBy('testMethod', options, false, true, ...linksToFollow);
 
       expect(service.getSearchByHref).toHaveBeenCalledWith('testMethod', options, ...linksToFollow);
-      expect(service.findListByHref).toHaveBeenCalledWith('endpoint', undefined, false, true);
+      expect(service.findListByHref).toHaveBeenCalledWith('endpoint', undefined, false, true, ...linksToFollow);
       expect(out).toBe('resulting remote data');
     });
   });
diff --git a/src/app/core/data/base/search-data.ts b/src/app/core/data/base/search-data.ts
index 751bff5c3a..536d6d6e25 100644
--- a/src/app/core/data/base/search-data.ts
+++ b/src/app/core/data/base/search-data.ts
@@ -99,7 +99,7 @@ export class SearchDataImpl<T extends CacheableObject> extends BaseDataService<T
   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.findListByHref(hrefObs, undefined, useCachedVersionIfAvailable, reRequestOnStale);
+    return this.findListByHref(hrefObs, undefined, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
   /**

From 6e5fe96696940a8d0aefcee47cfa51fcd3600795 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Thu, 15 Sep 2022 11:50:50 +0200
Subject: [PATCH 46/48] 94242: Add optional NavigationExtras to
 PaginationService.updateRoute

---
 .../pagination/pagination.service.spec.ts     | 21 ++++++++
 src/app/core/pagination/pagination.service.ts | 49 +++++++++++++------
 2 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/src/app/core/pagination/pagination.service.spec.ts b/src/app/core/pagination/pagination.service.spec.ts
index 18f94cc84c..6c188b088e 100644
--- a/src/app/core/pagination/pagination.service.spec.ts
+++ b/src/app/core/pagination/pagination.service.spec.ts
@@ -101,6 +101,17 @@ describe('PaginationService', () => {
 
       expect(router.navigate).toHaveBeenCalledWith([], {queryParams: navigateParams, queryParamsHandling: 'merge'});
     });
+    it('should pass on navigationExtras to router.navigate', () => {
+      service.updateRoute('test', {page: 2}, undefined, undefined, { queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
+
+      const navigateParams = {};
+      navigateParams[`test.page`] = `2`;
+      navigateParams[`test.rpp`] = `10`;
+      navigateParams[`test.sf`] = `score`;
+      navigateParams[`test.sd`] = `ASC`;
+
+      expect(router.navigate).toHaveBeenCalledWith([], {queryParams: navigateParams, queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
+    });
   });
   describe('updateRouteWithUrl', () => {
     it('should update the route with the provided page params and url', () => {
@@ -125,7 +136,17 @@ describe('PaginationService', () => {
 
       expect(router.navigate).toHaveBeenCalledWith(['someUrl'], {queryParams: navigateParams, queryParamsHandling: 'merge'});
     });
+    it('should pass on navigationExtras to router.navigate', () => {
+      service.updateRouteWithUrl('test',['someUrl'], {page: 2}, undefined, undefined, { queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
 
+      const navigateParams = {};
+      navigateParams[`test.page`] = `2`;
+      navigateParams[`test.rpp`] = `10`;
+      navigateParams[`test.sf`] = `score`;
+      navigateParams[`test.sd`] = `ASC`;
+
+      expect(router.navigate).toHaveBeenCalledWith(['someUrl'], {queryParams: navigateParams, queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
+    });
   });
   describe('clearPagination', () => {
     it('should clear the pagination next time the updateRoute/updateRouteWithUrl method is called', () => {
diff --git a/src/app/core/pagination/pagination.service.ts b/src/app/core/pagination/pagination.service.ts
index dae6991834..ce7155d3c6 100644
--- a/src/app/core/pagination/pagination.service.ts
+++ b/src/app/core/pagination/pagination.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Router } from '@angular/router';
+import { NavigationExtras, Router } from '@angular/router';
 import { RouteService } from '../services/route.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
@@ -114,15 +114,22 @@ export class PaginationService {
    * @param params - The page related params to update in the route
    * @param extraParams - Addition params unrelated to the pagination that need to be added to the route
    * @param retainScrollPosition - Scroll to the pagination component after updating the route instead of the top of the page
+   * @param navigationExtras - Extra parameters to pass on to `router.navigate`. Can be used to override values set by this service.
    */
-  updateRoute(paginationId: string, params: {
-    page?: number
-    pageSize?: number
-    sortField?: string
-    sortDirection?: SortDirection
-  }, extraParams?, retainScrollPosition?: boolean) {
+  updateRoute(
+    paginationId: string,
+    params: {
+      page?: number
+      pageSize?: number
+      sortField?: string
+      sortDirection?: SortDirection
+    },
+    extraParams?,
+    retainScrollPosition?: boolean,
+    navigationExtras?: NavigationExtras,
+  ) {
 
-    this.updateRouteWithUrl(paginationId, [], params, extraParams, retainScrollPosition);
+    this.updateRouteWithUrl(paginationId, [], params, extraParams, retainScrollPosition, navigationExtras);
   }
 
   /**
@@ -132,13 +139,21 @@ export class PaginationService {
    * @param params - The page related params to update in the route
    * @param extraParams - Addition params unrelated to the pagination that need to be added to the route
    * @param retainScrollPosition - Scroll to the pagination component after updating the route instead of the top of the page
+   * @param navigationExtras - Extra parameters to pass on to `router.navigate`. Can be used to override values set by this service.
    */
-  updateRouteWithUrl(paginationId: string, url: string[], params: {
-    page?: number
-    pageSize?: number
-    sortField?: string
-    sortDirection?: SortDirection
-  }, extraParams?, retainScrollPosition?: boolean) {
+  updateRouteWithUrl(
+    paginationId: string,
+    url: string[],
+    params: {
+      page?: number
+      pageSize?: number
+      sortField?: string
+      sortDirection?: SortDirection
+    },
+    extraParams?,
+    retainScrollPosition?: boolean,
+    navigationExtras?: NavigationExtras,
+  ) {
     this.getCurrentRouting(paginationId).subscribe((currentFindListOptions) => {
       const currentParametersWithIdName = this.getParametersWithIdName(paginationId, currentFindListOptions);
       const parametersWithIdName = this.getParametersWithIdName(paginationId, params);
@@ -149,12 +164,14 @@ export class PaginationService {
           this.router.navigate(url, {
             queryParams: queryParams,
             queryParamsHandling: 'merge',
-            fragment: `p-${paginationId}`
+            fragment: `p-${paginationId}`,
+            ...navigationExtras,
           });
         } else {
           this.router.navigate(url, {
             queryParams: queryParams,
-            queryParamsHandling: 'merge'
+            queryParamsHandling: 'merge',
+            ...navigationExtras,
           });
         }
         this.clearParams = {};

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 47/48] 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 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/48] 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));
   }
 }