From b62a4f6c538077f37295ce9b131af1fc65aff20a Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Tue, 18 Oct 2022 12:58:49 +0200
Subject: [PATCH 001/160] [CST-6171] Navbar border

---
 src/app/navbar/navbar.component.scss                        | 2 +-
 src/themes/dspace/app/navbar/navbar.component.scss          | 2 +-
 src/themes/dspace/styles/_theme_css_variable_overrides.scss | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/navbar/navbar.component.scss b/src/app/navbar/navbar.component.scss
index 3a9a302b06..320ce414ec 100644
--- a/src/app/navbar/navbar.component.scss
+++ b/src/app/navbar/navbar.component.scss
@@ -1,5 +1,5 @@
 nav.navbar {
-    border-bottom: 1px var(--bs-gray-400) solid;
+    border-bottom: 1px var(--ds-header-navbar-border-bottom-color) solid;
     align-items: baseline;
 }
 
diff --git a/src/themes/dspace/app/navbar/navbar.component.scss b/src/themes/dspace/app/navbar/navbar.component.scss
index 1ad95cb8aa..45d188a264 100644
--- a/src/themes/dspace/app/navbar/navbar.component.scss
+++ b/src/themes/dspace/app/navbar/navbar.component.scss
@@ -1,6 +1,6 @@
 nav.navbar {
   border-top: 1px var(--ds-header-navbar-border-top-color) solid;
-  border-bottom: 5px var(--bs-green) solid;
+  border-bottom: 5px var(--ds-header-navbar-border-bottom-color) solid;
   align-items: baseline;
   color: var(--ds-header-icon-color);
 }
diff --git a/src/themes/dspace/styles/_theme_css_variable_overrides.scss b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
index e4b4b61f45..516eff9f7e 100644
--- a/src/themes/dspace/styles/_theme_css_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
@@ -6,5 +6,6 @@
   --ds-banner-background-gradient-width: 300px;
   --ds-home-news-link-color: #{$green};
   --ds-home-news-link-hover-color: #{darken($green, 15%)};
+  --ds-header-navbar-border-bottom-color: #{$green};
 }
 

From a69f61e4f36730ec3204a8092259b07c659cd263 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Wed, 19 Oct 2022 00:58:59 +0200
Subject: [PATCH 002/160] [CST-6171] Item status type badge colors

---
 .../my-dspace-item-status.component.spec.ts   | 10 ++++----
 .../my-dspace-item-status.component.ts        | 10 ++++----
 src/styles/_global-styles.scss                | 24 +++++++++++++++++++
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts b/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts
index 44e6a44b70..59fc29424d 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts
+++ b/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts
@@ -55,34 +55,34 @@ describe('MyDSpaceItemStatusComponent', () => {
     component.status = MyDspaceItemStatusType.VALIDATION;
     fixture.detectChanges();
     expect(component.badgeContent).toBe(MyDspaceItemStatusType.VALIDATION);
-    expect(component.badgeClass).toBe('text-light badge badge-warning');
+    expect(component.badgeClass).toBe('text-light badge badge-validation');
   });
 
   it('should init badge content and class', () => {
     component.status = MyDspaceItemStatusType.WAITING_CONTROLLER;
     fixture.detectChanges();
     expect(component.badgeContent).toBe(MyDspaceItemStatusType.WAITING_CONTROLLER);
-    expect(component.badgeClass).toBe('text-light badge badge-info');
+    expect(component.badgeClass).toBe('text-light badge badge-waiting-controller');
   });
 
   it('should init badge content and class', () => {
     component.status = MyDspaceItemStatusType.WORKSPACE;
     fixture.detectChanges();
     expect(component.badgeContent).toBe(MyDspaceItemStatusType.WORKSPACE);
-    expect(component.badgeClass).toBe('text-light badge badge-primary');
+    expect(component.badgeClass).toBe('text-light badge badge-workspace');
   });
 
   it('should init badge content and class', () => {
     component.status = MyDspaceItemStatusType.ARCHIVED;
     fixture.detectChanges();
     expect(component.badgeContent).toBe(MyDspaceItemStatusType.ARCHIVED);
-    expect(component.badgeClass).toBe('text-light badge badge-success');
+    expect(component.badgeClass).toBe('text-light badge badge-archived');
   });
 
   it('should init badge content and class', () => {
     component.status = MyDspaceItemStatusType.WORKFLOW;
     fixture.detectChanges();
     expect(component.badgeContent).toBe(MyDspaceItemStatusType.WORKFLOW);
-    expect(component.badgeClass).toBe('text-light badge badge-info');
+    expect(component.badgeClass).toBe('text-light badge badge-workflow');
   });
 });
diff --git a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.ts b/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.ts
index 917dd45acc..83b2656fbd 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.ts
+++ b/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.ts
@@ -34,19 +34,19 @@ export class MyDSpaceItemStatusComponent implements OnInit {
     this.badgeClass = 'text-light badge ';
     switch (this.status) {
       case MyDspaceItemStatusType.VALIDATION:
-        this.badgeClass += 'badge-warning';
+        this.badgeClass += 'badge-validation';
         break;
       case MyDspaceItemStatusType.WAITING_CONTROLLER:
-        this.badgeClass += 'badge-info';
+        this.badgeClass += 'badge-waiting-controller';
         break;
       case MyDspaceItemStatusType.WORKSPACE:
-        this.badgeClass += 'badge-primary';
+        this.badgeClass += 'badge-workspace';
         break;
       case MyDspaceItemStatusType.ARCHIVED:
-        this.badgeClass += 'badge-success';
+        this.badgeClass += 'badge-archived';
         break;
       case MyDspaceItemStatusType.WORKFLOW:
-        this.badgeClass += 'badge-info';
+        this.badgeClass += 'badge-workflow';
         break;
     }
   }
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index 930384cf64..1bc0c8c435 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -204,3 +204,27 @@ ds-dynamic-form-control-container.d-none {
 }
 
 
+
+.badge-validation {
+  background-color: #{map-get($theme-colors, warning)};
+}
+
+.badge-waiting-controller {
+  background-color: #{map-get($theme-colors, info)};
+}
+
+.badge-workspace {
+  background-color: #{map-get($theme-colors, primary)};
+}
+
+.badge-archived {
+  background-color: #{map-get($theme-colors, success)};
+}
+
+.badge-workflow {
+  background-color: #{map-get($theme-colors, info)};
+}
+
+.badge-item-type {
+  background-color: #{map-get($theme-colors, info)};
+}

From f109e97a0ca61b8c4a520f6661d17f25b894b861 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Fri, 21 Oct 2022 12:50:59 +0200
Subject: [PATCH 003/160] [CST-6171] Semantic color scheme

---
 .../styles/_theme_sass_variable_overrides.scss     | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
index 9257bc46dd..b5799c9749 100644
--- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
@@ -10,7 +10,7 @@ $font-family-sans-serif: 'Nunito', -apple-system, BlinkMacSystemFont, "Segoe UI"
 $navbar-dark-color: #FFFFFF;
 
 /* Reassign color vars to semantic color scheme */
-$blue: #43515f !default;
+$blue: #2b4e72 !default;
 $green: #92C642 !default;
 $cyan: #207698 !default;
 $yellow: #ec9433 !default;
@@ -18,6 +18,7 @@ $red: #CF4444 !default;
 $dark: #43515f !default;
 
 $gray-800: #343a40 !default;
+$gray-700: #495057 !default;
 $gray-400: #ced4da !default;
 $gray-100: #f8f9fa !default;
 
@@ -27,3 +28,14 @@ $table-accent-bg: $gray-100 !default;   // Bootstrap $gray-100
 $table-hover-bg: $gray-400 !default;   // Bootstrap $gray-400
 
 $yiq-contrasted-threshold:  170 !default;
+
+$theme-colors: (
+        primary: $dark,
+        secondary: $gray-700,
+        success: $green,
+        info: $cyan,
+        warning: $yellow,
+        danger: $red,
+        light: $gray-100,
+        dark: $dark
+) !default;

From e6065b7504867334690cc7748f1dacbb8c8ad769 Mon Sep 17 00:00:00 2001
From: Ying Jin <yj4@rice.edu>
Date: Wed, 16 Nov 2022 10:34:00 -0600
Subject: [PATCH 004/160] add captioning support for video/audio files

---
 .../core/shared/media-viewer-item.model.ts    |   5 +
 .../media-viewer-video/caption-info.ts        |   4 +
 .../media-viewer-video/language-helper.ts     | 190 ++++++++++++++++++
 .../media-viewer-video.component.html         |  11 +-
 .../media-viewer-video.component.ts           |  38 +++-
 .../media-viewer/media-viewer.component.ts    |   1 +
 6 files changed, 245 insertions(+), 4 deletions(-)
 create mode 100644 src/app/item-page/media-viewer/media-viewer-video/caption-info.ts
 create mode 100644 src/app/item-page/media-viewer/media-viewer-video/language-helper.ts

diff --git a/src/app/core/shared/media-viewer-item.model.ts b/src/app/core/shared/media-viewer-item.model.ts
index cd3a31bd0b..38c53944d1 100644
--- a/src/app/core/shared/media-viewer-item.model.ts
+++ b/src/app/core/shared/media-viewer-item.model.ts
@@ -14,6 +14,11 @@ export class MediaViewerItem {
    */
   format: string;
 
+  /**
+   * Incoming Bitsream format mime type
+   */
+  minetype: string;
+
   /**
    * Incoming Bitsream thumbnail
    */
diff --git a/src/app/item-page/media-viewer/media-viewer-video/caption-info.ts b/src/app/item-page/media-viewer/media-viewer-video/caption-info.ts
new file mode 100644
index 0000000000..011249027f
--- /dev/null
+++ b/src/app/item-page/media-viewer/media-viewer-video/caption-info.ts
@@ -0,0 +1,4 @@
+export class CaptionInfo {
+  constructor(public src: string, public srclang: string, public langLabel: string ) {
+  }
+}
diff --git a/src/app/item-page/media-viewer/media-viewer-video/language-helper.ts b/src/app/item-page/media-viewer/media-viewer-video/language-helper.ts
new file mode 100644
index 0000000000..b27ab9983f
--- /dev/null
+++ b/src/app/item-page/media-viewer/media-viewer-video/language-helper.ts
@@ -0,0 +1,190 @@
+export const languageHelper = {
+  ab: 'Abkhazian',
+  aa: 'Afar',
+  af: 'Afrikaans',
+	ak: 'Akan',
+	sq: 'Albanian',
+	am: 'Amharic',
+	ar: 'Arabic',
+	an: 'Aragonese',
+	hy: 'Armenian',
+	as: 'Assamese',
+  av: 'Avaric',
+	ae: 'Avestan',
+	ay: 'Aymara',
+	az: 'Azerbaijani',
+	bm: 'Bambara',
+	ba: 'Bashkir',
+	eu: 'Basque',
+	be: 'Belarusian',
+	bn: 'Bengali (Bangla)',
+	bh: 'Bihari',
+	bi: 'Bislama',
+	bs: 'Bosnian',
+	br: 'Breton',
+	bg: 'Bulgarian',
+	my: 'Burmese',
+	ca: 'Catalan',
+	ch: 'Chamorro',
+	ce: 'Chechen',
+	ny: 'Chichewa, Chewa, Nyanja',
+	zh: 'Chinese',
+	cv: 'Chuvash',
+	kw: 'Cornish',
+	co: 'Corsican',
+	cr: 'Cree',
+	hr: 'Croatian',
+	cs: 'Czech',
+	da: 'Danish',
+  dv: 'Divehi, Dhivehi, Maldivian',
+	nl: 'Dutch',
+	dz: 'Dzongkha',
+	en: 'English',
+	eo: 'Esperanto',
+	et: 'Estonian',
+	ee: 'Ewe',
+	fo: 'Faroese',
+	fj: 'Fijian',
+	fi: 'Finnish',
+	fr: 'French',
+	ff: 'Fula, Fulah, Pulaar, Pular',
+	gl: 'Galician',
+	gd: 'Gaelic (Scottish)',
+	gv: 'Gaelic (Manx)',
+	ka: 'Georgian',
+	de: 'German',
+	el: 'Greek',
+  gn: 'Guarani',
+	gu: 'Gujarati',
+	ht: 'Haitian Creole',
+	ha: 'Hausa',
+	he: 'Hebrew',
+	hz: 'Herero',
+	hi: 'Hindi',
+	ho: 'Hiri Motu',
+	hu: 'Hungarian',
+	is: 'Icelandic',
+	io: 'Ido',
+	ig: 'Igbo',
+  in: 'Indonesian',
+	ia: 'Interlingua',
+	ie: 'Interlingue',
+	iu: 'Inuktitut',
+	ik: 'Inupiak',
+	ga: 'Irish',
+	it: 'Italian',
+	ja: 'Japanese',
+	jv: 'Javanese',
+	kl: 'Kalaallisut, Greenlandic',
+	kn: 'Kannada',
+	kr: 'Kanuri',
+	ks: 'Kashmiri',
+	kk: 'Kazakh',
+	km: 'Khmer',
+	ki: 'Kikuyu',
+	rw: 'Kinyarwanda (Rwanda)',
+	rn: 'Kirundi',
+	ky: 'Kyrgyz',
+	kv: 'Komi',
+	kg: 'Kongo',
+	ko: 'Korean',
+	ku: 'Kurdish',
+	kj: 'Kwanyama',
+	lo: 'Lao',
+	la: 'Latin',
+	lv: 'Latvian (Lettish)',
+	li: 'Limburgish ( Limburger)',
+	ln: 'Lingala',
+	lt: 'Lithuanian',
+	lu: 'Luga-Katanga',
+	lg: 'Luganda, Ganda',
+	lb: 'Luxembourgish',
+	mk: 'Macedonian',
+	mg: 'Malagasy',
+	ms: 'Malay',
+	ml: 'Malayalam',
+	mt: 'Maltese',
+	mi: 'Maori',
+	mr: 'Marathi',
+	mh: 'Marshallese',
+	mo: 'Moldavian',
+	mn: 'Mongolian',
+	na: 'Nauru',
+	nv: 'Navajo',
+	ng: 'Ndonga',
+	nd: 'Northern Ndebele',
+	ne: 'Nepali',
+	no: 'Norwegian',
+	nb: 'Norwegian bokmål',
+	nn: 'Norwegian nynorsk',
+	oc: 'Occitan',
+	oj: 'Ojibwe',
+	cu: 'Old Church Slavonic, Old Bulgarian',
+	or: 'Oriya',
+	om: 'Oromo (Afaan Oromo)',
+	os: 'Ossetian',
+	pi: 'Pāli',
+	ps: 'Pashto, Pushto',
+	fa: 'Persian (Farsi)',
+	pl: 'Polish',
+	pt: 'Portuguese',
+	pa: 'Punjabi (Eastern)',
+	qu: 'Quechua',
+	rm: 'Romansh',
+	ro: 'Romanian',
+	ru: 'Russian',
+	se: 'Sami',
+	sm: 'Samoan',
+	sg: 'Sango',
+	sa: 'Sanskrit',
+	sr: 'Serbian',
+	sh: 'Serbo-Croatian',
+	st: 'Sesotho',
+	tn: 'Setswana',
+	sn: 'Shona',
+	ii: 'Sichuan Yi, Nuosu',
+	sd: 'Sindhi',
+	si: 'Sinhalese',
+	ss: 'Siswati (Swati)',
+	sk: 'Slovak',
+	sl: 'Slovenian',
+	so: 'Somali',
+	nr: 'Southern Ndebele',
+	es: 'Spanish',
+	su: 'Sundanese',
+	sw: 'Swahili (Kiswahili)',
+	sv: 'Swedish',
+	tl: 'Tagalog',
+	ty: 'Tahitian',
+	tg: 'Tajik',
+	ta: 'Tamil',
+	tt: 'Tatar',
+	te: 'Telugu',
+	th: 'Thai',
+	bo: 'Tibetan',
+	ti: 'Tigrinya',
+	to: 'Tonga',
+	ts: 'Tsonga',
+	tr: 'Turkish',
+	tk: 'Turkmen',
+	tw: 'Twi',
+	ug: 'Uyghur',
+	uk: 'Ukrainian',
+	ur: 'Urdu',
+	uz: 'Uzbek',
+	ve: 'Venda',
+	vi: 'Vietnamese',
+	vo: 'Volapük',
+	wa: 'Wallon',
+	cy: 'Welsh',
+	wo: 'Wolof',
+	fy: 'Western Frisian',
+	xh: 'Xhosa',
+  yi: 'Yiddish',
+	yo: 'Yoruba',
+	za: 'Zhuang, Chuang',
+	zu: 'Zulu'
+};
+
+
+
diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
index a4493e36fc..5e74437393 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
+++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
@@ -1,4 +1,5 @@
 <video
+  crossorigin="anonymous"
   #media
   [src]="filteredMedias[currentIndex].bitstream._links.content.href"
   id="singleVideo"
@@ -8,7 +9,15 @@
   "
   preload="none"
   controls
-></video>
+>
+<!--  <track default kind="captions" src="./assets/vtt/JusticeAndTransformation_caption.mp4-en.vtt" label="English" type="text/vtt"/>-->
+  <ng-container *ngIf="getMediaCap(filteredMedias[currentIndex].bitstream.name) as capInfos">
+    <ng-container *ngFor="let capInfo of capInfos">
+      <track [src]="capInfo.src" [label]="capInfo.langLabel" [srclang]="capInfo.srclang" />
+    </ng-container>
+  </ng-container>
+
+</video>
 <div class="buttons" *ngIf="filteredMedias?.length > 1">
   <button
     class="btn btn-primary previous"
diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
index 4c578a51bb..c4806d8306 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
@@ -1,5 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
+import { languageHelper } from './language-helper';
+import { CaptionInfo} from './caption-info';
 
 /**
  * This componenet renders a video viewer and playlist for the media viewer
@@ -26,9 +28,39 @@ export class MediaViewerVideoComponent implements OnInit {
 
   ngOnInit() {
     this.isCollapsed = false;
-    this.filteredMedias = this.medias.filter(
-      (media) => media.format === 'audio' || media.format === 'video'
-    );
+    this.filteredMedias = this.medias.filter((media) => media.format === 'audio' || media.format === 'video');
+  }
+
+  /**
+   * This method check if there is caption file for the media
+   * The caption file name is the media name plus "-" following two letter
+   * language code and .vtt suffix
+   *
+   * html5 video only support WEBVTT format
+   *
+   * Two letter language code reference
+   * https://www.w3schools.com/tags/ref_language_codes.asp
+   */
+  getMediaCap(name: string): CaptionInfo[] {
+    let filteredCapMedias: MediaViewerItem[];
+    let capInfos: CaptionInfo[] = [];
+    filteredCapMedias = this.medias
+       .filter((media) => media.minetype === 'text/vtt')
+       .filter((media) => media.bitstream.name.substring(0, (media.bitstream.name.length - 7) ).toLowerCase() === name.toLowerCase());
+
+    if (filteredCapMedias) {
+      filteredCapMedias
+        .forEach((media, index) => {
+          let srclang: string = media.bitstream.name.slice(-6, -4).toLowerCase();
+          //capInfos[index] = new CaptionInfo(
+          capInfos.push(new CaptionInfo(
+            media.bitstream._links.content.href,
+            srclang,
+            languageHelper[srclang]
+          ));
+        });
+    }
+    return capInfos;
   }
 
   /**
diff --git a/src/app/item-page/media-viewer/media-viewer.component.ts b/src/app/item-page/media-viewer/media-viewer.component.ts
index 3f9de8ed3e..7ee60704eb 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer.component.ts
@@ -108,6 +108,7 @@ export class MediaViewerComponent implements OnInit {
     const mediaItem = new MediaViewerItem();
     mediaItem.bitstream = original;
     mediaItem.format = format.mimetype.split('/')[0];
+    mediaItem.minetype = format.mimetype;
     mediaItem.thumbnail = thumbnail ? thumbnail._links.content.href : null;
     return mediaItem;
   }

From 7d58a1eb0a6c2bd3e432fb4c4963cd6659c8a0bd Mon Sep 17 00:00:00 2001
From: Nikunj Sharma <nikunj.sharma@4science.com>
Date: Fri, 18 Nov 2022 15:14:55 +0530
Subject: [PATCH 005/160] [CST-7604] fixed text highlight on search page

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

diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index 6b2951495d..3a42eae1f5 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -19,9 +19,9 @@
     <ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">
       <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="dsoTitle"></a>
+         [innerHTML]="firstMetadataValue('dc.title') || 'Undefined'"></a>
       <span *ngIf="linkType == linkTypes.None" class="lead item-list-title dont-break-out"
-            [innerHTML]="dsoTitle"></span>
+            [innerHTML]="firstMetadataValue('dc.title') || 'Undefined'"></span>
       <span class="text-muted">
       <ds-truncatable-part [id]="dso.id" [minLines]="1">
         <ng-container *ngIf="dso.firstMetadataValue('dc.publisher') || dso.firstMetadataValue('dc.date.issued')">
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
index d1e6c27ba4..f85e4c23b5 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
@@ -205,6 +205,18 @@ describe('ItemSearchResultListElementComponent', () => {
     });
   });
 
+  describe('When the item has title', () => {
+    beforeEach(() => {
+      publicationListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+
+    it('should show the title', () => {
+      const titleField = fixture.debugElement.query(By.css('.item-list-title'));
+      expect(titleField).not.toBeNull();
+    });
+  });
+
   describe('When the item has no title', () => {
     beforeEach(() => {
       publicationListElementComponent.object = mockItemWithoutMetadata;

From 1ee3114432770db7a79562fd2199bb8fdb41051a Mon Sep 17 00:00:00 2001
From: Nikunj Sharma <nikunj.sharma@4science.com>
Date: Fri, 18 Nov 2022 18:09:26 +0530
Subject: [PATCH 006/160] [CST-7604] fixed text highlight on search page

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

diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index 3a42eae1f5..ad0206bd4e 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -19,9 +19,9 @@
     <ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">
       <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="firstMetadataValue('dc.title') || 'Undefined'"></a>
+         [innerHTML]="firstMetadataValue('dc.title') ?? dsoTitle"></a>
       <span *ngIf="linkType == linkTypes.None" class="lead item-list-title dont-break-out"
-            [innerHTML]="firstMetadataValue('dc.title') || 'Undefined'"></span>
+            [innerHTML]="firstMetadataValue('dc.title') ?? dsoTitle"></span>
       <span class="text-muted">
       <ds-truncatable-part [id]="dso.id" [minLines]="1">
         <ng-container *ngIf="dso.firstMetadataValue('dc.publisher') || dso.firstMetadataValue('dc.date.issued')">
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
index f85e4c23b5..660377746a 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
@@ -13,7 +13,7 @@ import { APP_CONFIG } from '../../../../../../../config/app-config.interface';
 
 let publicationListElementComponent: ItemSearchResultListElementComponent;
 let fixture: ComponentFixture<ItemSearchResultListElementComponent>;
-
+const dcTitle = 'This is just another <em>title</em>';
 const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResult(), {
   indexableObject:
     Object.assign(new Item(), {
@@ -22,7 +22,7 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResul
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
+            value: dcTitle
           }
         ],
         'dc.contributor.author': [
@@ -211,9 +211,9 @@ describe('ItemSearchResultListElementComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should show the title', () => {
+    it('should show highlighted title', () => {
       const titleField = fixture.debugElement.query(By.css('.item-list-title'));
-      expect(titleField).not.toBeNull();
+      expect(titleField.nativeNode.innerHTML).toEqual(dcTitle);
     });
   });
 

From e7607da0a2f2e6344d482723558f850cac919eff Mon Sep 17 00:00:00 2001
From: Nikunj Sharma <nikunj.sharma@4science.com>
Date: Thu, 24 Nov 2022 14:17:50 +0530
Subject: [PATCH 007/160] [CST-7694] fixed group edit issue for non permanent
 group

---
 .../group-form/group-form.component.spec.ts   | 37 +++++++++++++++++++
 .../group-form/group-form.component.ts        |  4 +-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/app/access-control/group-registry/group-form/group-form.component.spec.ts b/src/app/access-control/group-registry/group-form/group-form.component.spec.ts
index 09487a7eaa..a7a7cb5be4 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.spec.ts
+++ b/src/app/access-control/group-registry/group-form/group-form.component.spec.ts
@@ -266,6 +266,43 @@ describe('GroupFormComponent', () => {
         fixture.detectChanges();
       });
 
+      it('should edit with name and description operations', () => {
+        const operations = [{
+          op: 'add',
+          path: '/metadata/dc.description',
+          value: 'testDescription'
+        }, {
+          op: 'replace',
+          path: '/name',
+          value: 'newGroupName'
+        }];
+        expect(groupsDataServiceStub.patch).toHaveBeenCalledWith(expected, operations);
+      });
+
+      it('should edit with description operations', () => {
+        component.groupName.value = null;
+        component.onSubmit();
+        fixture.detectChanges();
+        const operations = [{
+          op: 'add',
+          path: '/metadata/dc.description',
+          value: 'testDescription'
+        }];
+        expect(groupsDataServiceStub.patch).toHaveBeenCalledWith(expected, operations);
+      });
+
+      it('should edit with name operations', () => {
+        component.groupDescription.value = null;
+        component.onSubmit();
+        fixture.detectChanges();
+        const operations = [{
+          op: 'replace',
+          path: '/name',
+          value: 'newGroupName'
+        }];
+        expect(groupsDataServiceStub.patch).toHaveBeenCalledWith(expected, operations);
+      });
+
       it('should emit the existing group using the correct new values', waitForAsync(() => {
         fixture.whenStable().then(() => {
           expect(component.submitForm.emit).toHaveBeenCalledWith(expected2);
diff --git a/src/app/access-control/group-registry/group-form/group-form.component.ts b/src/app/access-control/group-registry/group-form/group-form.component.ts
index b0178f1294..d84667f04e 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.ts
+++ b/src/app/access-control/group-registry/group-form/group-form.component.ts
@@ -344,8 +344,8 @@ export class GroupFormComponent implements OnInit, OnDestroy {
 
     if (hasValue(this.groupDescription.value)) {
       operations = [...operations, {
-        op: 'replace',
-        path: '/metadata/dc.description/0/value',
+        op: 'add',
+        path: '/metadata/dc.description',
         value: this.groupDescription.value
       }];
     }

From 92f94c39b2374b83ef7f1243f66401c5162c6fb2 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 29 Nov 2022 18:02:13 +0100
Subject: [PATCH 008/160] 97075: Edit metadata redesign

---
 .../dso-edit-metadata-form.ts                 | 133 ++++++++++++++++++
 .../dso-edit-metadata.component.html          | 126 +++++++++++++++++
 .../dso-edit-metadata.component.scss          |  73 ++++++++++
 .../dso-edit-metadata.component.ts            |  99 +++++++++++++
 .../metadata-field-selector.component.html    |  18 +++
 .../metadata-field-selector.component.scss    |   0
 .../metadata-field-selector.component.ts      |  68 +++++++++
 src/app/dso-shared/dso-shared.module.ts       |  20 +++
 .../edit-item-page/edit-item-page.module.ts   |   4 +-
 .../edit-item-page.routing.module.ts          |   3 +-
 src/styles/_bootstrap_variables_mapping.scss  |   6 +
 11 files changed, 548 insertions(+), 2 deletions(-)
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
 create mode 100644 src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
 create mode 100644 src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.scss
 create mode 100644 src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
 create mode 100644 src/app/dso-shared/dso-shared.module.ts

diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
new file mode 100644
index 0000000000..c059f5064f
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
@@ -0,0 +1,133 @@
+import { MetadataMap, MetadataValue } from '../../core/shared/metadata.models';
+import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
+
+export enum DsoEditMetadataChangeType {
+  UPDATE = 1,
+  ADD = 2,
+  REMOVE = 3
+}
+
+export class DsoEditMetadataValue {
+  originalValue: MetadataValue;
+  newValue: MetadataValue;
+  reinstatableValue: MetadataValue;
+
+  editing = false;
+  change: DsoEditMetadataChangeType;
+  reinstatableChange: DsoEditMetadataChangeType;
+
+  constructor(value: MetadataValue, added = false) {
+    this.originalValue = value;
+    this.newValue = Object.assign(new MetadataValue(), value);
+    if (added) {
+      this.change = DsoEditMetadataChangeType.ADD;
+      this.editing = true;
+    }
+  }
+
+  confirmChanges() {
+    if (hasNoValue(this.change) || this.change === DsoEditMetadataChangeType.UPDATE) {
+      if ((this.originalValue.value !== this.newValue.value || this.originalValue.language !== this.newValue.language)) {
+        this.change = DsoEditMetadataChangeType.UPDATE;
+      } else {
+        this.change = undefined;
+      }
+    }
+    this.editing = false;
+  }
+
+  hasChanges(): boolean {
+    return hasValue(this.change);
+  }
+
+  discardAndMarkReinstatable(): void {
+    if (this.change === DsoEditMetadataChangeType.UPDATE) {
+      this.reinstatableValue = this.newValue;
+    }
+    this.reinstatableChange = this.change;
+    this.discard();
+  }
+
+  discard(): void {
+    this.change = undefined;
+    this.newValue = Object.assign(new MetadataValue(), this.originalValue);
+    this.editing = false;
+  }
+
+  reinstate(): void {
+    this.newValue = this.reinstatableValue;
+    this.reinstatableValue = undefined;
+    this.change = this.reinstatableChange;
+    this.reinstatableChange = undefined;
+  }
+
+  isReinstatable(): boolean {
+    return hasValue(this.reinstatableValue) || hasValue(this.reinstatableChange);
+  }
+}
+
+export class DsoEditMetadataForm {
+  fieldKeys: string[];
+  fields: {
+    [mdField: string]: DsoEditMetadataValue[],
+  };
+  newValue: DsoEditMetadataValue;
+
+  constructor(metadata: MetadataMap) {
+    this.fieldKeys = [];
+    this.fields = {};
+    Object.entries(metadata).forEach(([mdField, values]: [string, MetadataValue[]]) => {
+      this.fieldKeys.push(mdField);
+      this.fields[mdField] = values.map((value) => new DsoEditMetadataValue(value));
+    });
+  }
+
+  add(): void {
+    if (hasNoValue(this.newValue)) {
+      this.newValue = new DsoEditMetadataValue(new MetadataValue(), true);
+    }
+  }
+
+  setMetadataField(mdField: string) {
+    if (isEmpty(this.fields[mdField])) {
+      this.fieldKeys.push(mdField);
+      this.fields[mdField] = [];
+    }
+    this.fields[mdField].push(this.newValue);
+    this.newValue = undefined;
+  }
+
+  remove(mdField: string, index: number) {
+    if (isNotEmpty(this.fields[mdField])) {
+      this.fields[mdField].splice(index, 1);
+      if (this.fields[mdField].length === 0) {
+        this.fieldKeys.splice(this.fieldKeys.indexOf(mdField), 1);
+        delete this.fields[mdField];
+      }
+    }
+  }
+
+  hasChanges(): boolean {
+    return Object.values(this.fields).some((values) => values.some((value) => value.hasChanges()));
+  }
+
+  discard(): void {
+    Object.values(this.fields).forEach((values) => {
+      values.forEach((value) => {
+        value.discard();
+      });
+    });
+  }
+
+  reinstate(): void {
+    Object.values(this.fields).forEach((values) => {
+      values.forEach((value) => {
+        value.reinstate();
+      });
+    });
+  }
+
+  isReinstatable(): boolean {
+    return Object.values(this.fields).some((values) => values.some((value) => value.isReinstatable()));
+  }
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
new file mode 100644
index 0000000000..abe671e6f3
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -0,0 +1,126 @@
+<div class="item-metadata" *ngIf="form">
+  <div class="button-row top d-flex my-2 space-children-mr">
+    <button class="mr-auto btn btn-success" [disabled]="form.newValue"
+            (click)="add()"><i class="fas fa-plus"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.add-button' | translate }}</span>
+    </button>
+    <button class="btn btn-warning" *ngIf="isReinstatable"
+            (click)="reinstate()"><i class="fas fa-undo-alt"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.reinstate-button' | translate }}</span>
+    </button>
+    <button class="btn btn-primary" [disabled]="!hasChanges"
+            (click)="submit()"><i class="fas fa-save"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.save-button' | translate }}</span>
+    </button>
+    <button class="btn btn-danger" *ngIf="!isReinstatable"
+            [disabled]="!hasChanges"
+            (click)="discard()"><i class="fas fa-times"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.discard-button' | translate }}</span>
+    </button>
+  </div>
+
+  <div class="d-flex flex-row ds-field-row ds-header-row">
+    <div class="lbl-cell">Field</div>
+    <div class="flex-grow-1">
+      <div class="d-flex flex-row">
+        <div class="flex-grow-1 ds-flex-cell ds-value-cell"><b class="dont-break-out preserve-line-breaks">Value</b></div>
+        <div class="ds-flex-cell ds-lang-cell"><b>Lang</b></div>
+        <div class="text-center ds-flex-cell ds-edit-cell"><b>Edit</b></div>
+      </div>
+    </div>
+  </div>
+  <div class="d-flex flex-row ds-field-row" *ngIf="form.newValue">
+    <div class="lbl-cell ds-success">
+      <ds-metadata-field-selector [(mdField)]="newMdField"></ds-metadata-field-selector>
+    </div>
+    <div class="flex-grow-1 ds-drop-list">
+      <div class="d-flex flex-row ds-value-row ds-success">
+        <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex align-items-center">
+          <input class="form-control" type="text" [(ngModel)]="form.newValue.newValue.value" />
+        </div>
+        <div class="ds-flex-cell ds-lang-cell">
+          <input class="form-control" type="text" [(ngModel)]="form.newValue.newValue.language" />
+        </div>
+        <div class="text-center ds-flex-cell ds-edit-cell">
+          <div class="btn-group edit-field">
+            <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="Confirm changes"
+                    [disabled]="!newMdField" (click)="form.setMetadataField(newMdField)">
+              <i class="fas fa-check fa-fw"></i>
+            </button>
+            <button class="btn btn-outline-danger btn-sm" ngbTooltip="Remove" [disabled]="true">
+              <i class="fas fa-trash-alt fa-fw"></i>
+            </button>
+            <button class="btn btn-outline-warning btn-sm" ngbTooltip="Undo changes" (click)="form.newValue = undefined">
+              <i class="fas fa-undo-alt fa-fw"></i>
+            </button>
+            <button class="btn btn-outline-secondary ds-drag-handle btn-sm" ngbTooltip="Drag to reorder" [disabled]="true">
+              <i class="fas fa-grip-vertical fa-fw"></i>
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="d-flex flex-row ds-field-row" *ngFor="let mdField of form.fieldKeys">
+    <div class="lbl-cell">
+      <span>{{ mdField }}</span>
+    </div>
+    <div class="flex-grow-1 ds-drop-list">
+      <div class="d-flex flex-row ds-value-row"
+           [ngClass]="{ 'ds-warning': mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD }"
+           *ngFor="let mdValue of form.fields[mdField]; let idx = index">
+        <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex align-items-center">
+          <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing">{{ mdValue.newValue.value }}</div>
+          <input class="form-control" type="text" *ngIf="mdValue.editing" [(ngModel)]="mdValue.newValue.value" />
+        </div>
+        <div class="ds-flex-cell ds-lang-cell">
+          <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing">{{ mdValue.newValue.language }}</div>
+          <input class="form-control" type="text" *ngIf="mdValue.editing" [(ngModel)]="mdValue.newValue.language" />
+        </div>
+        <div class="text-center ds-flex-cell ds-edit-cell">
+          <div class="btn-group edit-field">
+            <button class="btn btn-outline-primary btn-sm ng-star-inserted" ngbTooltip="Edit" *ngIf="!mdValue.editing"
+                    [disabled]="mdValue.change && mdValue.change !== DsoEditMetadataChangeTypeEnum.UPDATE" (click)="mdValue.editing = true">
+              <i class="fas fa-edit fa-fw"></i>
+            </button>
+            <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="Confirm changes" *ngIf="mdValue.editing"
+                    (click)="mdValue.confirmChanges()">
+              <i class="fas fa-check fa-fw"></i>
+            </button>
+            <button class="btn btn-outline-danger btn-sm" ngbTooltip="Remove"
+                    [disabled]="mdValue.change || mdValue.editing" (click)="mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE">
+              <i class="fas fa-trash-alt fa-fw"></i>
+            </button>
+            <button class="btn btn-outline-warning btn-sm" ngbTooltip="Undo changes"
+                    [disabled]="!mdValue.change && !mdValue.editing" (click)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.discard()">
+              <i class="fas fa-undo-alt fa-fw"></i>
+            </button>
+            <!-- TODO: Enable drag -->
+            <button class="btn btn-outline-secondary ds-drag-handle btn-sm" ngbTooltip="Drag to reorder" [disabled]="true">
+              <i class="fas fa-grip-vertical fa-fw"></i>
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div *ngIf="isEmpty">
+    <ds-alert [content]="dsoType + '.edit.metadata.empty'" [type]="AlertTypeEnum.Info"></ds-alert>
+  </div>
+  <div class="button-row bottom">
+    <div class="mt-2 float-right space-children-mr ml-gap">
+      <button class="btn btn-warning" *ngIf="isReinstatable"
+              (click)="reinstate()"><i class="fas fa-undo-alt"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
+      </button>
+      <button class="btn btn-primary" [disabled]="!hasChanges"
+              (click)="submit()"><i class="fas fa-save"></i> {{ dsoType + '.edit.metadata.save-button' | translate }}
+      </button>
+      <button class="btn btn-danger" *ngIf="!isReinstatable"
+              [disabled]="!hasChanges"
+              (click)="discard()"><i class="fas fa-times"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
+      </button>
+    </div>
+  </div>
+</div>
+<ds-loading *ngIf="!form"></ds-loading>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
new file mode 100644
index 0000000000..a13afaf07e
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
@@ -0,0 +1,73 @@
+.lbl-cell {
+  min-width: 210px;
+  background-color: var(--bs-gray-100);
+  font-weight: bold;
+
+  &.ds-success {
+    background-color: var(--bs-success-bg);
+    border: 1px solid var(--bs-success);
+  }
+}
+
+.lbl-cell,
+.ds-flex-cell {
+  padding: 1rem;
+  border: 1px solid var(--bs-gray-200);
+}
+
+.ds-lang-cell {
+  min-width: 72px;
+}
+
+.ds-edit-cell {
+  min-width: 173px;
+}
+
+.ds-value-row {
+  background-color: white;
+
+  &:active {
+    cursor: grabbing;
+  }
+
+  &.ds-warning {
+    background-color: var(--bs-warning-bg);
+
+    .ds-flex-cell {
+      border: 1px solid var(--bs-warning);
+    }
+  }
+
+  &.ds-danger {
+    background-color: var(--bs-danger-bg);
+
+    .ds-flex-cell {
+      border: 1px solid var(--bs-danger);
+    }
+  }
+
+  &.ds-success {
+    background-color: var(--bs-success-bg);
+
+    .ds-flex-cell {
+      border: 1px solid var(--bs-success);
+    }
+  }
+}
+
+.ds-drop-list {
+  background-color: var(--bs-gray-500);
+}
+
+.ds-field-row {
+  border: 1px solid var(--bs-gray-400);
+}
+
+
+.ds-header-row {
+  background-color: var(--bs-gray-100);
+}
+
+.ds-drag-handle {
+  cursor: grab;
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
new file mode 100644
index 0000000000..d961d9dce9
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -0,0 +1,99 @@
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { AlertType } from '../../shared/alert/aletr-type';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { DsoEditMetadataChangeType, DsoEditMetadataForm } from './dso-edit-metadata-form';
+import { map, switchMap } from 'rxjs/operators';
+import { ActivatedRoute, Data } from '@angular/router';
+import { combineLatest as observableCombineLatest } from 'rxjs/internal/observable/combineLatest';
+import { Subscription } from 'rxjs/internal/Subscription';
+import { RemoteData } from '../../core/data/remote-data';
+import { hasNoValue, hasValue } from '../../shared/empty.util';
+import { RegistryService } from '../../core/registry/registry.service';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { Observable } from 'rxjs/internal/Observable';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import { getFirstSucceededRemoteData, metadataFieldsToString } from '../../core/shared/operators';
+
+@Component({
+  selector: 'ds-dso-edit-metadata',
+  styleUrls: ['./dso-edit-metadata.component.scss'],
+  templateUrl: './dso-edit-metadata.component.html',
+})
+export class DsoEditMetadataComponent implements OnInit, OnDestroy {
+  @Input() dso: DSpaceObject;
+  dsoType: string;
+
+  form: DsoEditMetadataForm;
+  newMdField: string;
+
+  isReinstatable: boolean;
+  hasChanges: boolean;
+  isEmpty: boolean;
+
+  /**
+   * The AlertType enumeration for access in the component's template
+   * @type {AlertType}
+   */
+  public AlertTypeEnum = AlertType;
+
+  /**
+   * The DsoEditMetadataChangeType enumeration for access in the component's template
+   * @type {DsoEditMetadataChangeType}
+   */
+  public DsoEditMetadataChangeTypeEnum = DsoEditMetadataChangeType;
+
+  dsoUpdateSubscription: Subscription;
+
+  constructor(protected route: ActivatedRoute) {
+  }
+
+  ngOnInit(): void {
+    if (hasNoValue(this.dso)) {
+      this.dsoUpdateSubscription = observableCombineLatest([this.route.data, this.route.parent.data]).pipe(
+        map(([data, parentData]: [Data, Data]) => Object.assign({}, data, parentData)),
+        map((data: any) => data.dso)
+      ).subscribe((rd: RemoteData<DSpaceObject>) => {
+        this.dso = rd.payload;
+        this.initForm();
+      });
+    } else {
+      this.initForm();
+    }
+  }
+
+  initForm(): void {
+    this.dsoType = typeof this.dso.type === 'string' ? this.dso.type as any : this.dso.type.value;
+    this.form = new DsoEditMetadataForm(this.dso.metadata);
+    this.onDebounce();
+  }
+
+  onDebounce(): void {
+    this.hasChanges = this.form.hasChanges();
+    this.isReinstatable = this.form.isReinstatable();
+    this.isEmpty = Object.keys(this.form.fields).length === 0;
+  }
+
+  submit(): void {
+
+  }
+
+  add(): void {
+    this.newMdField = undefined;
+    this.form.add();
+  }
+
+  discard(): void {
+    this.form.discard();
+  }
+
+  reinstate(): void {
+    this.form.reinstate();
+  }
+
+  ngOnDestroy() {
+    if (hasValue(this.dsoUpdateSubscription)) {
+      this.dsoUpdateSubscription.unsubscribe();
+    }
+  }
+
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
new file mode 100644
index 0000000000..d2761e52a6
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
@@ -0,0 +1,18 @@
+<div class="w-100 position-relative">
+  <input type="text"
+         class="form-control"
+         [value]="mdField"
+         [formControl]="input"
+         (focusin)="query$.next(mdField)"
+         (dsClickOutside)="query$.next(null)"
+         (click)="$event.stopPropagation();" />
+  <div class="autocomplete dropdown-menu" [ngClass]="{'show': (mdFieldOptions$ | async)?.length > 0}">
+    <div class="dropdown-list">
+      <div *ngFor="let mdFieldOption of (mdFieldOptions$ | async)">
+        <a href="javascript:void(0);" class="d-block dropdown-item" (click)="select(mdFieldOption)">
+          <span [innerHTML]="mdFieldOption"></span>
+        </a>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.scss b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
new file mode 100644
index 0000000000..63c27ef062
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
@@ -0,0 +1,68 @@
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
+import { startWith, switchMap, debounceTime, distinctUntilChanged } from 'rxjs/operators';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import {
+  getAllSucceededRemoteData,
+  getFirstSucceededRemoteData,
+  metadataFieldsToString
+} from '../../../core/shared/operators';
+import { Observable } from 'rxjs/internal/Observable';
+import { RegistryService } from '../../../core/registry/registry.service';
+import { FormControl } from '@angular/forms';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { hasValue } from '../../../shared/empty.util';
+import { Subscription } from 'rxjs/internal/Subscription';
+
+@Component({
+  selector: 'ds-metadata-field-selector',
+  styleUrls: ['./metadata-field-selector.component.scss'],
+  templateUrl: './metadata-field-selector.component.html'
+})
+export class MetadataFieldSelectorComponent implements OnInit, OnDestroy {
+  @Input() mdField: string;
+  @Output() mdFieldChange = new EventEmitter<string>();
+  mdFieldOptions$: Observable<string[]>;
+
+  public input: FormControl = new FormControl();
+
+  query$: BehaviorSubject<string> = new BehaviorSubject<string>(null);
+  debounceTime = 500;
+
+  subs: Subscription[] = [];
+
+  constructor(protected registryService: RegistryService) {
+  }
+
+  ngOnInit(): void {
+    this.subs.push(
+      this.input.valueChanges.pipe(
+        debounceTime(this.debounceTime),
+      ).subscribe((valueChange) => {
+        this.query$.next(valueChange);
+        this.mdField = valueChange;
+        this.mdFieldChange.emit(this.mdField);
+      }),
+    );
+    this.mdFieldOptions$ = this.query$.pipe(
+      distinctUntilChanged(),
+      switchMap((query) => {
+        if (query !== null) {
+          return this.registryService.queryMetadataFields(query, null, true, false, followLink('schema')).pipe(
+            getAllSucceededRemoteData(),
+            metadataFieldsToString(),
+          );
+        } else {
+          return [[]];
+        }
+      }),
+    );
+  }
+
+  select(mdFieldOption: string) {
+    this.mdField = mdFieldOption;
+  }
+
+  ngOnDestroy(): void {
+    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
+  }
+}
diff --git a/src/app/dso-shared/dso-shared.module.ts b/src/app/dso-shared/dso-shared.module.ts
new file mode 100644
index 0000000000..263d394906
--- /dev/null
+++ b/src/app/dso-shared/dso-shared.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { SharedModule } from '../shared/shared.module';
+import { DsoEditMetadataComponent } from './dso-edit-metadata/dso-edit-metadata.component';
+import { MetadataFieldSelectorComponent } from './dso-edit-metadata/metadata-field-selector/metadata-field-selector.component';
+
+@NgModule({
+  imports: [
+    SharedModule,
+  ],
+  declarations: [
+    DsoEditMetadataComponent,
+    MetadataFieldSelectorComponent,
+  ],
+  exports: [
+    DsoEditMetadataComponent,
+  ],
+})
+export class DsoSharedModule {
+
+}
diff --git a/src/app/item-page/edit-item-page/edit-item-page.module.ts b/src/app/item-page/edit-item-page/edit-item-page.module.ts
index 97901bd7c8..71ab64fa33 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.module.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.module.ts
@@ -35,6 +35,7 @@ import { ItemVersionHistoryComponent } from './item-version-history/item-version
 import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component';
 import { ObjectValuesPipe } from '../../shared/utils/object-values-pipe';
 import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
+import { DsoSharedModule } from '../../dso-shared/dso-shared.module';
 
 
 /**
@@ -48,7 +49,8 @@ import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-
     EditItemPageRoutingModule,
     SearchPageModule,
     DragDropModule,
-    ResourcePoliciesModule
+    ResourcePoliciesModule,
+    DsoSharedModule,
   ],
   declarations: [
     EditItemPageComponent,
diff --git a/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
index 2535e42216..bd8af3742e 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
@@ -38,6 +38,7 @@ import { ItemPageBitstreamsGuard } from './item-page-bitstreams.guard';
 import { ItemPageRelationshipsGuard } from './item-page-relationships.guard';
 import { ItemPageVersionHistoryGuard } from './item-page-version-history.guard';
 import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.guard';
+import { DsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/dso-edit-metadata.component';
 
 /**
  * Routing module that handles the routing for the Edit Item page administrator functionality
@@ -75,7 +76,7 @@ import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.gua
               },
               {
                 path: 'metadata',
-                component: ItemMetadataComponent,
+                component: DsoEditMetadataComponent,
                 data: { title: 'item.edit.tabs.metadata.title', showBreadcrumbs: true },
                 canActivate: [ItemPageMetadataGuard]
               },
diff --git a/src/styles/_bootstrap_variables_mapping.scss b/src/styles/_bootstrap_variables_mapping.scss
index 5a64be7e2a..d352b24d38 100644
--- a/src/styles/_bootstrap_variables_mapping.scss
+++ b/src/styles/_bootstrap_variables_mapping.scss
@@ -29,11 +29,17 @@
   --bs-teal: #{$teal};
   --bs-cyan: #{$cyan};
   --bs-primary: #{$primary};
+  --bs-primary-bg: #{lighten($primary, 30%)};
   --bs-secondary: #{$secondary};
+  --bs-secondary-bg: #{lighten($secondary, 30%)};
   --bs-success: #{$success};
+  --bs-success-bg: #{lighten($success, 30%)};
   --bs-info: #{$info};
+  --bs-info-bg: #{lighten($info, 30%)};
   --bs-warning: #{$warning};
+  --bs-warning-bg: #{lighten($warning, 30%)};
   --bs-danger: #{$danger};
+  --bs-danger-bg: #{lighten($danger, 30%)};
   --bs-light: #{$light};
   --bs-dark: #{$dark};
 

From 627da93e23ab242425fe0dfaefe7e7159a687d2c Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Wed, 30 Nov 2022 15:25:36 +0100
Subject: [PATCH 009/160] 97183 Workaround: reorder admin sidebar sections

The issue described at https://github.com/DSpace/dspace-angular/issues/1643 was
no longer reproducible: The menu component ultimately retrieves menu section
information from the store, but in the `MenuComponent#ngOnInit` method, this
information is piped through `distinctUntilChanged(compareArraysUsingIds())`,
which discards an update that sets these menu elements to be visible.

The behavior of this pipe is probably incorrect, but a proper fix is out of
scope for the current task. For now, we work around the problem by adding
top-level menu sections _after_ their children while initializing the menu
section store, which side-steps this issue.
---
 src/app/menu.resolver.ts | 44 ++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts
index 8630150c58..60f2d1cca2 100644
--- a/src/app/menu.resolver.ts
+++ b/src/app/menu.resolver.ts
@@ -171,17 +171,6 @@ export class MenuResolver implements Resolve<boolean> {
     ]).subscribe(([isCollectionAdmin, isCommunityAdmin, isSiteAdmin]) => {
       const menuList = [
         /* News */
-        {
-          id: 'new',
-          active: false,
-          visible: true,
-          model: {
-            type: MenuItemType.TEXT,
-            text: 'menu.section.new'
-          } as TextMenuItemModel,
-          icon: 'plus',
-          index: 0
-        },
         {
           id: 'new_community',
           parentID: 'new',
@@ -232,6 +221,17 @@ export class MenuResolver implements Resolve<boolean> {
             link: '/processes/new'
           } as LinkMenuItemModel,
         },
+        {
+          id: 'new',
+          active: false,
+          visible: true,
+          model: {
+            type: MenuItemType.TEXT,
+            text: 'menu.section.new'
+          } as TextMenuItemModel,
+          icon: 'plus',
+          index: 0
+        },
         // TODO: enable this menu item once the feature has been implemented
         // {
         //   id: 'new_item_version',
@@ -246,17 +246,6 @@ export class MenuResolver implements Resolve<boolean> {
         // },
 
         /* Edit */
-        {
-          id: 'edit',
-          active: false,
-          visible: true,
-          model: {
-            type: MenuItemType.TEXT,
-            text: 'menu.section.edit'
-          } as TextMenuItemModel,
-          icon: 'pencil-alt',
-          index: 1
-        },
         {
           id: 'edit_community',
           parentID: 'edit',
@@ -296,6 +285,17 @@ export class MenuResolver implements Resolve<boolean> {
             }
           } as OnClickMenuItemModel,
         },
+        {
+          id: 'edit',
+          active: false,
+          visible: true,
+          model: {
+            type: MenuItemType.TEXT,
+            text: 'menu.section.edit'
+          } as TextMenuItemModel,
+          icon: 'pencil-alt',
+          index: 1
+        },
 
         /* Statistics */
         // TODO: enable this menu item once the feature has been implemented

From 105f6cb9542926259c67aed08763b0330782ba8e Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 30 Nov 2022 17:49:19 +0100
Subject: [PATCH 010/160] 97075: Edit metadata redesign pt2

---
 src/app/core/shared/operators.ts              |   2 +-
 .../dso-edit-metadata-form.ts                 | 100 ++++++++++++++++--
 .../dso-edit-metadata.component.html          |  43 ++++----
 .../dso-edit-metadata.component.scss          |   6 +-
 .../dso-edit-metadata.component.ts            |  63 +++++++++--
 .../metadata-field-selector.component.ts      |  14 ++-
 6 files changed, 180 insertions(+), 48 deletions(-)

diff --git a/src/app/core/shared/operators.ts b/src/app/core/shared/operators.ts
index ea2a0283eb..2a68e44af8 100644
--- a/src/app/core/shared/operators.ts
+++ b/src/app/core/shared/operators.ts
@@ -349,7 +349,7 @@ export const metadataFieldsToString = () =>
             map((schema: MetadataSchema) => ({ field, schema }))
           );
         });
-        return observableCombineLatest(fieldSchemaArray);
+        return isNotEmpty(fieldSchemaArray) ? observableCombineLatest(fieldSchemaArray) : [[]];
       }),
       map((fieldSchemaArray: { field: MetadataField, schema: MetadataSchema }[]): string[] => {
         return fieldSchemaArray.map((fieldSchema: { field: MetadataField, schema: MetadataSchema }) => fieldSchema.schema.prefix + '.' + fieldSchema.field.toString());
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
index c059f5064f..220a4561f6 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
@@ -1,5 +1,10 @@
 import { MetadataMap, MetadataValue } from '../../core/shared/metadata.models';
 import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
+import { Operation } from 'fast-json-patch';
+import { MetadataPatchReplaceOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model';
+import { MetadataPatchRemoveOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model';
+import { MetadataPatchAddOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model';
+import { MetadataPatchOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-operation.model';
 
 export enum DsoEditMetadataChangeType {
   UPDATE = 1,
@@ -55,10 +60,14 @@ export class DsoEditMetadataValue {
   }
 
   reinstate(): void {
-    this.newValue = this.reinstatableValue;
-    this.reinstatableValue = undefined;
-    this.change = this.reinstatableChange;
-    this.reinstatableChange = undefined;
+    if (hasValue(this.reinstatableValue)) {
+      this.newValue = this.reinstatableValue;
+      this.reinstatableValue = undefined;
+    }
+    if (hasValue(this.reinstatableChange)) {
+      this.change = this.reinstatableChange;
+      this.reinstatableChange = undefined;
+    }
   }
 
   isReinstatable(): boolean {
@@ -67,16 +76,23 @@ export class DsoEditMetadataValue {
 }
 
 export class DsoEditMetadataForm {
+  originalFieldKeys: string[];
   fieldKeys: string[];
   fields: {
     [mdField: string]: DsoEditMetadataValue[],
   };
+  reinstatableNewValues: {
+    [mdField: string]: DsoEditMetadataValue[],
+  };
   newValue: DsoEditMetadataValue;
 
   constructor(metadata: MetadataMap) {
+    this.originalFieldKeys = [];
     this.fieldKeys = [];
     this.fields = {};
+    this.reinstatableNewValues = {};
     Object.entries(metadata).forEach(([mdField, values]: [string, MetadataValue[]]) => {
+      this.originalFieldKeys.push(mdField);
       this.fieldKeys.push(mdField);
       this.fields[mdField] = values.map((value) => new DsoEditMetadataValue(value));
     });
@@ -89,12 +105,17 @@ export class DsoEditMetadataForm {
   }
 
   setMetadataField(mdField: string) {
+    this.newValue.editing = false;
+    this.addValueToField(this.newValue, mdField);
+    this.newValue = undefined;
+  }
+
+  private addValueToField(value: DsoEditMetadataValue, mdField: string) {
     if (isEmpty(this.fields[mdField])) {
       this.fieldKeys.push(mdField);
       this.fields[mdField] = [];
     }
-    this.fields[mdField].push(this.newValue);
-    this.newValue = undefined;
+    this.fields[mdField].push(value);
   }
 
   remove(mdField: string, index: number) {
@@ -112,11 +133,31 @@ export class DsoEditMetadataForm {
   }
 
   discard(): void {
-    Object.values(this.fields).forEach((values) => {
-      values.forEach((value) => {
-        value.discard();
+    Object.entries(this.fields).forEach(([field, values]) => {
+      let removeFromIndex = -1;
+      values.forEach((value, index) => {
+        if (value.change === DsoEditMetadataChangeType.ADD) {
+          if (isEmpty(this.reinstatableNewValues[field])) {
+            this.reinstatableNewValues[field] = [];
+          }
+          this.reinstatableNewValues[field].push(value);
+          if (removeFromIndex === -1) {
+            removeFromIndex = index;
+          }
+        } else {
+          value.discardAndMarkReinstatable();
+        }
       });
+      if (removeFromIndex > -1) {
+        this.fields[field].splice(removeFromIndex, this.fields[field].length - removeFromIndex);
+      }
     });
+    this.fieldKeys.forEach((field) => {
+      if (this.originalFieldKeys.indexOf(field) < 0) {
+        delete this.fields[field];
+      }
+    });
+    this.fieldKeys = [...this.originalFieldKeys];
   }
 
   reinstate(): void {
@@ -125,9 +166,48 @@ export class DsoEditMetadataForm {
         value.reinstate();
       });
     });
+    Object.entries(this.reinstatableNewValues).forEach(([field, values]) => {
+      values.forEach((value) => {
+        this.addValueToField(value, field);
+      });
+    });
+    this.reinstatableNewValues = {};
   }
 
   isReinstatable(): boolean {
-    return Object.values(this.fields).some((values) => values.some((value) => value.isReinstatable()));
+    return isNotEmpty(this.reinstatableNewValues) ||
+      Object.values(this.fields)
+        .some((values) => values
+          .some((value) => value.isReinstatable()));
+  }
+
+  getOperations(): Operation[] {
+    const operations: Operation[] = [];
+    Object.entries(this.fields).forEach(([field, values]) => {
+      values.forEach((value, place) => {
+        if (value.hasChanges()) {
+          let operation: MetadataPatchOperation;
+          if (value.change === DsoEditMetadataChangeType.UPDATE) {
+            operation = new MetadataPatchReplaceOperation(field, place, {
+              value: value.newValue.value,
+              language: value.newValue.language,
+            });
+          } else if (value.change === DsoEditMetadataChangeType.REMOVE) {
+            operation = new MetadataPatchRemoveOperation(field, place);
+          } else if (value.change === DsoEditMetadataChangeType.ADD) {
+            operation = new MetadataPatchAddOperation(field, {
+              value: value.newValue.value,
+              language: value.newValue.language,
+            });
+          } else {
+            console.warn('Illegal metadata change state detected for', value);
+          }
+          if (hasValue(operation)) {
+            operations.push(operation.toOperation());
+          }
+        }
+      });
+    });
+    return operations;
   }
 }
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index abe671e6f3..27cf706a1a 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -1,19 +1,19 @@
 <div class="item-metadata" *ngIf="form">
   <div class="button-row top d-flex my-2 space-children-mr">
-    <button class="mr-auto btn btn-success" [disabled]="form.newValue"
+    <button class="mr-auto btn btn-success" [disabled]="form.newValue || (saving$ | async)"
             (click)="add()"><i class="fas fa-plus"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.add-button' | translate }}</span>
     </button>
-    <button class="btn btn-warning" *ngIf="isReinstatable"
+    <button class="btn btn-warning ml-2" *ngIf="isReinstatable" [disabled]="(saving$ | async)"
             (click)="reinstate()"><i class="fas fa-undo-alt"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.reinstate-button' | translate }}</span>
     </button>
-    <button class="btn btn-primary" [disabled]="!hasChanges"
+    <button class="btn btn-primary ml-2" [disabled]="!hasChanges || (saving$ | async)"
             (click)="submit()"><i class="fas fa-save"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.save-button' | translate }}</span>
     </button>
-    <button class="btn btn-danger" *ngIf="!isReinstatable"
-            [disabled]="!hasChanges"
+    <button class="btn btn-danger ml-2" *ngIf="!isReinstatable"
+            [disabled]="!hasChanges || (saving$ | async)"
             (click)="discard()"><i class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.discard-button' | translate }}</span>
     </button>
@@ -36,7 +36,7 @@
     <div class="flex-grow-1 ds-drop-list">
       <div class="d-flex flex-row ds-value-row ds-success">
         <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex align-items-center">
-          <input class="form-control" type="text" [(ngModel)]="form.newValue.newValue.value" />
+          <textarea class="form-control" rows="2" [(ngModel)]="form.newValue.newValue.value"></textarea>
         </div>
         <div class="ds-flex-cell ds-lang-cell">
           <input class="form-control" type="text" [(ngModel)]="form.newValue.newValue.language" />
@@ -44,16 +44,16 @@
         <div class="text-center ds-flex-cell ds-edit-cell">
           <div class="btn-group edit-field">
             <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="Confirm changes"
-                    [disabled]="!newMdField" (click)="form.setMetadataField(newMdField)">
+                    [disabled]="!newMdField || (saving$ | async)" (click)="form.setMetadataField(newMdField); onValueSaved()">
               <i class="fas fa-check fa-fw"></i>
             </button>
             <button class="btn btn-outline-danger btn-sm" ngbTooltip="Remove" [disabled]="true">
               <i class="fas fa-trash-alt fa-fw"></i>
             </button>
-            <button class="btn btn-outline-warning btn-sm" ngbTooltip="Undo changes" (click)="form.newValue = undefined">
+            <button class="btn btn-outline-warning btn-sm" ngbTooltip="Undo changes" [disabled]="(saving$ | async)" (click)="form.newValue = undefined">
               <i class="fas fa-undo-alt fa-fw"></i>
             </button>
-            <button class="btn btn-outline-secondary ds-drag-handle btn-sm" ngbTooltip="Drag to reorder" [disabled]="true">
+            <button class="btn btn-outline-secondary ds-drag-handle btn-sm disabled" ngbTooltip="Drag to reorder" [disabled]="true">
               <i class="fas fa-grip-vertical fa-fw"></i>
             </button>
           </div>
@@ -63,15 +63,15 @@
   </div>
   <div class="d-flex flex-row ds-field-row" *ngFor="let mdField of form.fieldKeys">
     <div class="lbl-cell">
-      <span>{{ mdField }}</span>
+      <span class="dont-break-out preserve-line-breaks">{{ mdField }}</span>
     </div>
     <div class="flex-grow-1 ds-drop-list">
       <div class="d-flex flex-row ds-value-row"
-           [ngClass]="{ 'ds-warning': mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD }"
+           [ngClass]="{ 'ds-warning': mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD, 'h-100': form.fields[mdField].length === 1 }"
            *ngFor="let mdValue of form.fields[mdField]; let idx = index">
         <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex align-items-center">
           <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing">{{ mdValue.newValue.value }}</div>
-          <input class="form-control" type="text" *ngIf="mdValue.editing" [(ngModel)]="mdValue.newValue.value" />
+          <textarea class="form-control" rows="2" *ngIf="mdValue.editing" [(ngModel)]="mdValue.newValue.value" ></textarea>
         </div>
         <div class="ds-flex-cell ds-lang-cell">
           <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing">{{ mdValue.newValue.language }}</div>
@@ -80,23 +80,24 @@
         <div class="text-center ds-flex-cell ds-edit-cell">
           <div class="btn-group edit-field">
             <button class="btn btn-outline-primary btn-sm ng-star-inserted" ngbTooltip="Edit" *ngIf="!mdValue.editing"
-                    [disabled]="mdValue.change && mdValue.change !== DsoEditMetadataChangeTypeEnum.UPDATE" (click)="mdValue.editing = true">
+                    [disabled]="mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="mdValue.editing = true">
               <i class="fas fa-edit fa-fw"></i>
             </button>
             <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="Confirm changes" *ngIf="mdValue.editing"
-                    (click)="mdValue.confirmChanges()">
+                    [disabled]="(saving$ | async)" (click)="mdValue.confirmChanges(); onValueSaved()">
               <i class="fas fa-check fa-fw"></i>
             </button>
             <button class="btn btn-outline-danger btn-sm" ngbTooltip="Remove"
-                    [disabled]="mdValue.change || mdValue.editing" (click)="mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE">
+                    [disabled]="mdValue.change || mdValue.editing || (saving$ | async)" (click)="mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE; onValueSaved()">
               <i class="fas fa-trash-alt fa-fw"></i>
             </button>
             <button class="btn btn-outline-warning btn-sm" ngbTooltip="Undo changes"
-                    [disabled]="!mdValue.change && !mdValue.editing" (click)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.discard()">
+                    [disabled]="(!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.discard(); onValueSaved()">
               <i class="fas fa-undo-alt fa-fw"></i>
             </button>
             <!-- TODO: Enable drag -->
-            <button class="btn btn-outline-secondary ds-drag-handle btn-sm" ngbTooltip="Drag to reorder" [disabled]="true">
+            <button class="btn btn-outline-secondary ds-drag-handle btn-sm"
+                    [ngClass]="{'disabled': form.fields[mdField].length === 1 || (saving$ | async)}" ngbTooltip="Drag to reorder" [disabled]="form.fields[mdField].length === 1 || (saving$ | async)">
               <i class="fas fa-grip-vertical fa-fw"></i>
             </button>
           </div>
@@ -110,14 +111,14 @@
   </div>
   <div class="button-row bottom">
     <div class="mt-2 float-right space-children-mr ml-gap">
-      <button class="btn btn-warning" *ngIf="isReinstatable"
+      <button class="btn btn-warning ml-2" *ngIf="isReinstatable" [disabled]="(saving$ | async)"
               (click)="reinstate()"><i class="fas fa-undo-alt"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
       </button>
-      <button class="btn btn-primary" [disabled]="!hasChanges"
+      <button class="btn btn-primary ml-2" [disabled]="!hasChanges || (saving$ | async)"
               (click)="submit()"><i class="fas fa-save"></i> {{ dsoType + '.edit.metadata.save-button' | translate }}
       </button>
-      <button class="btn btn-danger" *ngIf="!isReinstatable"
-              [disabled]="!hasChanges"
+      <button class="btn btn-danger ml-2" *ngIf="!isReinstatable"
+              [disabled]="!hasChanges || (saving$ | async)"
               (click)="discard()"><i class="fas fa-times"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
       </button>
     </div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
index a13afaf07e..8e038d7ef8 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
@@ -1,5 +1,6 @@
 .lbl-cell {
   min-width: 210px;
+  max-width: 210px;
   background-color: var(--bs-gray-100);
   font-weight: bold;
 
@@ -16,7 +17,8 @@
 }
 
 .ds-lang-cell {
-  min-width: 72px;
+  min-width: 90px;
+  max-width: 90px;
 }
 
 .ds-edit-cell {
@@ -68,6 +70,6 @@
   background-color: var(--bs-gray-100);
 }
 
-.ds-drag-handle {
+.ds-drag-handle:not(.disabled) {
   cursor: grab;
 }
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
index d961d9dce9..5f837e1b80 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { Component, Injector, Input, OnDestroy, OnInit } from '@angular/core';
 import { AlertType } from '../../shared/alert/aletr-type';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { DsoEditMetadataChangeType, DsoEditMetadataForm } from './dso-edit-metadata-form';
@@ -12,7 +12,17 @@ import { RegistryService } from '../../core/registry/registry.service';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { Observable } from 'rxjs/internal/Observable';
 import { followLink } from '../../shared/utils/follow-link-config.model';
-import { getFirstSucceededRemoteData, metadataFieldsToString } from '../../core/shared/operators';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+  metadataFieldsToString
+} from '../../core/shared/operators';
+import { UpdateDataService } from '../../core/data/update-data.service';
+import { getDataServiceFor } from '../../core/cache/builders/build-decorators';
+import { ResourceType } from '../../core/shared/resource-type';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { DataService } from '../../core/data/data.service';
 
 @Component({
   selector: 'ds-dso-edit-metadata',
@@ -21,6 +31,7 @@ import { getFirstSucceededRemoteData, metadataFieldsToString } from '../../core/
 })
 export class DsoEditMetadataComponent implements OnInit, OnDestroy {
   @Input() dso: DSpaceObject;
+  updateDataService: UpdateDataService<DSpaceObject>;
   dsoType: string;
 
   form: DsoEditMetadataForm;
@@ -29,6 +40,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
   isReinstatable: boolean;
   hasChanges: boolean;
   isEmpty: boolean;
+  saving$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   /**
    * The AlertType enumeration for access in the component's template
@@ -44,7 +56,10 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
 
   dsoUpdateSubscription: Subscription;
 
-  constructor(protected route: ActivatedRoute) {
+  constructor(protected route: ActivatedRoute,
+              protected notificationsService: NotificationsService,
+              protected translateService: TranslateService,
+              protected parentInjector: Injector) {
   }
 
   ngOnInit(): void {
@@ -54,27 +69,55 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
         map((data: any) => data.dso)
       ).subscribe((rd: RemoteData<DSpaceObject>) => {
         this.dso = rd.payload;
+        this.initDataService();
         this.initForm();
       });
     } else {
+      this.initDataService();
       this.initForm();
     }
   }
 
-  initForm(): void {
-    this.dsoType = typeof this.dso.type === 'string' ? this.dso.type as any : this.dso.type.value;
-    this.form = new DsoEditMetadataForm(this.dso.metadata);
-    this.onDebounce();
+  initDataService(): void {
+    let type: ResourceType;
+    if (typeof this.dso.type === 'string') {
+      type = new ResourceType(this.dso.type);
+    } else {
+      type = this.dso.type;
+    }
+    const provider = getDataServiceFor(type);
+    this.updateDataService = Injector.create({
+      providers: [],
+      parent: this.parentInjector
+    }).get(provider);
+    this.dsoType = type.value;
   }
 
-  onDebounce(): void {
+  initForm(): void {
+    this.form = new DsoEditMetadataForm(this.dso.metadata);
+    this.onValueSaved();
+  }
+
+  onValueSaved(): void {
     this.hasChanges = this.form.hasChanges();
     this.isReinstatable = this.form.isReinstatable();
     this.isEmpty = Object.keys(this.form.fields).length === 0;
   }
 
   submit(): void {
-
+    this.saving$.next(true);
+    this.updateDataService.patch(this.dso, this.form.getOperations()).pipe(
+      getFirstCompletedRemoteData()
+    ).subscribe((rd: RemoteData<DSpaceObject>) => {
+      this.saving$.next(false);
+      if (rd.hasFailed) {
+        this.notificationsService.error('error', rd.errorMessage);
+      } else {
+        this.notificationsService.success('saved', 'saved');
+        this.dso = rd.payload;
+        this.initForm();
+      }
+    });
   }
 
   add(): void {
@@ -84,10 +127,12 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
 
   discard(): void {
     this.form.discard();
+    this.onValueSaved();
   }
 
   reinstate(): void {
     this.form.reinstate();
+    this.onValueSaved();
   }
 
   ngOnDestroy() {
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
index 63c27ef062..17050a76ba 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
@@ -1,9 +1,8 @@
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { startWith, switchMap, debounceTime, distinctUntilChanged } from 'rxjs/operators';
+import { switchMap, debounceTime, distinctUntilChanged } from 'rxjs/operators';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import {
   getAllSucceededRemoteData,
-  getFirstSucceededRemoteData,
   metadataFieldsToString
 } from '../../../core/shared/operators';
 import { Observable } from 'rxjs/internal/Observable';
@@ -26,7 +25,8 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy {
   public input: FormControl = new FormControl();
 
   query$: BehaviorSubject<string> = new BehaviorSubject<string>(null);
-  debounceTime = 500;
+  debounceTime = 300;
+  selectedValueLoading = false;
 
   subs: Subscription[] = [];
 
@@ -38,7 +38,10 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy {
       this.input.valueChanges.pipe(
         debounceTime(this.debounceTime),
       ).subscribe((valueChange) => {
-        this.query$.next(valueChange);
+        if (!this.selectedValueLoading) {
+          this.query$.next(valueChange);
+        }
+        this.selectedValueLoading = false;
         this.mdField = valueChange;
         this.mdFieldChange.emit(this.mdField);
       }),
@@ -59,7 +62,8 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy {
   }
 
   select(mdFieldOption: string) {
-    this.mdField = mdFieldOption;
+    this.selectedValueLoading = true;
+    this.input.setValue(mdFieldOption);
   }
 
   ngOnDestroy(): void {

From 9ff1a6a642930fd6852079f3c5f777471a9a92e7 Mon Sep 17 00:00:00 2001
From: Samuel <samuelcambien@gmail.com>
Date: Thu, 16 Dec 2021 09:51:40 +0100
Subject: [PATCH 011/160] taskid 85843 Add a tree to browse hierarchical facets
 on the search page - overrides

---
 .../vocabulary-treeview.component.ts          | 10 ++--
 .../okr-vocabulary-treeview.component.scss    |  0
 .../okr-vocabulary-treeview.component.ts      | 47 +++++++++++++++++++
 3 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss
 create mode 100644 src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts

diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts
index 41ba775171..f9e4d04f3b 100644
--- a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -98,7 +98,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
   /**
    * Array to track all subscriptions and unsubscribe them onDestroy
    */
-  private subs: Subscription[] = [];
+  protected subs: Subscription[] = [];
 
   /**
    * Initialize instance variables
@@ -110,9 +110,9 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
    */
   constructor(
     public activeModal: NgbActiveModal,
-    private vocabularyTreeviewService: VocabularyTreeviewService,
-    private store: Store<CoreState>,
-    private translate: TranslateService
+    protected vocabularyTreeviewService: VocabularyTreeviewService,
+    protected store: Store<CoreState>,
+    protected translate: TranslateService
   ) {
     this.treeFlattener = new VocabularyTreeFlattener(this.transformer, this.getLevel,
       this.isExpandable, this.getChildren);
@@ -301,7 +301,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
   /**
    * Return an id for a given {@link VocabularyEntry}
    */
-  private getEntryId(entry: VocabularyEntry): string {
+  protected getEntryId(entry: VocabularyEntry): string {
     return entry.authority || entry.otherInformation.id || undefined;
   }
 }
diff --git a/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss b/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts b/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts
new file mode 100644
index 0000000000..f340cdfccf
--- /dev/null
+++ b/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts
@@ -0,0 +1,47 @@
+import { Component } from '@angular/core';
+import { VocabularyTreeviewComponent } from '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component';
+import { filter, find, startWith } from 'rxjs/operators';
+import { PageInfo } from '../../../../../app/core/shared/page-info.model';
+
+/**
+ * Component that show a hierarchical vocabulary in a tree view
+ */
+@Component({
+  selector: 'ds-okr-vocabulary-treeview',
+  templateUrl: '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component.html',
+  styleUrls: [
+    './okr-vocabulary-treeview.component.scss',
+    '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component.scss',
+  ]
+})
+export class OkrVocabularyTreeviewComponent extends VocabularyTreeviewComponent {
+
+  /**
+   * Initialize the component, setting up the data to build the tree
+   */
+  ngOnInit(): void {
+    this.subs.push(
+      this.vocabularyTreeviewService.getData().subscribe((data) => {
+        this.dataSource.data = data;
+      })
+    );
+
+    const descriptionLabel = 'vocabulary-treeview.tree.description.' + this.vocabularyOptions.name;
+    this.description = this.translate.get(descriptionLabel).pipe(
+      filter((msg) => msg !== descriptionLabel),
+      startWith('')
+    );
+
+    // set isAuthenticated
+    this.isAuthenticated = this.store.pipe(select(isAuthenticated));
+
+    this.loading = this.vocabularyTreeviewService.isLoading();
+
+    this.isAuthenticated.pipe(
+      find((isAuth) => isAuth)
+    ).subscribe(() => {
+      const entryId: string = (this.selectedItem) ? this.getEntryId(this.selectedItem) : null;
+      this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), entryId);
+    });
+  }
+}

From d5578accea27a941b7d11c9f26b8fa7398e8519c Mon Sep 17 00:00:00 2001
From: Samuel <samuelcambien@gmail.com>
Date: Thu, 16 Dec 2021 09:52:43 +0100
Subject: [PATCH 012/160] taskid 85843 Add a tree to browse hierarchical facets
 on the search page

---
 .../search-hierarchy-filter.component.ts      |   2 +-
 .../okr-vocabulary-treeview.component.ts      |  15 +-
 ...okr-search-hierarchy-filter.component.html |   7 +
 ...okr-search-hierarchy-filter.component.scss |   0
 ...-search-hierarchy-filter.component.spec.ts | 156 ++++++++++++++++++
 .../okr-search-hierarchy-filter.component.ts  | 106 ++++++++++++
 src/themes/okr/entry-components.ts            |  63 +++++++
 7 files changed, 337 insertions(+), 12 deletions(-)
 create mode 100644 src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html
 create mode 100644 src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss
 create mode 100644 src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts
 create mode 100644 src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts
 create mode 100644 src/themes/okr/entry-components.ts

diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
index d2f3de2dc3..7aa81116de 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
@@ -13,6 +13,6 @@ import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/se
 /**
  * Component that represents a hierarchy facet for a specific filter configuration
  */
-@renderFacetFor(FilterType.hierarchy)
+// @renderFacetFor(FilterType.hierarchy)
 export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent implements OnInit {
 }
diff --git a/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts b/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts
index f340cdfccf..f33f7d89e9 100644
--- a/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts
+++ b/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts
@@ -1,10 +1,11 @@
 import { Component } from '@angular/core';
 import { VocabularyTreeviewComponent } from '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component';
-import { filter, find, startWith } from 'rxjs/operators';
+import { filter, startWith } from 'rxjs/operators';
 import { PageInfo } from '../../../../../app/core/shared/page-info.model';
 
 /**
- * Component that show a hierarchical vocabulary in a tree view
+ * Component that show a hierarchical vocabulary in a tree view.
+ * Worldbank customization which omits the authentication check.
  */
 @Component({
   selector: 'ds-okr-vocabulary-treeview',
@@ -32,16 +33,8 @@ export class OkrVocabularyTreeviewComponent extends VocabularyTreeviewComponent
       startWith('')
     );
 
-    // set isAuthenticated
-    this.isAuthenticated = this.store.pipe(select(isAuthenticated));
-
     this.loading = this.vocabularyTreeviewService.isLoading();
 
-    this.isAuthenticated.pipe(
-      find((isAuth) => isAuth)
-    ).subscribe(() => {
-      const entryId: string = (this.selectedItem) ? this.getEntryId(this.selectedItem) : null;
-      this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), entryId);
-    });
+    this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), null);
   }
 }
diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html
new file mode 100644
index 0000000000..e62006538b
--- /dev/null
+++ b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html
@@ -0,0 +1,7 @@
+<ds-search-hierarchy-filter></ds-search-hierarchy-filter>
+
+<div *ngIf="vocabularyExists$ | async"
+     id="show-{{filterConfig.name}}-tree"
+     (click)="showVocabularyTree()">
+  {{'search.filters.filter.show-tree' | translate: {name: filterConfig.name} }}
+</div>
diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts
new file mode 100644
index 0000000000..ce4caa23eb
--- /dev/null
+++ b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts
@@ -0,0 +1,156 @@
+import { OkrSearchHierarchyFilterComponent } from './okr-search-hierarchy-filter.component';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { DebugElement, EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { VocabularyService } from '../../../../../../../../app/core/submission/vocabularies/vocabulary.service';
+import { of as observableOf } from 'rxjs';
+import { RemoteData } from '../../../../../../../../app/core/data/remote-data';
+import { RequestEntryState } from '../../../../../../../../app/core/data/request.reducer';
+import { TranslateModule } from '@ngx-translate/core';
+import { RouterStub } from '../../../../../../../../app/shared/testing/router.stub';
+import { buildPaginatedList } from '../../../../../../../../app/core/data/paginated-list.model';
+import { PageInfo } from '../../../../../../../../app/core/shared/page-info.model';
+import { CommonModule } from '@angular/common';
+import { SearchService } from '../../../../../../../../app/core/shared/search/search.service';
+import {
+  FILTER_CONFIG,
+  IN_PLACE_SEARCH,
+  SearchFilterService
+} from '../../../../../../../../app/core/shared/search/search-filter.service';
+import { RemoteDataBuildService } from '../../../../../../../../app/core/cache/builders/remote-data-build.service';
+import { Router } from '@angular/router';
+import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../app/my-dspace-page/my-dspace-page.component';
+import { SearchConfigurationServiceStub } from '../../../../../../../../app/shared/testing/search-configuration-service.stub';
+import { VocabularyEntryDetail } from '../../../../../../../../app/core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { FacetValue } from '../../../../../../../../app/shared/search/facet-value.model';
+import { SearchFilterConfig } from '../../../../../../../../app/shared/search/search-filter-config.model';
+
+describe('OkrSearchHierarchyFilterComponent', () => {
+
+  let fixture: ComponentFixture<OkrSearchHierarchyFilterComponent>;
+  let showVocabularyTreeLink: DebugElement;
+
+  const testSearchLink = 'test-search';
+  const testSearchFilter = 'test-search-filter';
+  const okrVocabularyTreeViewComponent = {
+    select: new EventEmitter<VocabularyEntryDetail>(),
+  };
+
+  const searchService = {
+    getSearchLink: () => testSearchLink,
+    getFacetValuesFor: () => observableOf([]),
+  };
+  const searchFilterService = {
+    getPage: () => observableOf(0),
+  };
+  const router = new RouterStub();
+  const ngbModal = jasmine.createSpyObj('modal', {
+    open: {
+      componentInstance: okrVocabularyTreeViewComponent,
+    }
+  });
+  const vocabularyService = {
+    searchTopEntries: () => undefined,
+  };
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        NgbModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        OkrSearchHierarchyFilterComponent,
+      ],
+      providers: [
+        { provide: SearchService, useValue: searchService },
+        { provide: SearchFilterService, useValue: searchFilterService },
+        { provide: RemoteDataBuildService, useValue: {} },
+        { provide: Router, useValue: router },
+        { provide: NgbModal, useValue: ngbModal },
+        { provide: VocabularyService, useValue: vocabularyService },
+        { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
+        { provide: IN_PLACE_SEARCH, useValue: false },
+        { provide: FILTER_CONFIG, useValue: Object.assign(new SearchFilterConfig(), { name: testSearchFilter }) },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  });
+
+  function init() {
+    fixture = TestBed.createComponent(OkrSearchHierarchyFilterComponent);
+    fixture.detectChanges();
+    showVocabularyTreeLink = fixture.debugElement.query(By.css('div#show-test-search-filter-tree'));
+  }
+
+  describe('if the vocabulary doesn\'t exist', () => {
+
+    beforeEach(() => {
+      spyOn(vocabularyService, 'searchTopEntries').and.returnValue(observableOf(new RemoteData(
+        undefined, 0, 0, RequestEntryState.Error, undefined, undefined, 404
+      )));
+      init();
+    });
+
+    it('should not show the vocabulary tree link', () => {
+      expect(showVocabularyTreeLink).toBeNull();
+    });
+  });
+
+  describe('if the vocabulary exists', () => {
+
+    beforeEach(() => {
+      spyOn(vocabularyService, 'searchTopEntries').and.returnValue(observableOf(new RemoteData(
+        undefined, 0, 0, RequestEntryState.Success, undefined, buildPaginatedList(new PageInfo(), []), 200
+      )));
+      init();
+    });
+
+    it('should show the vocabulary tree link', () => {
+      expect(showVocabularyTreeLink).toBeTruthy();
+    });
+
+    describe('when clicking the vocabulary tree link', () => {
+
+      beforeEach(async () => {
+        showVocabularyTreeLink.nativeElement.click();
+      });
+
+      it('should open the vocabulary tree modal', () => {
+        expect(ngbModal.open).toHaveBeenCalled();
+      });
+
+      describe('when selecting a value from the vocabulary tree', () => {
+
+        const alreadySelectedValues = [
+          'already-selected-value-1',
+          'already-selected-value-2',
+        ];
+        const newSelectedValue = 'new-selected-value';
+
+        beforeEach(() => {
+          fixture.componentInstance.selectedValues$ = observableOf(
+            alreadySelectedValues.map(value => Object.assign(new FacetValue(), { value }))
+          );
+          okrVocabularyTreeViewComponent.select.emit(Object.assign(new VocabularyEntryDetail(), {
+            value: newSelectedValue,
+          }));
+        });
+
+        it('should add a new search filter to the existing search filters', () => {
+          expect(router.navigate).toHaveBeenCalledWith([testSearchLink], {
+            queryParams: {
+              [`f.${testSearchFilter}`]: [
+                ...alreadySelectedValues,
+                newSelectedValue,
+              ].map((value => `${value},equals`)),
+            },
+            queryParamsHandling: 'merge',
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts
new file mode 100644
index 0000000000..c637f576eb
--- /dev/null
+++ b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts
@@ -0,0 +1,106 @@
+import { Component, Inject } from '@angular/core';
+import { renderFacetFor } from 'src/app/shared/search/search-filters/search-filter/search-filter-type-decorator';
+import { FilterType } from '../../../../../../../../app/shared/search/filter-type.model';
+import { facetLoad } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component';
+import { SearchHierarchyFilterComponent } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component';
+import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import { OkrVocabularyTreeviewComponent } from '../../../../okr-vocabulary-treeview/okr-vocabulary-treeview.component';
+import { VocabularyEntryDetail } from '../../../../../../../../app/core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { SearchService } from '../../../../../../../../app/core/shared/search/search.service';
+import {
+  FILTER_CONFIG,
+  IN_PLACE_SEARCH,
+  SearchFilterService
+} from '../../../../../../../../app/core/shared/search/search-filter.service';
+import { Router } from '@angular/router';
+import { RemoteDataBuildService } from '../../../../../../../../app/core/cache/builders/remote-data-build.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../app/my-dspace-page/my-dspace-page.component';
+import { SearchConfigurationService } from '../../../../../../../../app/core/shared/search/search-configuration.service';
+import { SearchFilterConfig } from '../../../../../../../../app/shared/search/search-filter-config.model';
+import { FacetValue } from '../../../../../../../../app/shared/search/facet-value.model';
+import { getFacetValueForType } from '../../../../../../../../app/shared/search/search.utils';
+import { filter, map, take } from 'rxjs/operators';
+import { VocabularyService } from '../../../../../../../../app/core/submission/vocabularies/vocabulary.service';
+import { Observable } from 'rxjs';
+import { PageInfo } from '../../../../../../../../app/core/shared/page-info.model';
+
+/**
+ * Component that represents a hierarchy facet for a specific filter configuration.
+ * Worldbank customization which features a link at the bottom to open a vocabulary popup,
+ */
+@Component({
+  selector: 'ds-okr-search-hierarchy-filter',
+  styleUrls: ['./okr-search-hierarchy-filter.component.scss'],
+  templateUrl: './okr-search-hierarchy-filter.component.html',
+  animations: [facetLoad]
+})
+@renderFacetFor(FilterType.hierarchy)
+export class OkrSearchHierarchyFilterComponent extends SearchHierarchyFilterComponent {
+
+  constructor(protected searchService: SearchService,
+              protected filterService: SearchFilterService,
+              protected rdbs: RemoteDataBuildService,
+              protected router: Router,
+              protected modalService: NgbModal,
+              protected vocabularyService: VocabularyService,
+              @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
+              @Inject(IN_PLACE_SEARCH) public inPlaceSearch: boolean,
+              @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig,
+  ) {
+    super(
+      searchService,
+      filterService,
+      rdbs,
+      router,
+      searchConfigService,
+      inPlaceSearch,
+      filterConfig,
+    );
+  }
+
+  vocabularyExists$: Observable<boolean>;
+
+  ngOnInit() {
+    super.ngOnInit();
+    this.vocabularyExists$ = this.vocabularyService.searchTopEntries(
+      this.filterConfig.name, new PageInfo(), true, false,
+    ).pipe(
+      filter(rd => rd.hasCompleted),
+      take(1),
+      map(rd => {
+        return rd.hasSucceeded;
+      }),
+    );
+  }
+
+  /**
+   * Open the vocabulary tree modal popup.
+   * When an entry is selected, add the filter query to the search options.
+   */
+  showVocabularyTree() {
+    const modalRef: NgbModalRef = this.modalService.open(OkrVocabularyTreeviewComponent, {
+      size: 'lg',
+      windowClass: 'treeview'
+    });
+    modalRef.componentInstance.vocabularyOptions = {
+      name: this.filterConfig.name,
+      closed: true
+    };
+    modalRef.componentInstance.select.subscribe((detail: VocabularyEntryDetail) => {
+      this.selectedValues$
+        .pipe(take(1))
+        .subscribe((selectedValues) => {
+          this.router.navigate(
+            [this.searchService.getSearchLink()],
+            {
+              queryParams: {
+                [this.filterConfig.paramName]: [...selectedValues, {value: detail.value}]
+                  .map((facetValue: FacetValue) => getFacetValueForType(facetValue, this.filterConfig)),
+              },
+              queryParamsHandling: 'merge',
+            },
+          );
+        });
+    });
+  }
+}
diff --git a/src/themes/okr/entry-components.ts b/src/themes/okr/entry-components.ts
new file mode 100644
index 0000000000..bfc93ad216
--- /dev/null
+++ b/src/themes/okr/entry-components.ts
@@ -0,0 +1,63 @@
+import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component';
+import { ItemSearchResultListElementComponent } from './app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+import { PersonSearchResultListElementComponent } from './app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component';
+import { JournalSearchResultListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component';
+import { JournalIssueSearchResultListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component';
+import { JournalVolumeSearchResultListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component';
+import { CitationsSectionComponent } from './app/item-page/field-components/citation/citations-section.component';
+import { CcIconsComponent } from './app/item-page/field-components/cc-icons/cc-icons.component';
+import { AltmetricDonutComponent } from './app/item-page/field-components/citation/altmetric-donut/altmetric-donut.component';
+import { ItemPageWbDateFieldComponent } from './app/item-page/field-components/specific-field/wb-date/item-page-wb-date-field.component';
+import { ItemPageWbGenericWithFallbackComponent } from './app/item-page/field-components/specific-field/wb-generic-with-fallback/item-page-wb-generic-with-fallback.component';
+import { ItemPageWbExternalContentComponent } from './app/item-page/field-components/specific-field/wb-external-content/item-page-wb-external-content.component';
+import { UntypedItemComponent } from './app/item-page/simple/item-types/untyped-item/untyped-item.component';
+import { JournalComponent } from './app/entity-groups/journal-entities/item-pages/journal/journal.component';
+import { JournalIssueComponent } from './app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
+import { JournalVolumeComponent } from './app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
+import { JournalVolumeGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component';
+import { JournalVolumeSearchResultGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component';
+import { JournalIssueSearchResultGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component';
+import { JournalIssueGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component';
+import { JournalVolumeSidebarSearchListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component';
+import { JournalIssueSidebarSearchListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component';
+import { JournalIssueListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component';
+import { JournalVolumeListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component';
+import { FeaturedPublicationsListElementComponent } from './app/featured-publications/featured-publications-list-element/featured-publications-list-element.component';
+import { ClaimedTaskActionsMarkDuplicateComponent } from './app/shared/mydspace-actions/claimed-task/mark-duplicate/claimed-task-actions-mark-duplicate.component';
+import { ClaimedTaskActionsReportProblemComponent } from './app/shared/mydspace-actions/claimed-task/report-problem/claimed-task-actions-report-problem.component';
+import { SingleStatletTableComponent } from './app/atmire-cua/statlets/shared/single-statlet/graph-types/single-statlet-table/single-statlet-table.component';
+import { OkrSearchHierarchyFilterComponent } from './app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component';
+import { OkrVocabularyTreeviewComponent } from './app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component';
+
+export const ENTRY_COMPONENTS = [
+  PublicationComponent,
+  ItemSearchResultListElementComponent,
+  PersonSearchResultListElementComponent,
+  JournalSearchResultListElementComponent,
+  JournalVolumeSearchResultListElementComponent,
+  JournalIssueSearchResultListElementComponent,
+  UntypedItemComponent,
+  AltmetricDonutComponent,
+  CitationsSectionComponent,
+  CcIconsComponent,
+  ItemPageWbDateFieldComponent,
+  ItemPageWbGenericWithFallbackComponent,
+  ItemPageWbExternalContentComponent,
+  JournalComponent,
+  JournalIssueComponent,
+  JournalVolumeComponent,
+  JournalVolumeGridElementComponent,
+  JournalVolumeSearchResultGridElementComponent,
+  JournalIssueSearchResultGridElementComponent,
+  JournalIssueGridElementComponent,
+  JournalVolumeSidebarSearchListElementComponent,
+  JournalIssueSidebarSearchListElementComponent,
+  JournalIssueListElementComponent,
+  JournalVolumeListElementComponent,
+  FeaturedPublicationsListElementComponent,
+  ClaimedTaskActionsMarkDuplicateComponent,
+  ClaimedTaskActionsReportProblemComponent,
+  SingleStatletTableComponent,
+  OkrSearchHierarchyFilterComponent,
+  OkrVocabularyTreeviewComponent,
+];

From bc3ab46e8eae70e2a3b25fe1bbddd5f8c51fecf2 Mon Sep 17 00:00:00 2001
From: Samuel <samuelcambien@gmail.com>
Date: Thu, 16 Dec 2021 13:14:13 +0100
Subject: [PATCH 013/160] taskid 85843 Add a tree to browse hierarchical facets
 on the search page - fix import issue

---
 .../okr-search-hierarchy-filter.component.ts                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts
index c637f576eb..7d4e41894c 100644
--- a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts
+++ b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts
@@ -1,5 +1,5 @@
 import { Component, Inject } from '@angular/core';
-import { renderFacetFor } from 'src/app/shared/search/search-filters/search-filter/search-filter-type-decorator';
+import { renderFacetFor } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-filter-type-decorator';
 import { FilterType } from '../../../../../../../../app/shared/search/filter-type.model';
 import { facetLoad } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component';
 import { SearchHierarchyFilterComponent } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component';

From 2fab8415626e0e96ed9019d9ce390c70ccff09f6 Mon Sep 17 00:00:00 2001
From: Samuel <samuelcambien@gmail.com>
Date: Thu, 16 Dec 2021 14:12:27 +0100
Subject: [PATCH 014/160] taskid 85843 Add a tree to browse hierarchical facets
 on the search page - i18n updates

---
 .../okr-search-hierarchy-filter.component.html                 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html
index e62006538b..dd50528bb6 100644
--- a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html
+++ b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html
@@ -2,6 +2,7 @@
 
 <div *ngIf="vocabularyExists$ | async"
      id="show-{{filterConfig.name}}-tree"
+     class="text-lowercase"
      (click)="showVocabularyTree()">
-  {{'search.filters.filter.show-tree' | translate: {name: filterConfig.name} }}
+  {{'search.filters.filter.show-tree' | translate: {name: ('search.filters.filter.' + filterConfig.name + '.head' | translate)} }}
 </div>

From 3b7d962671deb967241e52071a0f8b6d8d0e756e Mon Sep 17 00:00:00 2001
From: Samuel <samuelcambien@gmail.com>
Date: Thu, 23 Dec 2021 11:43:59 +0100
Subject: [PATCH 015/160] taskid 85843 Add a tree to browse hierarchical facets
 on the search page - feedback

---
 .../okr-vocabulary-treeview.component.ts              | 11 ++++++-----
 .../okr-search-hierarchy-filter.component.html        |  8 ++++----
 .../okr-search-hierarchy-filter.component.spec.ts     |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts b/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts
index f33f7d89e9..c9ef159f81 100644
--- a/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts
+++ b/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
 import { VocabularyTreeviewComponent } from '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component';
-import { filter, startWith } from 'rxjs/operators';
+import { filter, map, startWith } from 'rxjs/operators';
 import { PageInfo } from '../../../../../app/core/shared/page-info.model';
+import { lowerCase } from 'lodash';
 
 /**
  * Component that show a hierarchical vocabulary in a tree view.
@@ -27,10 +28,10 @@ export class OkrVocabularyTreeviewComponent extends VocabularyTreeviewComponent
       })
     );
 
-    const descriptionLabel = 'vocabulary-treeview.tree.description.' + this.vocabularyOptions.name;
-    this.description = this.translate.get(descriptionLabel).pipe(
-      filter((msg) => msg !== descriptionLabel),
-      startWith('')
+    this.translate.get(`search.filters.filter.${this.vocabularyOptions.name}.head`).pipe(
+      map((type) => lowerCase(type)),
+    ).subscribe(
+      (type) => this.description = this.translate.get('okr-vocabulary-treeview.info', { type })
     );
 
     this.loading = this.vocabularyTreeviewService.isLoading();
diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html
index dd50528bb6..731b5045bf 100644
--- a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html
+++ b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html
@@ -1,8 +1,8 @@
 <ds-search-hierarchy-filter></ds-search-hierarchy-filter>
 
-<div *ngIf="vocabularyExists$ | async"
+<a *ngIf="vocabularyExists$ | async"
+     href="javascript:void(0);"
      id="show-{{filterConfig.name}}-tree"
-     class="text-lowercase"
      (click)="showVocabularyTree()">
-  {{'search.filters.filter.show-tree' | translate: {name: ('search.filters.filter.' + filterConfig.name + '.head' | translate)} }}
-</div>
+  {{'search.filters.filter.show-tree' | translate: {name: ('search.filters.filter.' + filterConfig.name + '.head' | translate | lowercase )} }}
+</a>
diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts
index ce4caa23eb..ac0669cbf9 100644
--- a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts
+++ b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts
@@ -82,7 +82,7 @@ describe('OkrSearchHierarchyFilterComponent', () => {
   function init() {
     fixture = TestBed.createComponent(OkrSearchHierarchyFilterComponent);
     fixture.detectChanges();
-    showVocabularyTreeLink = fixture.debugElement.query(By.css('div#show-test-search-filter-tree'));
+    showVocabularyTreeLink = fixture.debugElement.query(By.css('a#show-test-search-filter-tree'));
   }
 
   describe('if the vocabulary doesn\'t exist', () => {

From 6be343cccfa43a841e931ff32d2014ed14e09870 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 1 Dec 2022 13:07:19 +0100
Subject: [PATCH 016/160] 97075: Margin fixes + metadata field autofocus and
 validation

---
 .../dso-edit-metadata.component.html          | 31 ++++++++-------
 .../dso-edit-metadata.component.ts            | 18 ++++++++-
 .../metadata-field-selector.component.html    |  5 ++-
 .../metadata-field-selector.component.ts      | 38 ++++++++++++++++---
 4 files changed, 69 insertions(+), 23 deletions(-)

diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index 27cf706a1a..4154a9ce56 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -1,18 +1,18 @@
 <div class="item-metadata" *ngIf="form">
-  <div class="button-row top d-flex my-2 space-children-mr">
+  <div class="button-row top d-flex my-2 space-children-mr ml-gap">
     <button class="mr-auto btn btn-success" [disabled]="form.newValue || (saving$ | async)"
             (click)="add()"><i class="fas fa-plus"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.add-button' | translate }}</span>
     </button>
-    <button class="btn btn-warning ml-2" *ngIf="isReinstatable" [disabled]="(saving$ | async)"
+    <button class="btn btn-warning ml-1" *ngIf="isReinstatable" [disabled]="(saving$ | async)"
             (click)="reinstate()"><i class="fas fa-undo-alt"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.reinstate-button' | translate }}</span>
     </button>
-    <button class="btn btn-primary ml-2" [disabled]="!hasChanges || (saving$ | async)"
+    <button class="btn btn-primary ml-1" [disabled]="!hasChanges || (saving$ | async)"
             (click)="submit()"><i class="fas fa-save"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.save-button' | translate }}</span>
     </button>
-    <button class="btn btn-danger ml-2" *ngIf="!isReinstatable"
+    <button class="btn btn-danger ml-1" *ngIf="!isReinstatable"
             [disabled]="!hasChanges || (saving$ | async)"
             (click)="discard()"><i class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.discard-button' | translate }}</span>
@@ -31,10 +31,10 @@
   </div>
   <div class="d-flex flex-row ds-field-row" *ngIf="form.newValue">
     <div class="lbl-cell ds-success">
-      <ds-metadata-field-selector [(mdField)]="newMdField"></ds-metadata-field-selector>
+      <ds-metadata-field-selector [(mdField)]="newMdField" [autofocus]="true"></ds-metadata-field-selector>
     </div>
     <div class="flex-grow-1 ds-drop-list">
-      <div class="d-flex flex-row ds-value-row ds-success">
+      <div class="d-flex flex-row ds-value-row ds-success h-100">
         <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex align-items-center">
           <textarea class="form-control" rows="2" [(ngModel)]="form.newValue.newValue.value"></textarea>
         </div>
@@ -44,16 +44,19 @@
         <div class="text-center ds-flex-cell ds-edit-cell">
           <div class="btn-group edit-field">
             <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="Confirm changes"
-                    [disabled]="!newMdField || (saving$ | async)" (click)="form.setMetadataField(newMdField); onValueSaved()">
+                    [disabled]="!newMdField || (saving$ | async) || (loadingFieldValidation$ | async)" (click)="setMetadataField()">
               <i class="fas fa-check fa-fw"></i>
             </button>
-            <button class="btn btn-outline-danger btn-sm" ngbTooltip="Remove" [disabled]="true">
+            <button class="btn btn-outline-danger btn-sm" ngbTooltip="Remove"
+                    [disabled]="true">
               <i class="fas fa-trash-alt fa-fw"></i>
             </button>
-            <button class="btn btn-outline-warning btn-sm" ngbTooltip="Undo changes" [disabled]="(saving$ | async)" (click)="form.newValue = undefined">
+            <button class="btn btn-outline-warning btn-sm" ngbTooltip="Undo changes"
+                    [disabled]="(saving$ | async) || (loadingFieldValidation$ | async)" (click)="form.newValue = undefined">
               <i class="fas fa-undo-alt fa-fw"></i>
             </button>
-            <button class="btn btn-outline-secondary ds-drag-handle btn-sm disabled" ngbTooltip="Drag to reorder" [disabled]="true">
+            <button class="btn btn-outline-secondary ds-drag-handle btn-sm disabled" ngbTooltip="Drag to reorder"
+                    [disabled]="true">
               <i class="fas fa-grip-vertical fa-fw"></i>
             </button>
           </div>
@@ -109,15 +112,15 @@
   <div *ngIf="isEmpty">
     <ds-alert [content]="dsoType + '.edit.metadata.empty'" [type]="AlertTypeEnum.Info"></ds-alert>
   </div>
-  <div class="button-row bottom">
+  <div class="button-row bottom d-inline-block w-100">
     <div class="mt-2 float-right space-children-mr ml-gap">
-      <button class="btn btn-warning ml-2" *ngIf="isReinstatable" [disabled]="(saving$ | async)"
+      <button class="btn btn-warning" *ngIf="isReinstatable" [disabled]="(saving$ | async)"
               (click)="reinstate()"><i class="fas fa-undo-alt"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
       </button>
-      <button class="btn btn-primary ml-2" [disabled]="!hasChanges || (saving$ | async)"
+      <button class="btn btn-primary" [disabled]="!hasChanges || (saving$ | async)"
               (click)="submit()"><i class="fas fa-save"></i> {{ dsoType + '.edit.metadata.save-button' | translate }}
       </button>
-      <button class="btn btn-danger ml-2" *ngIf="!isReinstatable"
+      <button class="btn btn-danger" *ngIf="!isReinstatable"
               [disabled]="!hasChanges || (saving$ | async)"
               (click)="discard()"><i class="fas fa-times"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
       </button>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
index 5f837e1b80..97f34ba2a3 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -1,7 +1,7 @@
-import { Component, Injector, Input, OnDestroy, OnInit } from '@angular/core';
+import { Component, Injector, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { AlertType } from '../../shared/alert/aletr-type';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { DsoEditMetadataChangeType, DsoEditMetadataForm } from './dso-edit-metadata-form';
+import { DsoEditMetadataChangeType, DsoEditMetadataForm, DsoEditMetadataValue } from './dso-edit-metadata-form';
 import { map, switchMap } from 'rxjs/operators';
 import { ActivatedRoute, Data } from '@angular/router';
 import { combineLatest as observableCombineLatest } from 'rxjs/internal/observable/combineLatest';
@@ -23,6 +23,7 @@ import { ResourceType } from '../../core/shared/resource-type';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { DataService } from '../../core/data/data.service';
+import { MetadataFieldSelectorComponent } from './metadata-field-selector/metadata-field-selector.component';
 
 @Component({
   selector: 'ds-dso-edit-metadata',
@@ -31,6 +32,7 @@ import { DataService } from '../../core/data/data.service';
 })
 export class DsoEditMetadataComponent implements OnInit, OnDestroy {
   @Input() dso: DSpaceObject;
+  @ViewChild(MetadataFieldSelectorComponent) metadataFieldSelectorComponent: MetadataFieldSelectorComponent;
   updateDataService: UpdateDataService<DSpaceObject>;
   dsoType: string;
 
@@ -41,6 +43,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
   hasChanges: boolean;
   isEmpty: boolean;
   saving$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+  loadingFieldValidation$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   /**
    * The AlertType enumeration for access in the component's template
@@ -120,6 +123,17 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
     });
   }
 
+  setMetadataField() {
+    this.loadingFieldValidation$.next(true);
+    this.metadataFieldSelectorComponent.validate().subscribe((valid) => {
+      this.loadingFieldValidation$.next(false);
+      if (valid) {
+        this.form.setMetadataField(this.newMdField);
+        this.onValueSaved();
+      }
+    });
+  }
+
   add(): void {
     this.newMdField = undefined;
     this.form.add();
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
index d2761e52a6..2a69c21188 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
@@ -1,11 +1,12 @@
 <div class="w-100 position-relative">
-  <input type="text"
-         class="form-control"
+  <input type="text" #mdFieldInput
+         class="form-control" [ngClass]="{ 'is-invalid': showInvalid }"
          [value]="mdField"
          [formControl]="input"
          (focusin)="query$.next(mdField)"
          (dsClickOutside)="query$.next(null)"
          (click)="$event.stopPropagation();" />
+  <div class="invalid-feedback show-feedback" *ngIf="showInvalid">Invalid metadata field, please pick an existing one from the suggestions when searching</div>
   <div class="autocomplete dropdown-menu" [ngClass]="{'show': (mdFieldOptions$ | async)?.length > 0}">
     <div class="dropdown-list">
       <div *ngFor="let mdFieldOption of (mdFieldOptions$ | async)">
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
index 17050a76ba..cde41dee96 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
@@ -1,15 +1,25 @@
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { switchMap, debounceTime, distinctUntilChanged } from 'rxjs/operators';
+import {
+  AfterViewInit,
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+  ViewChild
+} from '@angular/core';
+import { switchMap, debounceTime, distinctUntilChanged, map, tap, take } from 'rxjs/operators';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import {
-  getAllSucceededRemoteData,
+  getAllSucceededRemoteData, getFirstCompletedRemoteData, getFirstSucceededRemoteData,
   metadataFieldsToString
 } from '../../../core/shared/operators';
 import { Observable } from 'rxjs/internal/Observable';
 import { RegistryService } from '../../../core/registry/registry.service';
 import { FormControl } from '@angular/forms';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
-import { hasValue } from '../../../shared/empty.util';
+import { hasValue, isNotEmpty } from '../../../shared/empty.util';
 import { Subscription } from 'rxjs/internal/Subscription';
 
 @Component({
@@ -17,9 +27,11 @@ import { Subscription } from 'rxjs/internal/Subscription';
   styleUrls: ['./metadata-field-selector.component.scss'],
   templateUrl: './metadata-field-selector.component.html'
 })
-export class MetadataFieldSelectorComponent implements OnInit, OnDestroy {
+export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterViewInit {
   @Input() mdField: string;
+  @Input() autofocus = false;
   @Output() mdFieldChange = new EventEmitter<string>();
+  @ViewChild('mdFieldInput', { static: true }) mdFieldInput: ElementRef;
   mdFieldOptions$: Observable<string[]>;
 
   public input: FormControl = new FormControl();
@@ -27,6 +39,7 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy {
   query$: BehaviorSubject<string> = new BehaviorSubject<string>(null);
   debounceTime = 300;
   selectedValueLoading = false;
+  showInvalid = false;
 
   subs: Subscription[] = [];
 
@@ -49,6 +62,7 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy {
     this.mdFieldOptions$ = this.query$.pipe(
       distinctUntilChanged(),
       switchMap((query) => {
+        this.showInvalid = false;
         if (query !== null) {
           return this.registryService.queryMetadataFields(query, null, true, false, followLink('schema')).pipe(
             getAllSucceededRemoteData(),
@@ -61,6 +75,20 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy {
     );
   }
 
+  ngAfterViewInit(): void {
+    this.mdFieldInput.nativeElement.focus();
+  }
+
+  validate(): Observable<boolean> {
+    return this.registryService.queryMetadataFields(this.mdField, null, true, false, followLink('schema')).pipe(
+      getFirstSucceededRemoteData(),
+      metadataFieldsToString(),
+      take(1),
+      map((fields: string[]) => fields.indexOf(this.mdField) > -1),
+      tap((exists) => this.showInvalid = !exists),
+    );
+  }
+
   select(mdFieldOption: string) {
     this.selectedValueLoading = true;
     this.input.setValue(mdFieldOption);

From 4afa5181a6ffae1b94ca946abad88a2c5fdbe199 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Thu, 1 Dec 2022 13:34:56 +0100
Subject: [PATCH 017/160] refac

---
 .../okr-vocabulary-treeview.component.scss    |  0
 .../okr-vocabulary-treeview.component.ts      |  8 +--
 ...okr-search-hierarchy-filter.component.html |  0
 ...okr-search-hierarchy-filter.component.scss |  0
 ...-search-hierarchy-filter.component.spec.ts | 24 +++----
 .../okr-search-hierarchy-filter.component.ts  | 30 ++++-----
 src/app/shared/search/search.module.ts        |  6 +-
 src/app/shared/shared.module.ts               |  5 ++
 src/assets/i18n/en.json5                      | 26 +++++++-
 src/themes/okr/entry-components.ts            | 63 -------------------
 10 files changed, 66 insertions(+), 96 deletions(-)
 rename src/{themes/okr => }/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss (100%)
 rename src/{themes/okr => }/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts (74%)
 rename src/{themes/okr => }/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html (100%)
 rename src/{themes/okr => }/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss (100%)
 rename src/{themes/okr => }/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts (80%)
 rename src/{themes/okr => }/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts (64%)
 delete mode 100644 src/themes/okr/entry-components.ts

diff --git a/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss b/src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss
similarity index 100%
rename from src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss
rename to src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss
diff --git a/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts b/src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts
similarity index 74%
rename from src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts
rename to src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts
index c9ef159f81..80dcb1f739 100644
--- a/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts
+++ b/src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { VocabularyTreeviewComponent } from '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component';
+import { VocabularyTreeviewComponent } from '../vocabulary-treeview/vocabulary-treeview.component';
 import { filter, map, startWith } from 'rxjs/operators';
-import { PageInfo } from '../../../../../app/core/shared/page-info.model';
+import { PageInfo } from '../../core/shared/page-info.model';
 import { lowerCase } from 'lodash';
 
 /**
@@ -10,10 +10,10 @@ import { lowerCase } from 'lodash';
  */
 @Component({
   selector: 'ds-okr-vocabulary-treeview',
-  templateUrl: '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component.html',
+  templateUrl: '../vocabulary-treeview/vocabulary-treeview.component.html',
   styleUrls: [
     './okr-vocabulary-treeview.component.scss',
-    '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component.scss',
+    '../vocabulary-treeview/vocabulary-treeview.component.scss',
   ]
 })
 export class OkrVocabularyTreeviewComponent extends VocabularyTreeviewComponent {
diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html
similarity index 100%
rename from src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html
rename to src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html
diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss
similarity index 100%
rename from src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss
rename to src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss
diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts
similarity index 80%
rename from src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts
rename to src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts
index ac0669cbf9..fe0866468a 100644
--- a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts
@@ -2,27 +2,27 @@ import { OkrSearchHierarchyFilterComponent } from './okr-search-hierarchy-filter
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { DebugElement, EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
-import { VocabularyService } from '../../../../../../../../app/core/submission/vocabularies/vocabulary.service';
+import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
 import { of as observableOf } from 'rxjs';
-import { RemoteData } from '../../../../../../../../app/core/data/remote-data';
-import { RequestEntryState } from '../../../../../../../../app/core/data/request.reducer';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { RequestEntryState } from '../../../../../core/data/request.reducer';
 import { TranslateModule } from '@ngx-translate/core';
-import { RouterStub } from '../../../../../../../../app/shared/testing/router.stub';
-import { buildPaginatedList } from '../../../../../../../../app/core/data/paginated-list.model';
-import { PageInfo } from '../../../../../../../../app/core/shared/page-info.model';
+import { RouterStub } from '../../../../testing/router.stub';
+import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { CommonModule } from '@angular/common';
-import { SearchService } from '../../../../../../../../app/core/shared/search/search.service';
+import { SearchService } from '../../../../../core/shared/search/search.service';
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
   SearchFilterService
-} from '../../../../../../../../app/core/shared/search/search-filter.service';
-import { RemoteDataBuildService } from '../../../../../../../../app/core/cache/builders/remote-data-build.service';
+} from '../../../../../core/shared/search/search-filter.service';
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { Router } from '@angular/router';
 import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../app/my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationServiceStub } from '../../../../../../../../app/shared/testing/search-configuration-service.stub';
-import { VocabularyEntryDetail } from '../../../../../../../../app/core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
+import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
+import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { FacetValue } from '../../../../../../../../app/shared/search/facet-value.model';
 import { SearchFilterConfig } from '../../../../../../../../app/shared/search/search-filter-config.model';
 
diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts
similarity index 64%
rename from src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts
rename to src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts
index 7d4e41894c..530b3d8d2b 100644
--- a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts
@@ -1,28 +1,28 @@
 import { Component, Inject } from '@angular/core';
-import { renderFacetFor } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-filter-type-decorator';
-import { FilterType } from '../../../../../../../../app/shared/search/filter-type.model';
-import { facetLoad } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component';
-import { SearchHierarchyFilterComponent } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component';
+import { renderFacetFor } from '../search-filter-type-decorator';
+import { FilterType } from '../../../models/filter-type.model';
+import { facetLoad } from '../search-facet-filter/search-facet-filter.component';
+import { SearchHierarchyFilterComponent } from '../search-hierarchy-filter/search-hierarchy-filter.component';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { OkrVocabularyTreeviewComponent } from '../../../../okr-vocabulary-treeview/okr-vocabulary-treeview.component';
-import { VocabularyEntryDetail } from '../../../../../../../../app/core/submission/vocabularies/models/vocabulary-entry-detail.model';
-import { SearchService } from '../../../../../../../../app/core/shared/search/search.service';
+import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { SearchService } from '../../../../../core/shared/search/search.service';
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
   SearchFilterService
-} from '../../../../../../../../app/core/shared/search/search-filter.service';
+} from '../../../../../core/shared/search/search-filter.service';
 import { Router } from '@angular/router';
-import { RemoteDataBuildService } from '../../../../../../../../app/core/cache/builders/remote-data-build.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../app/my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../../../../../../../app/core/shared/search/search-configuration.service';
-import { SearchFilterConfig } from '../../../../../../../../app/shared/search/search-filter-config.model';
-import { FacetValue } from '../../../../../../../../app/shared/search/facet-value.model';
-import { getFacetValueForType } from '../../../../../../../../app/shared/search/search.utils';
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
+import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
+import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import { FacetValue } from '../../../models/facet-value.model';
+import { getFacetValueForType } from '../../../search.utils';
 import { filter, map, take } from 'rxjs/operators';
-import { VocabularyService } from '../../../../../../../../app/core/submission/vocabularies/vocabulary.service';
+import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
 import { Observable } from 'rxjs';
-import { PageInfo } from '../../../../../../../../app/core/shared/page-info.model';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
 
 /**
  * Component that represents a hierarchy facet for a specific filter configuration.
diff --git a/src/app/shared/search/search.module.ts b/src/app/shared/search/search.module.ts
index 668d260c23..e9c0b3e121 100644
--- a/src/app/shared/search/search.module.ts
+++ b/src/app/shared/search/search.module.ts
@@ -28,6 +28,9 @@ import { MissingTranslationHelper } from '../translate/missing-translation.helpe
 import { SharedModule } from '../shared.module';
 import { SearchResultsComponent } from './search-results/search-results.component';
 import { SearchComponent } from './search.component';
+import {
+  OkrSearchHierarchyFilterComponent
+} from './search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component';
 
 const COMPONENTS = [
   SearchComponent,
@@ -50,7 +53,8 @@ const COMPONENTS = [
   SearchAuthorityFilterComponent,
   SearchSwitchConfigurationComponent,
   ConfigurationSearchPageComponent,
-  ThemedConfigurationSearchPageComponent
+  ThemedConfigurationSearchPageComponent,
+  OkrSearchHierarchyFilterComponent
 ];
 
 const ENTRY_COMPONENTS = [
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 715ee66a99..6f4091f465 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -177,6 +177,10 @@ import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/
 import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-page/bitstream-request-a-copy-page.component';
 import { DsSelectComponent } from './ds-select/ds-select.component';
 import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component';
+import { OkrVocabularyTreeviewComponent } from './okr-vocabulary-treeview/okr-vocabulary-treeview.component';
+import {
+  OkrSearchHierarchyFilterComponent
+} from './search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -346,6 +350,7 @@ const COMPONENTS = [
   CommunitySidebarSearchListElementComponent,
   SearchNavbarComponent,
   ScopeSelectorModalComponent,
+  OkrVocabularyTreeviewComponent
 ];
 
 const ENTRY_COMPONENTS = [
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index f742273edb..3ebe8006ef 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4162,5 +4162,29 @@
 
   "idle-modal.log-out": "Log out",
 
-  "idle-modal.extend-session": "Extend session"
+  "idle-modal.extend-session": "Extend session",
+
+  "search.filters.filter.show-tree": "Browse {{ name }} tree",
+
+  "search.filters.filter.supportedlanguage.placeholder": "Supported Language",
+
+  "search.filters.filter.supportedlanguage.label": "Search supported Language",
+
+  "search.filters.filter.topic.placeholder": "Topic",
+
+  "search.filters.filter.topic.label": "Search topic",
+
+  "search.filters.filter.doctype.placeholder": "Document type",
+
+  "search.filters.filter.doctype.label": "Search document type",
+
+  "search.filters.filter.region.placeholder": "Region",
+
+  "search.filters.filter.region.label": "Search region",
+
+  "search.filters.filter.country.placeholder": "Country",
+
+  "search.filters.filter.country.label": "Search country",
+
+  "okr-vocabulary-treeview.info": "Click a {{ type }} to add a search filter",
 }
diff --git a/src/themes/okr/entry-components.ts b/src/themes/okr/entry-components.ts
deleted file mode 100644
index bfc93ad216..0000000000
--- a/src/themes/okr/entry-components.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component';
-import { ItemSearchResultListElementComponent } from './app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
-import { PersonSearchResultListElementComponent } from './app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component';
-import { JournalSearchResultListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component';
-import { JournalIssueSearchResultListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component';
-import { JournalVolumeSearchResultListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component';
-import { CitationsSectionComponent } from './app/item-page/field-components/citation/citations-section.component';
-import { CcIconsComponent } from './app/item-page/field-components/cc-icons/cc-icons.component';
-import { AltmetricDonutComponent } from './app/item-page/field-components/citation/altmetric-donut/altmetric-donut.component';
-import { ItemPageWbDateFieldComponent } from './app/item-page/field-components/specific-field/wb-date/item-page-wb-date-field.component';
-import { ItemPageWbGenericWithFallbackComponent } from './app/item-page/field-components/specific-field/wb-generic-with-fallback/item-page-wb-generic-with-fallback.component';
-import { ItemPageWbExternalContentComponent } from './app/item-page/field-components/specific-field/wb-external-content/item-page-wb-external-content.component';
-import { UntypedItemComponent } from './app/item-page/simple/item-types/untyped-item/untyped-item.component';
-import { JournalComponent } from './app/entity-groups/journal-entities/item-pages/journal/journal.component';
-import { JournalIssueComponent } from './app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
-import { JournalVolumeComponent } from './app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
-import { JournalVolumeGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component';
-import { JournalVolumeSearchResultGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component';
-import { JournalIssueSearchResultGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component';
-import { JournalIssueGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component';
-import { JournalVolumeSidebarSearchListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component';
-import { JournalIssueSidebarSearchListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component';
-import { JournalIssueListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component';
-import { JournalVolumeListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component';
-import { FeaturedPublicationsListElementComponent } from './app/featured-publications/featured-publications-list-element/featured-publications-list-element.component';
-import { ClaimedTaskActionsMarkDuplicateComponent } from './app/shared/mydspace-actions/claimed-task/mark-duplicate/claimed-task-actions-mark-duplicate.component';
-import { ClaimedTaskActionsReportProblemComponent } from './app/shared/mydspace-actions/claimed-task/report-problem/claimed-task-actions-report-problem.component';
-import { SingleStatletTableComponent } from './app/atmire-cua/statlets/shared/single-statlet/graph-types/single-statlet-table/single-statlet-table.component';
-import { OkrSearchHierarchyFilterComponent } from './app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component';
-import { OkrVocabularyTreeviewComponent } from './app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component';
-
-export const ENTRY_COMPONENTS = [
-  PublicationComponent,
-  ItemSearchResultListElementComponent,
-  PersonSearchResultListElementComponent,
-  JournalSearchResultListElementComponent,
-  JournalVolumeSearchResultListElementComponent,
-  JournalIssueSearchResultListElementComponent,
-  UntypedItemComponent,
-  AltmetricDonutComponent,
-  CitationsSectionComponent,
-  CcIconsComponent,
-  ItemPageWbDateFieldComponent,
-  ItemPageWbGenericWithFallbackComponent,
-  ItemPageWbExternalContentComponent,
-  JournalComponent,
-  JournalIssueComponent,
-  JournalVolumeComponent,
-  JournalVolumeGridElementComponent,
-  JournalVolumeSearchResultGridElementComponent,
-  JournalIssueSearchResultGridElementComponent,
-  JournalIssueGridElementComponent,
-  JournalVolumeSidebarSearchListElementComponent,
-  JournalIssueSidebarSearchListElementComponent,
-  JournalIssueListElementComponent,
-  JournalVolumeListElementComponent,
-  FeaturedPublicationsListElementComponent,
-  ClaimedTaskActionsMarkDuplicateComponent,
-  ClaimedTaskActionsReportProblemComponent,
-  SingleStatletTableComponent,
-  OkrSearchHierarchyFilterComponent,
-  OkrVocabularyTreeviewComponent,
-];

From 532a59006fa10b0dc78f5b522f92518ecfca404e Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 1 Dec 2022 14:33:23 +0100
Subject: [PATCH 018/160] 97075: Edit-metadata redesign messages + JSDocs

---
 .../dso-edit-metadata-form.ts                 | 116 ++++++++++++++++++
 .../dso-edit-metadata.component.html          |  26 ++--
 .../dso-edit-metadata.component.ts            |  94 ++++++++++++--
 .../metadata-field-selector.component.html    |   2 +-
 .../metadata-field-selector.component.ts      |  80 +++++++++++-
 .../edit-item-page.routing.module.ts          |   1 -
 src/assets/i18n/en.json5                      |   4 +
 7 files changed, 295 insertions(+), 28 deletions(-)

diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
index 220a4561f6..984bec575e 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
@@ -6,19 +6,50 @@ import { MetadataPatchRemoveOperation } from '../../core/data/object-updates/pat
 import { MetadataPatchAddOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model';
 import { MetadataPatchOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-operation.model';
 
+/* tslint:disable:max-classes-per-file */
+
+/**
+ * Enumeration for the type of change occurring on a metadata value
+ */
 export enum DsoEditMetadataChangeType {
   UPDATE = 1,
   ADD = 2,
   REMOVE = 3
 }
 
+/**
+ * Class holding information about a metadata value and its changes within an edit form
+ */
 export class DsoEditMetadataValue {
+  /**
+   * The original metadata value (should stay the same!) used to compare changes with
+   */
   originalValue: MetadataValue;
+
+  /**
+   * The new value, dynamically changing
+   */
   newValue: MetadataValue;
+
+  /**
+   * A value that can be used to undo any discarding that took place
+   */
   reinstatableValue: MetadataValue;
 
+  /**
+   * Whether or not this value is currently being edited or not
+   */
   editing = false;
+
+  /**
+   * The type of change that's taking place on this metadata value
+   * Empty if no changes are made
+   */
   change: DsoEditMetadataChangeType;
+
+  /**
+   * A type or change that can be used to undo any discarding that took place
+   */
   reinstatableChange: DsoEditMetadataChangeType;
 
   constructor(value: MetadataValue, added = false) {
@@ -30,6 +61,12 @@ export class DsoEditMetadataValue {
     }
   }
 
+  /**
+   * Save the current changes made to the metadata value
+   * This will set the type of change to UPDATE if the new metadata value's value and/or language are different from
+   * the original value
+   * It will also set the editing flag to false
+   */
   confirmChanges() {
     if (hasNoValue(this.change) || this.change === DsoEditMetadataChangeType.UPDATE) {
       if ((this.originalValue.value !== this.newValue.value || this.originalValue.language !== this.newValue.language)) {
@@ -41,10 +78,19 @@ export class DsoEditMetadataValue {
     this.editing = false;
   }
 
+  /**
+   * Returns if the current value contains changes or not
+   * If the metadata value contains changes, but they haven't been confirmed yet through confirmChanges(), this might
+   * return false (which is desired)
+   */
   hasChanges(): boolean {
     return hasValue(this.change);
   }
 
+  /**
+   * Discard the current changes and mark the value and change type re-instatable by storing them in their relevant
+   * properties
+   */
   discardAndMarkReinstatable(): void {
     if (this.change === DsoEditMetadataChangeType.UPDATE) {
       this.reinstatableValue = this.newValue;
@@ -53,12 +99,19 @@ export class DsoEditMetadataValue {
     this.discard();
   }
 
+  /**
+   * Discard the current changes
+   * Call discardAndMarkReinstatable() instead, if the discard should be re-instatable
+   */
   discard(): void {
     this.change = undefined;
     this.newValue = Object.assign(new MetadataValue(), this.originalValue);
     this.editing = false;
   }
 
+  /**
+   * Re-instate (undo) the last discard by replacing the value and change type with their reinstate properties (if present)
+   */
   reinstate(): void {
     if (hasValue(this.reinstatableValue)) {
       this.newValue = this.reinstatableValue;
@@ -70,20 +123,50 @@ export class DsoEditMetadataValue {
     }
   }
 
+  /**
+   * Returns if either the value or change type have a re-instatable property
+   * This will be the case if a discard has taken place that undid changes to the value or type
+   */
   isReinstatable(): boolean {
     return hasValue(this.reinstatableValue) || hasValue(this.reinstatableChange);
   }
 }
 
+/**
+ * Class holding information about the metadata of a DSpaceObject and its changes within an edit form
+ */
 export class DsoEditMetadataForm {
+  /**
+   * List of original metadata field keys (before any changes took place)
+   */
   originalFieldKeys: string[];
+
+  /**
+   * List of current metadata field keys (includes new fields for values added by the user)
+   */
   fieldKeys: string[];
+
+  /**
+   * Current state of the form
+   * Key: Metadata field
+   * Value: List of {@link DsoEditMetadataValue}s for the metadata field
+   */
   fields: {
     [mdField: string]: DsoEditMetadataValue[],
   };
+
+  /**
+   * A map of previously added metadata values before a discard of the form took place
+   * This can be used to re-instate the entire form to before the discard taking place
+   */
   reinstatableNewValues: {
     [mdField: string]: DsoEditMetadataValue[],
   };
+
+  /**
+   * A (temporary) new metadata value added by the user, not belonging to a metadata field yet
+   * This value will be finalised and added to a field using setMetadataField()
+   */
   newValue: DsoEditMetadataValue;
 
   constructor(metadata: MetadataMap) {
@@ -98,18 +181,32 @@ export class DsoEditMetadataForm {
     });
   }
 
+  /**
+   * Add a new temporary value for the user to edit
+   */
   add(): void {
     if (hasNoValue(this.newValue)) {
       this.newValue = new DsoEditMetadataValue(new MetadataValue(), true);
     }
   }
 
+  /**
+   * Add the temporary value to a metadata field
+   * Clear the temporary value afterwards
+   * @param mdField
+   */
   setMetadataField(mdField: string) {
     this.newValue.editing = false;
     this.addValueToField(this.newValue, mdField);
     this.newValue = undefined;
   }
 
+  /**
+   * Add a value to a metadata field within the map
+   * @param value
+   * @param mdField
+   * @private
+   */
   private addValueToField(value: DsoEditMetadataValue, mdField: string) {
     if (isEmpty(this.fields[mdField])) {
       this.fieldKeys.push(mdField);
@@ -118,6 +215,11 @@ export class DsoEditMetadataForm {
     this.fields[mdField].push(value);
   }
 
+  /**
+   * Remove a value from a metadata field on a given index (this actually removes the value, not just marking it deleted)
+   * @param mdField
+   * @param index
+   */
   remove(mdField: string, index: number) {
     if (isNotEmpty(this.fields[mdField])) {
       this.fields[mdField].splice(index, 1);
@@ -128,10 +230,17 @@ export class DsoEditMetadataForm {
     }
   }
 
+  /**
+   * Returns if at least one value within the form contains a change
+   */
   hasChanges(): boolean {
     return Object.values(this.fields).some((values) => values.some((value) => value.hasChanges()));
   }
 
+  /**
+   * Discard all changes within the form and store their current values within re-instatable properties so they can be
+   * undone afterwards
+   */
   discard(): void {
     Object.entries(this.fields).forEach(([field, values]) => {
       let removeFromIndex = -1;
@@ -174,6 +283,9 @@ export class DsoEditMetadataForm {
     this.reinstatableNewValues = {};
   }
 
+  /**
+   * Returns if at least one value contains a re-instatable property, meaning a discard can be reversed
+   */
   isReinstatable(): boolean {
     return isNotEmpty(this.reinstatableNewValues) ||
       Object.values(this.fields)
@@ -181,6 +293,9 @@ export class DsoEditMetadataForm {
           .some((value) => value.isReinstatable()));
   }
 
+  /**
+   * Get the json PATCH operations for the current changes within this form
+   */
   getOperations(): Operation[] {
     const operations: Operation[] = [];
     Object.entries(this.fields).forEach(([field, values]) => {
@@ -211,3 +326,4 @@ export class DsoEditMetadataForm {
     return operations;
   }
 }
+/* tslint:enable:max-classes-per-file */
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index 4154a9ce56..7578f2ec99 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -20,12 +20,12 @@
   </div>
 
   <div class="d-flex flex-row ds-field-row ds-header-row">
-    <div class="lbl-cell">Field</div>
+    <div class="lbl-cell">{{ dsoType + '.edit.metadata.headers.field' | translate }}</div>
     <div class="flex-grow-1">
       <div class="d-flex flex-row">
-        <div class="flex-grow-1 ds-flex-cell ds-value-cell"><b class="dont-break-out preserve-line-breaks">Value</b></div>
-        <div class="ds-flex-cell ds-lang-cell"><b>Lang</b></div>
-        <div class="text-center ds-flex-cell ds-edit-cell"><b>Edit</b></div>
+        <div class="flex-grow-1 ds-flex-cell ds-value-cell"><b class="dont-break-out preserve-line-breaks">{{ dsoType + '.edit.metadata.headers.value' | translate }}</b></div>
+        <div class="ds-flex-cell ds-lang-cell"><b>{{ dsoType + '.edit.metadata.headers.language' | translate }}</b></div>
+        <div class="text-center ds-flex-cell ds-edit-cell"><b>{{ dsoType + '.edit.metadata.headers.edit' | translate }}</b></div>
       </div>
     </div>
   </div>
@@ -43,19 +43,19 @@
         </div>
         <div class="text-center ds-flex-cell ds-edit-cell">
           <div class="btn-group edit-field">
-            <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="Confirm changes"
+            <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.buttons.confirm' | translate }}"
                     [disabled]="!newMdField || (saving$ | async) || (loadingFieldValidation$ | async)" (click)="setMetadataField()">
               <i class="fas fa-check fa-fw"></i>
             </button>
-            <button class="btn btn-outline-danger btn-sm" ngbTooltip="Remove"
+            <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.buttons.remove' | translate }}"
                     [disabled]="true">
               <i class="fas fa-trash-alt fa-fw"></i>
             </button>
-            <button class="btn btn-outline-warning btn-sm" ngbTooltip="Undo changes"
+            <button class="btn btn-outline-warning btn-sm" ngbTooltip="{{ dsoType + '.edit.buttons.undo' | translate }}"
                     [disabled]="(saving$ | async) || (loadingFieldValidation$ | async)" (click)="form.newValue = undefined">
               <i class="fas fa-undo-alt fa-fw"></i>
             </button>
-            <button class="btn btn-outline-secondary ds-drag-handle btn-sm disabled" ngbTooltip="Drag to reorder"
+            <button class="btn btn-outline-secondary ds-drag-handle btn-sm disabled" ngbTooltip="{{ dsoType + '.edit.buttons.drag' | translate }}"
                     [disabled]="true">
               <i class="fas fa-grip-vertical fa-fw"></i>
             </button>
@@ -82,25 +82,25 @@
         </div>
         <div class="text-center ds-flex-cell ds-edit-cell">
           <div class="btn-group edit-field">
-            <button class="btn btn-outline-primary btn-sm ng-star-inserted" ngbTooltip="Edit" *ngIf="!mdValue.editing"
+            <button class="btn btn-outline-primary btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.buttons.edit' | translate }}" *ngIf="!mdValue.editing"
                     [disabled]="mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="mdValue.editing = true">
               <i class="fas fa-edit fa-fw"></i>
             </button>
-            <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="Confirm changes" *ngIf="mdValue.editing"
+            <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.buttons.confirm' | translate }}" *ngIf="mdValue.editing"
                     [disabled]="(saving$ | async)" (click)="mdValue.confirmChanges(); onValueSaved()">
               <i class="fas fa-check fa-fw"></i>
             </button>
-            <button class="btn btn-outline-danger btn-sm" ngbTooltip="Remove"
+            <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.buttons.remove' | translate }}"
                     [disabled]="mdValue.change || mdValue.editing || (saving$ | async)" (click)="mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE; onValueSaved()">
               <i class="fas fa-trash-alt fa-fw"></i>
             </button>
-            <button class="btn btn-outline-warning btn-sm" ngbTooltip="Undo changes"
+            <button class="btn btn-outline-warning btn-sm" ngbTooltip="{{ dsoType + '.edit.buttons.undo' | translate }}"
                     [disabled]="(!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.discard(); onValueSaved()">
               <i class="fas fa-undo-alt fa-fw"></i>
             </button>
             <!-- TODO: Enable drag -->
             <button class="btn btn-outline-secondary ds-drag-handle btn-sm"
-                    [ngClass]="{'disabled': form.fields[mdField].length === 1 || (saving$ | async)}" ngbTooltip="Drag to reorder" [disabled]="form.fields[mdField].length === 1 || (saving$ | async)">
+                    [ngClass]="{'disabled': form.fields[mdField].length === 1 || (saving$ | async)}" ngbTooltip="{{ dsoType + '.edit.buttons.drag' | translate }}" [disabled]="form.fields[mdField].length === 1 || (saving$ | async)">
               <i class="fas fa-grip-vertical fa-fw"></i>
             </button>
           </div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
index 97f34ba2a3..eee2bc963c 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -1,28 +1,22 @@
 import { Component, Injector, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { AlertType } from '../../shared/alert/aletr-type';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { DsoEditMetadataChangeType, DsoEditMetadataForm, DsoEditMetadataValue } from './dso-edit-metadata-form';
-import { map, switchMap } from 'rxjs/operators';
+import { DsoEditMetadataChangeType, DsoEditMetadataForm } from './dso-edit-metadata-form';
+import { map } from 'rxjs/operators';
 import { ActivatedRoute, Data } from '@angular/router';
 import { combineLatest as observableCombineLatest } from 'rxjs/internal/observable/combineLatest';
 import { Subscription } from 'rxjs/internal/Subscription';
 import { RemoteData } from '../../core/data/remote-data';
 import { hasNoValue, hasValue } from '../../shared/empty.util';
-import { RegistryService } from '../../core/registry/registry.service';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
-import { Observable } from 'rxjs/internal/Observable';
-import { followLink } from '../../shared/utils/follow-link-config.model';
 import {
   getFirstCompletedRemoteData,
-  getFirstSucceededRemoteData,
-  metadataFieldsToString
 } from '../../core/shared/operators';
 import { UpdateDataService } from '../../core/data/update-data.service';
 import { getDataServiceFor } from '../../core/cache/builders/build-decorators';
 import { ResourceType } from '../../core/shared/resource-type';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { DataService } from '../../core/data/data.service';
 import { MetadataFieldSelectorComponent } from './metadata-field-selector/metadata-field-selector.component';
 
 @Component({
@@ -30,19 +24,56 @@ import { MetadataFieldSelectorComponent } from './metadata-field-selector/metada
   styleUrls: ['./dso-edit-metadata.component.scss'],
   templateUrl: './dso-edit-metadata.component.html',
 })
+/**
+ * Component showing a table of all metadata on a DSpaceObject and options to modify them
+ */
 export class DsoEditMetadataComponent implements OnInit, OnDestroy {
+  /**
+   * DSpaceObject to edit metadata for
+   */
   @Input() dso: DSpaceObject;
+
+  /**
+   * Reference to the component responsible for showing a metadata-field selector
+   * Used to validate its contents (existing metadata field) before adding a new metadata value
+   */
   @ViewChild(MetadataFieldSelectorComponent) metadataFieldSelectorComponent: MetadataFieldSelectorComponent;
+
+  /**
+   * Resolved update data-service for the given DSpaceObject (depending on its type, e.g. ItemDataService for an Item)
+   * Used to send the PATCH request
+   */
   updateDataService: UpdateDataService<DSpaceObject>;
+
+  /**
+   * Type of the DSpaceObject in String
+   * Used to resolve i18n messages
+   */
   dsoType: string;
 
+  /**
+   * A dynamic form object containing all information about the metadata and the changes made to them, see {@link DsoEditMetadataForm}
+   */
   form: DsoEditMetadataForm;
+
+  /**
+   * The metadata field entered by the user for a new metadata value
+   */
   newMdField: string;
 
+  // Properties determined by the state of the dynamic form, updated by onValueSaved()
   isReinstatable: boolean;
   hasChanges: boolean;
   isEmpty: boolean;
+
+  /**
+   * Whether or not the form is currently being submitted
+   */
   saving$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
+  /**
+   * Whether or not the metadata field is currently being validated
+   */
   loadingFieldValidation$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   /**
@@ -57,6 +88,10 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
    */
   public DsoEditMetadataChangeTypeEnum = DsoEditMetadataChangeType;
 
+  /**
+   * Subscription for updating the current DSpaceObject
+   * Unsubscribed from in ngOnDestroy()
+   */
   dsoUpdateSubscription: Subscription;
 
   constructor(protected route: ActivatedRoute,
@@ -65,6 +100,10 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
               protected parentInjector: Injector) {
   }
 
+  /**
+   * Read the route (or parent route)'s data to retrieve the current DSpaceObject
+   * After it's retrieved, initialise the data-service and form
+   */
   ngOnInit(): void {
     if (hasNoValue(this.dso)) {
       this.dsoUpdateSubscription = observableCombineLatest([this.route.data, this.route.parent.data]).pipe(
@@ -81,6 +120,9 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
     }
   }
 
+  /**
+   * Initialise (resolve) the data-service for the current DSpaceObject
+   */
   initDataService(): void {
     let type: ResourceType;
     if (typeof this.dso.type === 'string') {
@@ -96,17 +138,29 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
     this.dsoType = type.value;
   }
 
+  /**
+   * Initialise the dynamic form object by passing the DSpaceObject's metadata
+   * Call onValueSaved() to update the form's state properties
+   */
   initForm(): void {
     this.form = new DsoEditMetadataForm(this.dso.metadata);
     this.onValueSaved();
   }
 
+  /**
+   * Update the form's state properties
+   */
   onValueSaved(): void {
     this.hasChanges = this.form.hasChanges();
     this.isReinstatable = this.form.isReinstatable();
     this.isEmpty = Object.keys(this.form.fields).length === 0;
   }
 
+  /**
+   * Submit the current changes to the form by retrieving json PATCH operations from the form and sending it to the
+   * DSpaceObject's data-service
+   * Display notificiations and reset the form afterwards if successful
+   */
   submit(): void {
     this.saving$.next(true);
     this.updateDataService.patch(this.dso, this.form.getOperations()).pipe(
@@ -114,15 +168,23 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
     ).subscribe((rd: RemoteData<DSpaceObject>) => {
       this.saving$.next(false);
       if (rd.hasFailed) {
-        this.notificationsService.error('error', rd.errorMessage);
+        this.notificationsService.error(this.translateService.instant(`${this.dsoType}.edit.metadata.notifications.error.title`), rd.errorMessage);
       } else {
-        this.notificationsService.success('saved', 'saved');
+        this.notificationsService.success(
+            this.translateService.instant(`${this.dsoType}.edit.metadata.notifications.saved.title`),
+            this.translateService.instant(`${this.dsoType}.edit.metadata.notifications.saved.content`)
+        );
         this.dso = rd.payload;
         this.initForm();
       }
     });
   }
 
+  /**
+   * Set the metadata field of the temporary added new metadata value
+   * This will move the new value to its respective parent metadata field
+   * Validate the metadata field first
+   */
   setMetadataField() {
     this.loadingFieldValidation$.next(true);
     this.metadataFieldSelectorComponent.validate().subscribe((valid) => {
@@ -134,21 +196,33 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
     });
   }
 
+  /**
+   * Add a new temporary metadata value
+   */
   add(): void {
     this.newMdField = undefined;
     this.form.add();
   }
 
+  /**
+   * Discard all changes within the current form
+   */
   discard(): void {
     this.form.discard();
     this.onValueSaved();
   }
 
+  /**
+   * Restore any changes previously discarded from the form
+   */
   reinstate(): void {
     this.form.reinstate();
     this.onValueSaved();
   }
 
+  /**
+   * Unsubscribe from any open subscriptions
+   */
   ngOnDestroy() {
     if (hasValue(this.dsoUpdateSubscription)) {
       this.dsoUpdateSubscription.unsubscribe();
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
index 2a69c21188..4c310bd81b 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
@@ -6,7 +6,7 @@
          (focusin)="query$.next(mdField)"
          (dsClickOutside)="query$.next(null)"
          (click)="$event.stopPropagation();" />
-  <div class="invalid-feedback show-feedback" *ngIf="showInvalid">Invalid metadata field, please pick an existing one from the suggestions when searching</div>
+  <div class="invalid-feedback show-feedback" *ngIf="showInvalid">{{ dsoType + '.edit.metadata.metadatafield.invalid' | translate }}</div>
   <div class="autocomplete dropdown-menu" [ngClass]="{'show': (mdFieldOptions$ | async)?.length > 0}">
     <div class="dropdown-list">
       <div *ngFor="let mdFieldOption of (mdFieldOptions$ | async)">
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
index cde41dee96..7fc56f8dc2 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
@@ -12,14 +12,14 @@ import {
 import { switchMap, debounceTime, distinctUntilChanged, map, tap, take } from 'rxjs/operators';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import {
-  getAllSucceededRemoteData, getFirstCompletedRemoteData, getFirstSucceededRemoteData,
+  getAllSucceededRemoteData, getFirstSucceededRemoteData,
   metadataFieldsToString
 } from '../../../core/shared/operators';
 import { Observable } from 'rxjs/internal/Observable';
 import { RegistryService } from '../../../core/registry/registry.service';
 import { FormControl } from '@angular/forms';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
-import { hasValue, isNotEmpty } from '../../../shared/empty.util';
+import { hasValue } from '../../../shared/empty.util';
 import { Subscription } from 'rxjs/internal/Subscription';
 
 @Component({
@@ -27,25 +27,83 @@ import { Subscription } from 'rxjs/internal/Subscription';
   styleUrls: ['./metadata-field-selector.component.scss'],
   templateUrl: './metadata-field-selector.component.html'
 })
+/**
+ * Component displaying a searchable input for metadata-fields
+ */
 export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterViewInit {
+  /**
+   * Type of the DSpaceObject
+   * Used to resolve i18n messages
+   */
+  @Input() dsoType: string;
+
+  /**
+   * The currently entered metadata field
+   */
   @Input() mdField: string;
+
+  /**
+   * If true, the input will be automatically focussed upon when the component is first loaded
+   */
   @Input() autofocus = false;
+
+  /**
+   * Emit any changes made to the metadata field
+   * This will only emit after a debounce takes place to avoid constant emits when the user is typing
+   */
   @Output() mdFieldChange = new EventEmitter<string>();
+
+  /**
+   * Reference to the metadata-field's input
+   */
   @ViewChild('mdFieldInput', { static: true }) mdFieldInput: ElementRef;
+
+  /**
+   * List of available metadata field options to choose from, dependent on the current query the user entered
+   * Shows up in a dropdown below the input
+   */
   mdFieldOptions$: Observable<string[]>;
 
+  /**
+   * FormControl for the input
+   */
   public input: FormControl = new FormControl();
 
+  /**
+   * The current query to update mdFieldOptions$ for
+   * This is controlled by a debounce, to avoid too many requests
+   */
   query$: BehaviorSubject<string> = new BehaviorSubject<string>(null);
+
+  /**
+   * The amount of time to debounce the query for (in ms)
+   */
   debounceTime = 300;
+
+  /**
+   * Whether or not the the user just selected a value
+   * This flag avoids the metadata field from updating twice, which would result in the dropdown opening again right after selecting a value
+   */
   selectedValueLoading = false;
+
+  /**
+   * Whether or not to show the invalid feedback
+   * True when validate() is called and the mdField isn't present in the available metadata fields retrieved from the server
+   */
   showInvalid = false;
 
+  /**
+   * Subscriptions to unsubscribe from on destroy
+   */
   subs: Subscription[] = [];
 
   constructor(protected registryService: RegistryService) {
   }
 
+  /**
+   * Subscribe to any changes made to the input, with a debounce and fire a query, as well as emit the change from this component
+   * Update the mdFieldOptions$ depending on the query$ fired by querying the server
+   */
   ngOnInit(): void {
     this.subs.push(
       this.input.valueChanges.pipe(
@@ -75,10 +133,19 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
     );
   }
 
+  /**
+   * Focus the input if autofocus is enabled
+   */
   ngAfterViewInit(): void {
-    this.mdFieldInput.nativeElement.focus();
+    if (this.autofocus) {
+      this.mdFieldInput.nativeElement.focus();
+    }
   }
 
+  /**
+   * Validate the metadata field to check if it exists on the server and return an observable boolean for success/error
+   * Upon subscribing to the returned observable, the showInvalid flag is updated accordingly to show the feedback under the input
+   */
   validate(): Observable<boolean> {
     return this.registryService.queryMetadataFields(this.mdField, null, true, false, followLink('schema')).pipe(
       getFirstSucceededRemoteData(),
@@ -89,11 +156,18 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
     );
   }
 
+  /**
+   * Select a metadata field from the dropdown optipons
+   * @param mdFieldOption
+   */
   select(mdFieldOption: string) {
     this.selectedValueLoading = true;
     this.input.setValue(mdFieldOption);
   }
 
+  /**
+   * Unsubscribe from any open subscriptions
+   */
   ngOnDestroy(): void {
     this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
diff --git a/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
index bd8af3742e..7ccf1fec37 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
@@ -7,7 +7,6 @@ import { ItemPrivateComponent } from './item-private/item-private.component';
 import { ItemPublicComponent } from './item-public/item-public.component';
 import { ItemDeleteComponent } from './item-delete/item-delete.component';
 import { ItemStatusComponent } from './item-status/item-status.component';
-import { ItemMetadataComponent } from './item-metadata/item-metadata.component';
 import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component';
 import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
 import { ItemMoveComponent } from './item-move/item-move.component';
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index f742273edb..93ee1427af 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1791,6 +1791,10 @@
 
   "item.edit.metadata.discard-button": "Discard",
 
+  "item.edit.metadata.edit.buttons.confirm": "Confirm",
+
+  "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+
   "item.edit.metadata.edit.buttons.edit": "Edit",
 
   "item.edit.metadata.edit.buttons.remove": "Remove",

From edc73d35852bc70ac930546d344e0c250f79d1aa Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Thu, 1 Dec 2022 15:01:11 +0100
Subject: [PATCH 019/160] 97049: Refactor how to obtain vocabularies for filter
 (configurable)

---
 config/config.yml                                |  5 +++++
 .../okr-search-hierarchy-filter.component.ts     | 16 ++++++++++++++--
 src/config/FilterVocabularyConfig.ts             |  7 +++++++
 src/config/app-config.interface.ts               |  2 ++
 src/config/default-app-config.ts                 |  9 +++++++++
 src/environments/environment.test.ts             | 10 +++++++++-
 6 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 src/config/FilterVocabularyConfig.ts

diff --git a/config/config.yml b/config/config.yml
index b5eecd112f..5b171d9cc4 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -3,3 +3,8 @@ rest:
   host: api7.dspace.org
   port: 443
   nameSpace: /server
+
+vocabularies:
+  - filter: 'subject'
+    vocabulary: 'srsc'
+    enabled: true
diff --git a/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts
index 530b3d8d2b..f3a1a41355 100644
--- a/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts
@@ -23,6 +23,7 @@ import { filter, map, take } from 'rxjs/operators';
 import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
 import { Observable } from 'rxjs';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
+import { environment } from '../../../../../../environments/environment';
 
 /**
  * Component that represents a hierarchy facet for a specific filter configuration.
@@ -63,7 +64,7 @@ export class OkrSearchHierarchyFilterComponent extends SearchHierarchyFilterComp
   ngOnInit() {
     super.ngOnInit();
     this.vocabularyExists$ = this.vocabularyService.searchTopEntries(
-      this.filterConfig.name, new PageInfo(), true, false,
+      this.getVocabularyEntry(), new PageInfo(), true, false,
     ).pipe(
       filter(rd => rd.hasCompleted),
       take(1),
@@ -83,7 +84,7 @@ export class OkrSearchHierarchyFilterComponent extends SearchHierarchyFilterComp
       windowClass: 'treeview'
     });
     modalRef.componentInstance.vocabularyOptions = {
-      name: this.filterConfig.name,
+      name: this.getVocabularyEntry(),
       closed: true
     };
     modalRef.componentInstance.select.subscribe((detail: VocabularyEntryDetail) => {
@@ -103,4 +104,15 @@ export class OkrSearchHierarchyFilterComponent extends SearchHierarchyFilterComp
         });
     });
   }
+
+  /**
+   * Returns the matching vocabulary entry for the given search filter.
+   * These are configurable in the config file.
+   */
+  getVocabularyEntry() {
+    const foundVocabularyConfig = environment.vocabularies.filter((v) => v.filter === this.filterConfig.name);
+    if (foundVocabularyConfig.length > 0 && foundVocabularyConfig[0].enabled === true) {
+      return foundVocabularyConfig[0].vocabulary;
+    }
+  }
 }
diff --git a/src/config/FilterVocabularyConfig.ts b/src/config/FilterVocabularyConfig.ts
new file mode 100644
index 0000000000..a9b37af2d8
--- /dev/null
+++ b/src/config/FilterVocabularyConfig.ts
@@ -0,0 +1,7 @@
+import { Config } from './config.interface';
+
+export interface FilterVocabularyConfig extends Config {
+  filter: string;
+  vocabulary: string;
+  enabled: boolean;
+}
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index 62d0be7216..21682e7c45 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -15,6 +15,7 @@ import { AuthConfig } from './auth-config.interfaces';
 import { UIServerConfig } from './ui-server-config.interface';
 import { MediaViewerConfig } from './media-viewer-config.interface';
 import { BrowseByConfig } from './browse-by-config.interface';
+import { FilterVocabularyConfig } from './FilterVocabularyConfig';
 
 interface AppConfig extends Config {
   ui: UIServerConfig;
@@ -34,6 +35,7 @@ interface AppConfig extends Config {
   collection: CollectionPageConfig;
   themes: ThemeConfig[];
   mediaViewer: MediaViewerConfig;
+  vocabularies: FilterVocabularyConfig[];
 }
 
 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 df9bbe9369..65d8691421 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -15,6 +15,7 @@ import { SubmissionConfig } from './submission-config.interface';
 import { ThemeConfig } from './theme.model';
 import { UIServerConfig } from './ui-server-config.interface';
 import { UniversalConfig } from './universal-config.interface';
+import { FilterVocabularyConfig } from './FilterVocabularyConfig';
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -314,4 +315,12 @@ export class DefaultAppConfig implements AppConfig {
     image: false,
     video: false
   };
+
+  vocabularies: FilterVocabularyConfig[] = [
+    {
+      filter: 'subject',
+      vocabulary: 'srsc',
+      enabled: true
+    }
+    ];
 }
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index f8a3248837..0ba688fac5 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -227,5 +227,13 @@ export const environment: AppConfig = {
   mediaViewer: {
     image: true,
     video: true
-  }
+  },
+
+  vocabularies: [
+    {
+      filter: 'subject',
+      vocabulary: 'srsc',
+      enabled: true
+    }
+  ]
 };

From be0b54e05863266a207a7451219a8da28f9b2fdc Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Thu, 1 Dec 2022 15:08:58 +0100
Subject: [PATCH 020/160] change sitemap entries in robots.txt to absolute urls

---
 package.json                       |  2 ++
 server.ts                          | 14 +++++++++
 src/{robots.txt => robots.txt.ejs} |  4 +--
 webpack/webpack.common.ts          |  4 +--
 yarn.lock                          | 50 +++++++++++++++++++++++++++++-
 5 files changed, 69 insertions(+), 5 deletions(-)
 rename src/{robots.txt => robots.txt.ejs} (97%)

diff --git a/package.json b/package.json
index 278afdf6c3..3cc9ccb694 100644
--- a/package.json
+++ b/package.json
@@ -82,6 +82,7 @@
     "cookie-parser": "1.4.5",
     "core-js": "^3.7.0",
     "deepmerge": "^4.2.2",
+    "ejs": "^3.1.8",
     "express": "^4.17.1",
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.0.0-1",
@@ -133,6 +134,7 @@
     "@ngtools/webpack": "10.2.3",
     "@nguniversal/builders": "~11.2.1",
     "@types/deep-freeze": "0.1.2",
+    "@types/ejs": "^3.1.1",
     "@types/express": "^4.17.9",
     "@types/file-saver": "^2.0.1",
     "@types/jasmine": "~3.6.0",
diff --git a/server.ts b/server.ts
index da3b877bc1..e084998f56 100644
--- a/server.ts
+++ b/server.ts
@@ -23,6 +23,7 @@ import * as pem from 'pem';
 import * as https from 'https';
 import * as morgan from 'morgan';
 import * as express from 'express';
+import * as ejs from 'ejs';
 import * as bodyParser from 'body-parser';
 import * as compression from 'compression';
 
@@ -120,10 +121,23 @@ export function app() {
     })(_, (options as any), callback)
   );
 
+  server.engine('ejs', ejs.renderFile);
+
   /*
    * Register the view engines for html and ejs
    */
   server.set('view engine', 'html');
+  server.set('view engine', 'ejs');
+
+  /**
+   * Serve the robots.txt ejs template, filling in the origin variable
+   */
+  server.get('/robots.txt', (req, res) => {
+    res.setHeader('content-type', 'text/plain');
+    res.render('assets/robots.txt.ejs', {
+      'origin': req.protocol + '://' + req.headers.host
+    });
+  });
 
   /*
    * Set views folder path to directory where template files are stored
diff --git a/src/robots.txt b/src/robots.txt.ejs
similarity index 97%
rename from src/robots.txt
rename to src/robots.txt.ejs
index 04cbb888e0..cd5e228b3a 100644
--- a/src/robots.txt
+++ b/src/robots.txt.ejs
@@ -1,7 +1,7 @@
 # The URL to the DSpace sitemaps
 # XML sitemap is listed first as it is preferred by most search engines
-Sitemap: /sitemap_index.xml
-Sitemap: /sitemap_index.html
+Sitemap: <%= origin %>/sitemap_index.xml
+Sitemap: <%= origin %>/sitemap_index.html
 
 ##########################
 # Default Access Group
diff --git a/webpack/webpack.common.ts b/webpack/webpack.common.ts
index 07e55d89d4..77fe941ec4 100644
--- a/webpack/webpack.common.ts
+++ b/webpack/webpack.common.ts
@@ -34,8 +34,8 @@ export const copyWebpackOptions = {
       },
     },
     {
-      from: path.join(__dirname, '..', 'src', 'robots.txt'),
-      to: 'robots.txt'
+      from: path.join(__dirname, '..', 'src', 'robots.txt.ejs'),
+      to: 'assets/robots.txt.ejs'
     }
   ]
 };
diff --git a/yarn.lock b/yarn.lock
index 0f8ef0a6e6..941136052f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1982,6 +1982,11 @@
   resolved "https://registry.yarnpkg.com/@types/deep-freeze/-/deep-freeze-0.1.2.tgz#68e5379291910e82c2f0d1629732163c2aa662cc"
   integrity sha512-M6x29Vk4681dght4IMnPIcF1SNmeEm0c4uatlTFhp+++H1oDK1THEIzuCC2WeCBVhX+gU0NndsseDS3zaCtlcQ==
 
+"@types/ejs@^3.1.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.1.tgz#29c539826376a65e7f7d672d51301f37ed718f6d"
+  integrity sha512-RQul5wEfY7BjWm0sYY86cmUN/pcXWGyVxWX93DFFJvcrxax5zKlieLwA3T77xJGwNcZW0YW6CYG70p1m8xPFmA==
+
 "@types/express-serve-static-core@^4.17.18":
   version "4.17.26"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.26.tgz#5d9a8eeecb9d5f9d7fc1d85f541512a84638ae88"
@@ -2905,6 +2910,11 @@ async@^3.2.0:
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.2.tgz#2eb7671034bb2194d45d30e31e24ec7e7f9670cd"
   integrity sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==
 
+async@^3.2.3:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
+  integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -3222,6 +3232,13 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
 braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
@@ -3701,7 +3718,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0, chalk@~4.1.0:
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@~4.1.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -5511,6 +5528,13 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
+ejs@^3.1.8:
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
+  integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==
+  dependencies:
+    jake "^10.8.5"
+
 electron-to-chromium@^1.3.896:
   version "1.4.12"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.12.tgz#5f73d1278c6205fc41d7a0ebd75563046b77c5d8"
@@ -6171,6 +6195,13 @@ file-uri-to-path@1.0.0:
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
+filelist@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5"
+  integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==
+  dependencies:
+    minimatch "^5.0.1"
+
 filesize@^6.1.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.4.0.tgz#914f50471dd66fdca3cefe628bd0cde4ef769bcd"
@@ -7937,6 +7968,16 @@ istanbul-reports@^3.0.2:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
+jake@^10.8.5:
+  version "10.8.5"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"
+  integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==
+  dependencies:
+    async "^3.2.3"
+    chalk "^4.0.2"
+    filelist "^1.0.1"
+    minimatch "^3.0.4"
+
 jasmine-core@^3.6.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.10.1.tgz#7aa6fa2b834a522315c651a128d940eca553989a"
@@ -9046,6 +9087,13 @@ minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^5.0.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.1.tgz#6c9dffcf9927ff2a31e74b5af11adf8b9604b022"
+  integrity sha512-362NP+zlprccbEt/SkxKfRMHnNY85V74mVnpUpNyr3F35covl09Kec7/sEFLt3RA4oXmewtoaanoIf67SE5Y5g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"

From 85ccfc6ea749d214a43972728be8309cdcbe442b Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Thu, 1 Dec 2022 15:30:30 +0100
Subject: [PATCH 021/160] 97049: Remove client structure

---
 .../okr-vocabulary-treeview.component.scss    |   0
 .../okr-vocabulary-treeview.component.ts      |  41 ------
 ...okr-search-hierarchy-filter.component.html |   8 --
 ...okr-search-hierarchy-filter.component.scss |   0
 .../okr-search-hierarchy-filter.component.ts  | 118 ------------------
 .../search-hierarchy-filter.component.html    |   7 ++
 ...search-hierarchy-filter.component.spec.ts} |  12 +-
 .../search-hierarchy-filter.component.ts      | 106 ++++++++++++++--
 src/app/shared/search/search.module.ts        |   6 +-
 src/app/shared/shared.module.ts               |   5 -
 .../vocabulary-treeview.component.ts          |  31 ++---
 11 files changed, 125 insertions(+), 209 deletions(-)
 delete mode 100644 src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss
 delete mode 100644 src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts
 delete mode 100644 src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html
 delete mode 100644 src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss
 delete mode 100644 src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts
 rename src/app/shared/search/search-filters/search-filter/{okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts => search-hierarchy-filter/search-hierarchy-filter.component.spec.ts} (92%)

diff --git a/src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss b/src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts b/src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts
deleted file mode 100644
index 80dcb1f739..0000000000
--- a/src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { Component } from '@angular/core';
-import { VocabularyTreeviewComponent } from '../vocabulary-treeview/vocabulary-treeview.component';
-import { filter, map, startWith } from 'rxjs/operators';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { lowerCase } from 'lodash';
-
-/**
- * Component that show a hierarchical vocabulary in a tree view.
- * Worldbank customization which omits the authentication check.
- */
-@Component({
-  selector: 'ds-okr-vocabulary-treeview',
-  templateUrl: '../vocabulary-treeview/vocabulary-treeview.component.html',
-  styleUrls: [
-    './okr-vocabulary-treeview.component.scss',
-    '../vocabulary-treeview/vocabulary-treeview.component.scss',
-  ]
-})
-export class OkrVocabularyTreeviewComponent extends VocabularyTreeviewComponent {
-
-  /**
-   * Initialize the component, setting up the data to build the tree
-   */
-  ngOnInit(): void {
-    this.subs.push(
-      this.vocabularyTreeviewService.getData().subscribe((data) => {
-        this.dataSource.data = data;
-      })
-    );
-
-    this.translate.get(`search.filters.filter.${this.vocabularyOptions.name}.head`).pipe(
-      map((type) => lowerCase(type)),
-    ).subscribe(
-      (type) => this.description = this.translate.get('okr-vocabulary-treeview.info', { type })
-    );
-
-    this.loading = this.vocabularyTreeviewService.isLoading();
-
-    this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), null);
-  }
-}
diff --git a/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html
deleted file mode 100644
index 731b5045bf..0000000000
--- a/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<ds-search-hierarchy-filter></ds-search-hierarchy-filter>
-
-<a *ngIf="vocabularyExists$ | async"
-     href="javascript:void(0);"
-     id="show-{{filterConfig.name}}-tree"
-     (click)="showVocabularyTree()">
-  {{'search.filters.filter.show-tree' | translate: {name: ('search.filters.filter.' + filterConfig.name + '.head' | translate | lowercase )} }}
-</a>
diff --git a/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts
deleted file mode 100644
index f3a1a41355..0000000000
--- a/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-import { Component, Inject } from '@angular/core';
-import { renderFacetFor } from '../search-filter-type-decorator';
-import { FilterType } from '../../../models/filter-type.model';
-import { facetLoad } from '../search-facet-filter/search-facet-filter.component';
-import { SearchHierarchyFilterComponent } from '../search-hierarchy-filter/search-hierarchy-filter.component';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { OkrVocabularyTreeviewComponent } from '../../../../okr-vocabulary-treeview/okr-vocabulary-treeview.component';
-import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
-import { SearchService } from '../../../../../core/shared/search/search.service';
-import {
-  FILTER_CONFIG,
-  IN_PLACE_SEARCH,
-  SearchFilterService
-} from '../../../../../core/shared/search/search-filter.service';
-import { Router } from '@angular/router';
-import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
-import { SearchFilterConfig } from '../../../models/search-filter-config.model';
-import { FacetValue } from '../../../models/facet-value.model';
-import { getFacetValueForType } from '../../../search.utils';
-import { filter, map, take } from 'rxjs/operators';
-import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
-import { Observable } from 'rxjs';
-import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { environment } from '../../../../../../environments/environment';
-
-/**
- * Component that represents a hierarchy facet for a specific filter configuration.
- * Worldbank customization which features a link at the bottom to open a vocabulary popup,
- */
-@Component({
-  selector: 'ds-okr-search-hierarchy-filter',
-  styleUrls: ['./okr-search-hierarchy-filter.component.scss'],
-  templateUrl: './okr-search-hierarchy-filter.component.html',
-  animations: [facetLoad]
-})
-@renderFacetFor(FilterType.hierarchy)
-export class OkrSearchHierarchyFilterComponent extends SearchHierarchyFilterComponent {
-
-  constructor(protected searchService: SearchService,
-              protected filterService: SearchFilterService,
-              protected rdbs: RemoteDataBuildService,
-              protected router: Router,
-              protected modalService: NgbModal,
-              protected vocabularyService: VocabularyService,
-              @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
-              @Inject(IN_PLACE_SEARCH) public inPlaceSearch: boolean,
-              @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig,
-  ) {
-    super(
-      searchService,
-      filterService,
-      rdbs,
-      router,
-      searchConfigService,
-      inPlaceSearch,
-      filterConfig,
-    );
-  }
-
-  vocabularyExists$: Observable<boolean>;
-
-  ngOnInit() {
-    super.ngOnInit();
-    this.vocabularyExists$ = this.vocabularyService.searchTopEntries(
-      this.getVocabularyEntry(), new PageInfo(), true, false,
-    ).pipe(
-      filter(rd => rd.hasCompleted),
-      take(1),
-      map(rd => {
-        return rd.hasSucceeded;
-      }),
-    );
-  }
-
-  /**
-   * Open the vocabulary tree modal popup.
-   * When an entry is selected, add the filter query to the search options.
-   */
-  showVocabularyTree() {
-    const modalRef: NgbModalRef = this.modalService.open(OkrVocabularyTreeviewComponent, {
-      size: 'lg',
-      windowClass: 'treeview'
-    });
-    modalRef.componentInstance.vocabularyOptions = {
-      name: this.getVocabularyEntry(),
-      closed: true
-    };
-    modalRef.componentInstance.select.subscribe((detail: VocabularyEntryDetail) => {
-      this.selectedValues$
-        .pipe(take(1))
-        .subscribe((selectedValues) => {
-          this.router.navigate(
-            [this.searchService.getSearchLink()],
-            {
-              queryParams: {
-                [this.filterConfig.paramName]: [...selectedValues, {value: detail.value}]
-                  .map((facetValue: FacetValue) => getFacetValueForType(facetValue, this.filterConfig)),
-              },
-              queryParamsHandling: 'merge',
-            },
-          );
-        });
-    });
-  }
-
-  /**
-   * Returns the matching vocabulary entry for the given search filter.
-   * These are configurable in the config file.
-   */
-  getVocabularyEntry() {
-    const foundVocabularyConfig = environment.vocabularies.filter((v) => v.filter === this.filterConfig.name);
-    if (foundVocabularyConfig.length > 0 && foundVocabularyConfig[0].enabled === true) {
-      return foundVocabularyConfig[0].vocabulary;
-    }
-  }
-}
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
index 49ca6fe3fd..eb49235641 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
@@ -29,3 +29,10 @@
                           ngDefaultControl
     ></ds-filter-input-suggestions>
 </div>
+
+<a *ngIf="vocabularyExists$ | async"
+     href="javascript:void(0);"
+     id="show-{{filterConfig.name}}-tree"
+     (click)="showVocabularyTree()">
+  {{'search.filters.filter.show-tree' | translate: {name: ('search.filters.filter.' + filterConfig.name + '.head' | translate | lowercase )} }}
+</a>
diff --git a/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
similarity index 92%
rename from src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts
rename to src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
index fe0866468a..41ab296c18 100644
--- a/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -1,4 +1,4 @@
-import { OkrSearchHierarchyFilterComponent } from './okr-search-hierarchy-filter.component';
+import { SearchHierarchyFilterComponent } from './search-hierarchy-filter.component';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { DebugElement, EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
@@ -23,12 +23,12 @@ import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
 import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
-import { FacetValue } from '../../../../../../../../app/shared/search/facet-value.model';
-import { SearchFilterConfig } from '../../../../../../../../app/shared/search/search-filter-config.model';
+import { FacetValue} from '../../../models/facet-value.model';
+import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 
 describe('OkrSearchHierarchyFilterComponent', () => {
 
-  let fixture: ComponentFixture<OkrSearchHierarchyFilterComponent>;
+  let fixture: ComponentFixture<SearchHierarchyFilterComponent>;
   let showVocabularyTreeLink: DebugElement;
 
   const testSearchLink = 'test-search';
@@ -62,7 +62,7 @@ describe('OkrSearchHierarchyFilterComponent', () => {
         TranslateModule.forRoot(),
       ],
       declarations: [
-        OkrSearchHierarchyFilterComponent,
+        SearchHierarchyFilterComponent,
       ],
       providers: [
         { provide: SearchService, useValue: searchService },
@@ -80,7 +80,7 @@ describe('OkrSearchHierarchyFilterComponent', () => {
   });
 
   function init() {
-    fixture = TestBed.createComponent(OkrSearchHierarchyFilterComponent);
+    fixture = TestBed.createComponent(SearchHierarchyFilterComponent);
     fixture.detectChanges();
     showVocabularyTreeLink = fixture.debugElement.query(By.css('a#show-test-search-filter-tree'));
   }
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
index 7aa81116de..e24e6c6d02 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
@@ -1,18 +1,110 @@
-import { Component, OnInit } from '@angular/core';
-import { FilterType } from '../../../models/filter-type.model';
+import { Component, Inject, OnInit } from '@angular/core';
 import { renderFacetFor } from '../search-filter-type-decorator';
+import { FilterType } from '../../../models/filter-type.model';
 import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
+import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import { VocabularyTreeviewComponent } from '../../../../vocabulary-treeview/vocabulary-treeview.component';
+import {
+  VocabularyEntryDetail
+} from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { SearchService } from '../../../../../core/shared/search/search.service';
+import {
+  FILTER_CONFIG,
+  IN_PLACE_SEARCH,
+  SearchFilterService
+} from '../../../../../core/shared/search/search-filter.service';
+import { Router } from '@angular/router';
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
+import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
+import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import { FacetValue } from '../../../models/facet-value.model';
+import { getFacetValueForType } from '../../../search.utils';
+import { filter, map, take } from 'rxjs/operators';
+import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
+import { Observable } from 'rxjs';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
+import { environment } from '../../../../../../environments/environment';
 
+/**
+ * Component that represents a hierarchy facet for a specific filter configuration.
+ */
 @Component({
   selector: 'ds-search-hierarchy-filter',
   styleUrls: ['./search-hierarchy-filter.component.scss'],
   templateUrl: './search-hierarchy-filter.component.html',
   animations: [facetLoad]
 })
-
-/**
- * Component that represents a hierarchy facet for a specific filter configuration
- */
-// @renderFacetFor(FilterType.hierarchy)
+@renderFacetFor(FilterType.hierarchy)
 export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent implements OnInit {
+
+  constructor(protected searchService: SearchService,
+              protected filterService: SearchFilterService,
+              protected rdbs: RemoteDataBuildService,
+              protected router: Router,
+              protected modalService: NgbModal,
+              protected vocabularyService: VocabularyService,
+              @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
+              @Inject(IN_PLACE_SEARCH) public inPlaceSearch: boolean,
+              @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig,
+  ) {
+    super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig);
+  }
+
+  vocabularyExists$: Observable<boolean>;
+
+  ngOnInit() {
+    super.ngOnInit();
+    this.vocabularyExists$ = this.vocabularyService.searchTopEntries(
+      this.getVocabularyEntry(), new PageInfo(), true, false,
+    ).pipe(
+      filter(rd => rd.hasCompleted),
+      take(1),
+      map(rd => {
+        return rd.hasSucceeded;
+      }),
+    );
+  }
+
+  /**
+   * Open the vocabulary tree modal popup.
+   * When an entry is selected, add the filter query to the search options.
+   */
+  showVocabularyTree() {
+    const modalRef: NgbModalRef = this.modalService.open(VocabularyTreeviewComponent, {
+      size: 'lg',
+      windowClass: 'treeview'
+    });
+    modalRef.componentInstance.vocabularyOptions = {
+      name: this.getVocabularyEntry(),
+      closed: true
+    };
+    modalRef.componentInstance.select.subscribe((detail: VocabularyEntryDetail) => {
+      this.selectedValues$
+        .pipe(take(1))
+        .subscribe((selectedValues) => {
+          this.router.navigate(
+            [this.searchService.getSearchLink()],
+            {
+              queryParams: {
+                [this.filterConfig.paramName]: [...selectedValues, {value: detail.value}]
+                  .map((facetValue: FacetValue) => getFacetValueForType(facetValue, this.filterConfig)),
+              },
+              queryParamsHandling: 'merge',
+            },
+          );
+        });
+    });
+  }
+
+  /**
+   * Returns the matching vocabulary entry for the given search filter.
+   * These are configurable in the config file.
+   */
+  getVocabularyEntry() {
+    const foundVocabularyConfig = environment.vocabularies.filter((v) => v.filter === this.filterConfig.name);
+    if (foundVocabularyConfig.length > 0 && foundVocabularyConfig[0].enabled === true) {
+      return foundVocabularyConfig[0].vocabulary;
+    }
+  }
 }
diff --git a/src/app/shared/search/search.module.ts b/src/app/shared/search/search.module.ts
index e9c0b3e121..668d260c23 100644
--- a/src/app/shared/search/search.module.ts
+++ b/src/app/shared/search/search.module.ts
@@ -28,9 +28,6 @@ import { MissingTranslationHelper } from '../translate/missing-translation.helpe
 import { SharedModule } from '../shared.module';
 import { SearchResultsComponent } from './search-results/search-results.component';
 import { SearchComponent } from './search.component';
-import {
-  OkrSearchHierarchyFilterComponent
-} from './search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component';
 
 const COMPONENTS = [
   SearchComponent,
@@ -53,8 +50,7 @@ const COMPONENTS = [
   SearchAuthorityFilterComponent,
   SearchSwitchConfigurationComponent,
   ConfigurationSearchPageComponent,
-  ThemedConfigurationSearchPageComponent,
-  OkrSearchHierarchyFilterComponent
+  ThemedConfigurationSearchPageComponent
 ];
 
 const ENTRY_COMPONENTS = [
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 6f4091f465..715ee66a99 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -177,10 +177,6 @@ import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/
 import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-page/bitstream-request-a-copy-page.component';
 import { DsSelectComponent } from './ds-select/ds-select.component';
 import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component';
-import { OkrVocabularyTreeviewComponent } from './okr-vocabulary-treeview/okr-vocabulary-treeview.component';
-import {
-  OkrSearchHierarchyFilterComponent
-} from './search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -350,7 +346,6 @@ const COMPONENTS = [
   CommunitySidebarSearchListElementComponent,
   SearchNavbarComponent,
   ScopeSelectorModalComponent,
-  OkrVocabularyTreeviewComponent
 ];
 
 const ENTRY_COMPONENTS = [
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts
index f9e4d04f3b..b62c4a2274 100644
--- a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -2,7 +2,7 @@ import { FlatTreeControl } from '@angular/cdk/tree';
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { filter, find, startWith } from 'rxjs/operators';
+import { filter, find, startWith, map } from 'rxjs/operators';
 import { Observable, Subscription } from 'rxjs';
 import { select, Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
@@ -18,6 +18,7 @@ import { PageInfo } from '../../core/shared/page-info.model';
 import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyTreeFlattener } from './vocabulary-tree-flattener';
 import { VocabularyTreeFlatDataSource } from './vocabulary-tree-flat-data-source';
+import { lowerCase } from 'lodash';
 
 /**
  * Component that show a hierarchical vocabulary in a tree view
@@ -98,7 +99,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
   /**
    * Array to track all subscriptions and unsubscribe them onDestroy
    */
-  protected subs: Subscription[] = [];
+  private subs: Subscription[] = [];
 
   /**
    * Initialize instance variables
@@ -110,9 +111,9 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
    */
   constructor(
     public activeModal: NgbActiveModal,
-    protected vocabularyTreeviewService: VocabularyTreeviewService,
-    protected store: Store<CoreState>,
-    protected translate: TranslateService
+    private vocabularyTreeviewService: VocabularyTreeviewService,
+    private store: Store<CoreState>,
+    private translate: TranslateService
   ) {
     this.treeFlattener = new VocabularyTreeFlattener(this.transformer, this.getLevel,
       this.isExpandable, this.getChildren);
@@ -203,23 +204,15 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
       })
     );
 
-    const descriptionLabel = 'vocabulary-treeview.tree.description.' + this.vocabularyOptions.name;
-    this.description = this.translate.get(descriptionLabel).pipe(
-      filter((msg) => msg !== descriptionLabel),
-      startWith('')
+    this.translate.get(`search.filters.filter.${this.vocabularyOptions.name}.head`).pipe(
+      map((type) => lowerCase(type)),
+    ).subscribe(
+      (type) => this.description = this.translate.get('okr-vocabulary-treeview.info', { type })
     );
 
-    // set isAuthenticated
-    this.isAuthenticated = this.store.pipe(select(isAuthenticated));
-
     this.loading = this.vocabularyTreeviewService.isLoading();
 
-    this.isAuthenticated.pipe(
-      find((isAuth) => isAuth)
-    ).subscribe(() => {
-      const entryId: string = (this.selectedItem) ? this.getEntryId(this.selectedItem) : null;
-      this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), entryId);
-    });
+    this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), null);
   }
 
   /**
@@ -301,7 +294,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
   /**
    * Return an id for a given {@link VocabularyEntry}
    */
-  protected getEntryId(entry: VocabularyEntry): string {
+  private getEntryId(entry: VocabularyEntry): string {
     return entry.authority || entry.otherInformation.id || undefined;
   }
 }

From 472c2a1dd1da96b509bd75688914caea786156f1 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Thu, 1 Dec 2022 15:34:41 +0100
Subject: [PATCH 022/160] 97049: Remove client structure

---
 .../search-hierarchy-filter.component.spec.ts             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
index 41ab296c18..88cb0400e2 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -26,14 +26,14 @@ import { VocabularyEntryDetail } from '../../../../../core/submission/vocabulari
 import { FacetValue} from '../../../models/facet-value.model';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 
-describe('OkrSearchHierarchyFilterComponent', () => {
+fdescribe('SearchHierarchyFilterComponent', () => {
 
   let fixture: ComponentFixture<SearchHierarchyFilterComponent>;
   let showVocabularyTreeLink: DebugElement;
 
   const testSearchLink = 'test-search';
   const testSearchFilter = 'test-search-filter';
-  const okrVocabularyTreeViewComponent = {
+  const VocabularyTreeViewComponent = {
     select: new EventEmitter<VocabularyEntryDetail>(),
   };
 
@@ -47,7 +47,7 @@ describe('OkrSearchHierarchyFilterComponent', () => {
   const router = new RouterStub();
   const ngbModal = jasmine.createSpyObj('modal', {
     open: {
-      componentInstance: okrVocabularyTreeViewComponent,
+      componentInstance: VocabularyTreeViewComponent,
     }
   });
   const vocabularyService = {
@@ -134,7 +134,7 @@ describe('OkrSearchHierarchyFilterComponent', () => {
           fixture.componentInstance.selectedValues$ = observableOf(
             alreadySelectedValues.map(value => Object.assign(new FacetValue(), { value }))
           );
-          okrVocabularyTreeViewComponent.select.emit(Object.assign(new VocabularyEntryDetail(), {
+          VocabularyTreeViewComponent.select.emit(Object.assign(new VocabularyEntryDetail(), {
             value: newSelectedValue,
           }));
         });

From dd3a528c485a9f1644fe61525cea0dc81c4367f7 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Thu, 1 Dec 2022 16:52:50 +0100
Subject: [PATCH 023/160] 97049: Remove accidental focused describe

---
 .../search-hierarchy-filter.component.spec.ts                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
index 88cb0400e2..306d252395 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -26,7 +26,7 @@ import { VocabularyEntryDetail } from '../../../../../core/submission/vocabulari
 import { FacetValue} from '../../../models/facet-value.model';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 
-fdescribe('SearchHierarchyFilterComponent', () => {
+describe('SearchHierarchyFilterComponent', () => {
 
   let fixture: ComponentFixture<SearchHierarchyFilterComponent>;
   let showVocabularyTreeLink: DebugElement;

From 6ed762a8ac1fcbe206b0f656b18457577cce49d8 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Thu, 1 Dec 2022 17:12:14 +0100
Subject: [PATCH 024/160] 97049: alter tests

---
 .../vocabulary-treeview/vocabulary-treeview.component.spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.spec.ts b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.spec.ts
index 1bdf4b9df7..d965bc7f4b 100644
--- a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.spec.ts
+++ b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.spec.ts
@@ -141,7 +141,7 @@ describe('VocabularyTreeviewComponent test suite', () => {
       comp.selectedItem = currentValue;
       fixture.detectChanges();
       expect(comp.dataSource.data).toEqual([]);
-      expect(vocabularyTreeviewServiceStub.initialize).toHaveBeenCalledWith(comp.vocabularyOptions, new PageInfo(), 'entryID');
+      expect(vocabularyTreeviewServiceStub.initialize).toHaveBeenCalledWith(comp.vocabularyOptions, new PageInfo(), null);
     });
 
     it('should should init component properly with init value as VocabularyEntry', () => {
@@ -153,7 +153,7 @@ describe('VocabularyTreeviewComponent test suite', () => {
       comp.selectedItem = currentValue;
       fixture.detectChanges();
       expect(comp.dataSource.data).toEqual([]);
-      expect(vocabularyTreeviewServiceStub.initialize).toHaveBeenCalledWith(comp.vocabularyOptions, new PageInfo(), 'entryID');
+      expect(vocabularyTreeviewServiceStub.initialize).toHaveBeenCalledWith(comp.vocabularyOptions, new PageInfo(), null);
     });
 
     it('should call loadMore function', () => {

From aac8fea225949e199271efb9fc9c28bb7aa47716 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Fri, 2 Dec 2022 13:43:22 +0100
Subject: [PATCH 025/160] 97049: Fix constructor issue + rework test for new
 functionality

---
 .../search-hierarchy-filter.component.spec.ts | 237 +++++++++---------
 .../search-hierarchy-filter.component.ts      |   7 +-
 2 files changed, 124 insertions(+), 120 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
index 9302e66d98..872d0772bd 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -1,155 +1,158 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { SearchHierarchyFilterComponent } from './search-hierarchy-filter.component';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { DebugElement, EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
+import { of as observableOf, BehaviorSubject } from 'rxjs';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { RequestEntryState } from '../../../../../core/data/request-entry-state.model';
+import { TranslateModule } from '@ngx-translate/core';
+import { RouterStub } from '../../../../testing/router.stub';
+import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
+import { CommonModule } from '@angular/common';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
-  REFRESH_FILTER,
-  SearchFilterService
+  SearchFilterService,
+  REFRESH_FILTER
 } from '../../../../../core/shared/search/search-filter.service';
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import { SearchFiltersComponent } from '../../search-filters.component';
 import { Router } from '@angular/router';
-import { RouterStub } from '../../../../testing/router.stub';
-import { SearchServiceStub } from '../../../../testing/search-service.stub';
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
+import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
+import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { FacetValue} from '../../../models/facet-value.model';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
-import { TranslateModule } from '@ngx-translate/core';
-import {
-  FilterInputSuggestionsComponent
-} from '../../../../input-suggestions/filter-suggestions/filter-input-suggestions.component';
-import { FormsModule } from '@angular/forms';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
-import { FacetValue } from '../../../models/facet-value.model';
-import { FilterType } from '../../../models/filter-type.model';
-import { createPaginatedList } from '../../../../testing/utils.test';
-import { RemoteData } from '../../../../../core/data/remote-data';
-import { PaginatedList } from '../../../../../core/data/paginated-list.model';
 
 describe('SearchHierarchyFilterComponent', () => {
-  let comp: SearchHierarchyFilterComponent;
+
   let fixture: ComponentFixture<SearchHierarchyFilterComponent>;
-  let searchService: SearchService;
-  let router;
+  let showVocabularyTreeLink: DebugElement;
 
-  const value1 = 'testvalue1';
-  const value2 = 'test2';
-  const value3 = 'another value3';
-  const values: FacetValue[] = [
-    {
-      label: value1,
-      value: value1,
-      count: 52,
-      _links: {
-        self: {
-          href: ''
-        },
-        search: {
-          href: ''
-        }
-      }
-    }, {
-      label: value2,
-      value: value2,
-      count: 20,
-      _links: {
-        self: {
-          href: ''
-        },
-        search: {
-          href: ''
-        }
-      }
-    }, {
-      label: value3,
-      value: value3,
-      count: 5,
-      _links: {
-        self: {
-          href: ''
-        },
-        search: {
-          href: ''
-        }
-      }
-    }
-  ];
-  const mockValues = createSuccessfulRemoteDataObject$(createPaginatedList(values));
-
-  const searchFilterServiceStub = {
-    getSelectedValuesForFilter(_filterConfig: SearchFilterConfig): Observable<string[]> {
-      return observableOf(values.map((value: FacetValue) => value.value));
-    },
-    getPage(_paramName: string): Observable<number> {
-      return observableOf(0);
-    },
-    resetPage(_filterName: string): void {
-      // empty
-    }
+  const testSearchLink = 'test-search';
+  const testSearchFilter = 'test-search-filter';
+  const VocabularyTreeViewComponent = {
+    select: new EventEmitter<VocabularyEntryDetail>(),
   };
 
-  const remoteDataBuildServiceStub = {
-    aggregate(_input: Observable<RemoteData<FacetValue>>[]): Observable<RemoteData<PaginatedList<FacetValue>[]>> {
-      return createSuccessfulRemoteDataObject$([createPaginatedList(values)]);
+  const searchService = {
+    getSearchLink: () => testSearchLink,
+    getFacetValuesFor: () => observableOf([]),
+  };
+  const searchFilterService = {
+    getPage: () => observableOf(0),
+  };
+  const router = new RouterStub();
+  const ngbModal = jasmine.createSpyObj('modal', {
+    open: {
+      componentInstance: VocabularyTreeViewComponent,
     }
+  });
+  const vocabularyService = {
+    searchTopEntries: () => undefined,
   };
 
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        NgbModule,
+        TranslateModule.forRoot(),
+      ],
       declarations: [
         SearchHierarchyFilterComponent,
-        SearchFiltersComponent,
-        FilterInputSuggestionsComponent
       ],
       providers: [
-        { provide: SearchService, useValue: new SearchServiceStub() },
-        { provide: SearchFilterService, useValue: searchFilterServiceStub },
-        { provide: RemoteDataBuildService, useValue: remoteDataBuildServiceStub },
-        { provide: Router, useValue: new RouterStub() },
+        { provide: SearchService, useValue: searchService },
+        { provide: SearchFilterService, useValue: searchFilterService },
+        { provide: RemoteDataBuildService, useValue: {} },
+        { provide: Router, useValue: router },
+        { provide: NgbModal, useValue: ngbModal },
+        { provide: VocabularyService, useValue: vocabularyService },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: IN_PLACE_SEARCH, useValue: false },
-        { provide: FILTER_CONFIG, useValue: new SearchFilterConfig() },
-        { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false) }
+        { provide: FILTER_CONFIG, useValue: Object.assign(new SearchFilterConfig(), { name: testSearchFilter }) },
+        { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false)}
       ],
-      schemas: [NO_ERRORS_SCHEMA]
-    }).overrideComponent(SearchHierarchyFilterComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  })
-  ;
-  const mockFilterConfig: SearchFilterConfig = Object.assign(new SearchFilterConfig(), {
-    name: 'filterName1',
-    filterType: FilterType.text,
-    hasFacets: false,
-    isOpenByDefault: false,
-    pageSize: 2
   });
 
-  beforeEach(async () => {
+  function init() {
     fixture = TestBed.createComponent(SearchHierarchyFilterComponent);
-    comp = fixture.componentInstance; // SearchHierarchyFilterComponent test instance
-    comp.filterConfig = mockFilterConfig;
-    searchService = (comp as any).searchService;
-    // @ts-ignore
-    spyOn(searchService, 'getFacetValuesFor').and.returnValue(mockValues);
-    router = (comp as any).router;
     fixture.detectChanges();
+    showVocabularyTreeLink = fixture.debugElement.query(By.css('a#show-test-search-filter-tree'));
+  }
+
+  describe('if the vocabulary doesn\'t exist', () => {
+
+    beforeEach(() => {
+      spyOn(vocabularyService, 'searchTopEntries').and.returnValue(observableOf(new RemoteData(
+        undefined, 0, 0, RequestEntryState.Error, undefined, undefined, 404
+      )));
+      init();
+    });
+
+    it('should not show the vocabulary tree link', () => {
+      expect(showVocabularyTreeLink).toBeNull();
+    });
   });
 
-  it('should navigate to the correct filter with the query operator', () => {
-    expect((comp as any).searchService.getFacetValuesFor).toHaveBeenCalledWith(comp.filterConfig, 0, {}, null, true);
+  describe('if the vocabulary exists', () => {
 
-    const searchQuery = 'MARVEL';
-    comp.onSubmit(searchQuery);
+    beforeEach(() => {
+      spyOn(vocabularyService, 'searchTopEntries').and.returnValue(observableOf(new RemoteData(
+        undefined, 0, 0, RequestEntryState.Success, undefined, buildPaginatedList(new PageInfo(), []), 200
+      )));
+      init();
+    });
 
-    expect(router.navigate).toHaveBeenCalledWith(['', 'search'], Object({
-      queryParams: Object({ [mockFilterConfig.paramName]: [...values.map((value: FacetValue) => `${value.value},equals`), `${searchQuery},query`] }),
-      queryParamsHandling: 'merge'
-    }));
+    it('should show the vocabulary tree link', () => {
+      expect(showVocabularyTreeLink).toBeTruthy();
+    });
+
+    describe('when clicking the vocabulary tree link', () => {
+
+      beforeEach(async () => {
+        showVocabularyTreeLink.nativeElement.click();
+      });
+
+      it('should open the vocabulary tree modal', () => {
+        expect(ngbModal.open).toHaveBeenCalled();
+      });
+
+      describe('when selecting a value from the vocabulary tree', () => {
+
+        const alreadySelectedValues = [
+          'already-selected-value-1',
+          'already-selected-value-2',
+        ];
+        const newSelectedValue = 'new-selected-value';
+
+        beforeEach(() => {
+          fixture.componentInstance.selectedValues$ = observableOf(
+            alreadySelectedValues.map(value => Object.assign(new FacetValue(), { value }))
+          );
+          VocabularyTreeViewComponent.select.emit(Object.assign(new VocabularyEntryDetail(), {
+            value: newSelectedValue,
+          }));
+        });
+
+        it('should add a new search filter to the existing search filters', () => {
+          expect(router.navigate).toHaveBeenCalledWith([testSearchLink], {
+            queryParams: {
+              [`f.${testSearchFilter}`]: [
+                ...alreadySelectedValues,
+                newSelectedValue,
+              ].map((value => `${value},equals`)),
+            },
+            queryParamsHandling: 'merge',
+          });
+        });
+      });
+    });
   });
 });
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
index f47e652f3a..3dd866c5b1 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
@@ -11,7 +11,7 @@ import { SearchService } from '../../../../../core/shared/search/search.service'
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
-  SearchFilterService
+  SearchFilterService, REFRESH_FILTER
 } from '../../../../../core/shared/search/search-filter.service';
 import { Router } from '@angular/router';
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
@@ -22,7 +22,7 @@ import { FacetValue } from '../../../models/facet-value.model';
 import { getFacetValueForType } from '../../../search.utils';
 import { filter, map, take } from 'rxjs/operators';
 import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
-import { Observable } from 'rxjs';
+import { Observable, BehaviorSubject } from 'rxjs';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { environment } from '../../../../../../environments/environment';
 import { addOperatorToFilterValue } from '../../../search.utils';
@@ -49,8 +49,9 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               @Inject(IN_PLACE_SEARCH) public inPlaceSearch: boolean,
               @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig,
+              @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>
   ) {
-    super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig);
+    super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig, refreshFilters);
   }
 
   vocabularyExists$: Observable<boolean>;

From 099debf6663ab4e45f939bdaddf71121999f8259 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Fri, 2 Dec 2022 14:11:41 +0100
Subject: [PATCH 026/160] 97049: Resolve lint issues

---
 .../vocabulary-treeview/vocabulary-treeview.component.ts   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts
index 369c4ac817..548c3d89be 100644
--- a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -2,14 +2,13 @@ import { FlatTreeControl } from '@angular/cdk/tree';
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { filter, find, startWith, map } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 import { Observable, Subscription } from 'rxjs';
-import { select, Store } from '@ngrx/store';
+import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
 
 import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { hasValue, isEmpty, isNotEmpty } from '../empty.util';
-import { isAuthenticated } from '../../core/auth/selectors';
 import { VocabularyTreeviewService } from './vocabulary-treeview.service';
 import { LOAD_MORE, LOAD_MORE_ROOT, TreeviewFlatNode, TreeviewNode } from './vocabulary-treeview-node.model';
 import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
@@ -18,7 +17,7 @@ import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocab
 import { VocabularyTreeFlattener } from './vocabulary-tree-flattener';
 import { VocabularyTreeFlatDataSource } from './vocabulary-tree-flat-data-source';
 import { CoreState } from '../../core/core-state.model';
-import { lowerCase } from 'lodash';
+import { lowerCase } from 'lodash/string';
 
 /**
  * Component that show a hierarchical vocabulary in a tree view

From eb1536819733e6e770dfa8fb58c4c5f1e7245d9e Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 5 Dec 2022 09:58:38 +0100
Subject: [PATCH 027/160] 97049: Clean up strings

---
 .../vocabulary-treeview.component.ts          |  2 +-
 src/assets/i18n/en.json5                      | 22 +------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts
index 548c3d89be..deffc11e88 100644
--- a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -206,7 +206,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
     this.translate.get(`search.filters.filter.${this.vocabularyOptions.name}.head`).pipe(
       map((type) => lowerCase(type)),
     ).subscribe(
-      (type) => this.description = this.translate.get('okr-vocabulary-treeview.info', { type })
+      (type) => this.description = this.translate.get('vocabulary-treeview.info', { type })
     );
 
     this.loading = this.vocabularyTreeviewService.isLoading();
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 32b8c4c265..84bbc04af3 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4828,25 +4828,5 @@
 
   "search.filters.filter.show-tree": "Browse {{ name }} tree",
 
-  "search.filters.filter.supportedlanguage.placeholder": "Supported Language",
-
-  "search.filters.filter.supportedlanguage.label": "Search supported Language",
-
-  "search.filters.filter.topic.placeholder": "Topic",
-
-  "search.filters.filter.topic.label": "Search topic",
-
-  "search.filters.filter.doctype.placeholder": "Document type",
-
-  "search.filters.filter.doctype.label": "Search document type",
-
-  "search.filters.filter.region.placeholder": "Region",
-
-  "search.filters.filter.region.label": "Search region",
-
-  "search.filters.filter.country.placeholder": "Country",
-
-  "search.filters.filter.country.label": "Search country",
-
-  "okr-vocabulary-treeview.info": "Click a {{ type }} to add a search filter"
+  "vocabulary-treeview.info": "Select a subject to add as search filter"
 }

From acbff2e6b42e15284e53ee522f6cc1ed807424ca Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 5 Dec 2022 15:13:13 +0100
Subject: [PATCH 028/160] 97049: Minor refactor // adding docs

---
 config/config.example.yml              | 10 +++++++++-
 config/config.yml                      |  5 -----
 src/config/FilterVocabularyConfig.ts   |  7 -------
 src/config/app-config.interface.ts     |  2 +-
 src/config/default-app-config.ts       |  5 ++++-
 src/config/filter-vocabulary-config.ts | 22 ++++++++++++++++++++++
 6 files changed, 36 insertions(+), 15 deletions(-)
 delete mode 100644 src/config/FilterVocabularyConfig.ts
 create mode 100644 src/config/filter-vocabulary-config.ts

diff --git a/config/config.example.yml b/config/config.example.yml
index 27400f0041..7bc96b8e4a 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -295,4 +295,12 @@ info:
 # display in supported metadata fields. By default, only dc.description.abstract is supported.
 markdown:
   enabled: false
-  mathjax: false
\ No newline at end of file
+  mathjax: false
+
+# Which vocabularies should be used for which search filters
+# and whether to show the filter in the search sidebar
+# Take a look at the filter-vocabulary-config.ts file for documentation on how the options are obtained
+vocabularies:
+  - filter: 'subject'
+    vocabulary: 'srsc'
+    enabled: true
diff --git a/config/config.yml b/config/config.yml
index 5b171d9cc4..b5eecd112f 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -3,8 +3,3 @@ rest:
   host: api7.dspace.org
   port: 443
   nameSpace: /server
-
-vocabularies:
-  - filter: 'subject'
-    vocabulary: 'srsc'
-    enabled: true
diff --git a/src/config/FilterVocabularyConfig.ts b/src/config/FilterVocabularyConfig.ts
deleted file mode 100644
index a9b37af2d8..0000000000
--- a/src/config/FilterVocabularyConfig.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Config } from './config.interface';
-
-export interface FilterVocabularyConfig extends Config {
-  filter: string;
-  vocabulary: string;
-  enabled: boolean;
-}
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index bba7c66168..d62b9e5bcb 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -20,7 +20,7 @@ import { InfoConfig } from './info-config.interface';
 import { CommunityListConfig } from './community-list-config.interface';
 import { HomeConfig } from './homepage-config.interface';
 import { MarkdownConfig } from './markdown-config.interface';
-import { FilterVocabularyConfig } from './FilterVocabularyConfig';
+import { FilterVocabularyConfig } from './filter-vocabulary-config';
 
 interface AppConfig extends Config {
   ui: UIServerConfig;
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index e78ef0a221..c4ab741103 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -20,7 +20,7 @@ import { InfoConfig } from './info-config.interface';
 import { CommunityListConfig } from './community-list-config.interface';
 import { HomeConfig } from './homepage-config.interface';
 import { MarkdownConfig } from './markdown-config.interface';
-import { FilterVocabularyConfig } from './FilterVocabularyConfig';
+import { FilterVocabularyConfig } from './filter-vocabulary-config';
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -378,6 +378,9 @@ export class DefaultAppConfig implements AppConfig {
     mathjax: false,
   };
 
+  // Which vocabularies should be used for which search filters
+  // and whether to show the filter in the search sidebar
+  // Take a look at the filter-vocabulary-config.ts file for documentation on how the options are obtained
   vocabularies: FilterVocabularyConfig[] = [
     {
       filter: 'subject',
diff --git a/src/config/filter-vocabulary-config.ts b/src/config/filter-vocabulary-config.ts
new file mode 100644
index 0000000000..54e57090c8
--- /dev/null
+++ b/src/config/filter-vocabulary-config.ts
@@ -0,0 +1,22 @@
+import { Config } from './config.interface';
+
+/**
+ * Configuration that can be used to enable a vocabulary tree to be used as search filter
+ */
+export interface FilterVocabularyConfig extends Config {
+  /**
+   * The name of the filter where the vocabulary tree should be used
+   * This is the name of the filter as it's configured in the facet in discovery.xml
+   * (can also be seen on the /server/api/discover/facets endpoint)
+   */
+  filter: string;
+  /**
+   * name of the vocabulary tree to use
+   * ( name of the file as stored in the dspace/config/controlled-vocabularies folder without file extension )
+   */
+  vocabulary: string;
+  /**
+   * Whether to show the vocabulary tree in the sidebar
+   */
+  enabled: boolean;
+}

From 68bac1f400154b4909486eacb77fa3aa181f4371 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Tue, 6 Dec 2022 11:30:46 +0100
Subject: [PATCH 029/160] 97183 Hide sidebar items w/o appropriate permissions.

See https://github.com/DSpace/dspace-angular/issues/1643

Sidebar now omits "New" and/or "Edit" options in the sidebar if the user does
not have permissions to respectively create new Items or edit Items.

If this results in an empty sidebar, the sidebar is hidden in its entirety.
---
 .../admin-sidebar/admin-sidebar.component.ts  |  1 +
 .../data/feature-authorization/feature-id.ts  |  4 +-
 src/app/menu.resolver.ts                      | 91 ++++++++++---------
 src/app/root/root.component.ts                |  2 +-
 src/app/shared/menu/menu.service.ts           | 25 +++++
 5 files changed, 80 insertions(+), 43 deletions(-)

diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
index 8eb288daa2..36f9250504 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -100,6 +100,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
         }
       }
     });
+    this.menuVisible = this.menuService.isMenuVisibleWithVisibleSections(this.menuID);
   }
 
   @HostListener('focusin')
diff --git a/src/app/core/data/feature-authorization/feature-id.ts b/src/app/core/data/feature-authorization/feature-id.ts
index 3cb18bf515..9e73ca9a2b 100644
--- a/src/app/core/data/feature-authorization/feature-id.ts
+++ b/src/app/core/data/feature-authorization/feature-id.ts
@@ -29,5 +29,7 @@ export enum FeatureID {
   CanViewUsageStatistics = 'canViewUsageStatistics',
   CanSendFeedback = 'canSendFeedback',
   CanClaimItem = 'canClaimItem',
-  CanSynchronizeWithORCID = 'canSynchronizeWithORCID'
+  CanSynchronizeWithORCID = 'canSynchronizeWithORCID',
+  CanSubmit = 'canSubmit',
+  CanEditItem = 'canEditItem',
 }
diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts
index 60f2d1cca2..19413ab4be 100644
--- a/src/app/menu.resolver.ts
+++ b/src/app/menu.resolver.ts
@@ -167,10 +167,11 @@ export class MenuResolver implements Resolve<boolean> {
     combineLatest([
       this.authorizationService.isAuthorized(FeatureID.IsCollectionAdmin),
       this.authorizationService.isAuthorized(FeatureID.IsCommunityAdmin),
-      this.authorizationService.isAuthorized(FeatureID.AdministratorOf)
-    ]).subscribe(([isCollectionAdmin, isCommunityAdmin, isSiteAdmin]) => {
-      const menuList = [
-        /* News */
+      this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
+      this.authorizationService.isAuthorized(FeatureID.CanSubmit),
+      this.authorizationService.isAuthorized(FeatureID.CanEditItem),
+    ]).subscribe(([isCollectionAdmin, isCommunityAdmin, isSiteAdmin, canSubmit, canEditItem]) => {
+      const newSubMenuList = [
         {
           id: 'new_community',
           parentID: 'new',
@@ -201,7 +202,7 @@ export class MenuResolver implements Resolve<boolean> {
           id: 'new_item',
           parentID: 'new',
           active: false,
-          visible: true,
+          visible: canSubmit,
           model: {
             type: MenuItemType.ONCLICK,
             text: 'menu.section.new_item',
@@ -221,30 +222,8 @@ export class MenuResolver implements Resolve<boolean> {
             link: '/processes/new'
           } as LinkMenuItemModel,
         },
-        {
-          id: 'new',
-          active: false,
-          visible: true,
-          model: {
-            type: MenuItemType.TEXT,
-            text: 'menu.section.new'
-          } as TextMenuItemModel,
-          icon: 'plus',
-          index: 0
-        },
-        // TODO: enable this menu item once the feature has been implemented
-        // {
-        //   id: 'new_item_version',
-        //   parentID: 'new',
-        //   active: false,
-        //   visible: true,
-        //   model: {
-        //     type: MenuItemType.LINK,
-        //     text: 'menu.section.new_item_version',
-        //     link: ''
-        //   } as LinkMenuItemModel,
-        // },
-
+      ];
+      const editSubMenuList = [
         /* Edit */
         {
           id: 'edit_community',
@@ -276,7 +255,7 @@ export class MenuResolver implements Resolve<boolean> {
           id: 'edit_item',
           parentID: 'edit',
           active: false,
-          visible: true,
+          visible: canEditItem,
           model: {
             type: MenuItemType.ONCLICK,
             text: 'menu.section.edit_item',
@@ -285,17 +264,47 @@ export class MenuResolver implements Resolve<boolean> {
             }
           } as OnClickMenuItemModel,
         },
-        {
-          id: 'edit',
-          active: false,
-          visible: true,
-          model: {
-            type: MenuItemType.TEXT,
-            text: 'menu.section.edit'
-          } as TextMenuItemModel,
-          icon: 'pencil-alt',
-          index: 1
-        },
+      ];
+      const newSubMenu = {
+        id: 'new',
+        active: false,
+        visible: newSubMenuList.map(subMenu => subMenu.visible).reduce((x,y) => x || y),
+        model: {
+          type: MenuItemType.TEXT,
+          text: 'menu.section.new'
+        } as TextMenuItemModel,
+        icon: 'plus',
+        index: 0
+      }
+      const editSubMenu = {
+        id: 'edit',
+        active: false,
+        visible: editSubMenuList.map(subMenu => subMenu.visible).reduce((x,y) => x || y),
+        model: {
+          type: MenuItemType.TEXT,
+          text: 'menu.section.edit'
+        } as TextMenuItemModel,
+        icon: 'pencil-alt',
+        index: 1
+      }
+
+      const menuList = [
+        ...newSubMenuList,
+        newSubMenu,
+        ...editSubMenuList,
+        editSubMenu,
+        // TODO: enable this menu item once the feature has been implemented
+        // {
+        //   id: 'new_item_version',
+        //   parentID: 'new',
+        //   active: false,
+        //   visible: true,
+        //   model: {
+        //     type: MenuItemType.LINK,
+        //     text: 'menu.section.new_item_version',
+        //     link: ''
+        //   } as LinkMenuItemModel,
+        // },
 
         /* Statistics */
         // TODO: enable this menu item once the feature has been implemented
diff --git a/src/app/root/root.component.ts b/src/app/root/root.component.ts
index 472ba440c9..c265cec034 100644
--- a/src/app/root/root.component.ts
+++ b/src/app/root/root.component.ts
@@ -61,7 +61,7 @@ export class RootComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.sidebarVisible = this.menuService.isMenuVisible(MenuID.ADMIN);
+    this.sidebarVisible = this.menuService.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
 
     this.collapsedSidebarWidth = this.cssService.getVariable('collapsedSidebarWidth');
     this.totalSidebarWidth = this.cssService.getVariable('totalSidebarWidth');
diff --git a/src/app/shared/menu/menu.service.ts b/src/app/shared/menu/menu.service.ts
index f44ddea649..ab513fbbdf 100644
--- a/src/app/shared/menu/menu.service.ts
+++ b/src/app/shared/menu/menu.service.ts
@@ -181,6 +181,18 @@ export class MenuService {
     );
   }
 
+  /**
+   * Check if a given menu is visible and has visible sections
+   * @param {MenuID} menuID The ID of the menu that is to be checked
+   * @returns {Observable<boolean>} Emits true if the given menu is
+   *   visible and has visible sections, emits false when it's hidden
+   */
+  isMenuVisibleWithVisibleSections(menuID: MenuID): Observable<boolean> {
+    return observableCombineLatest([this.isMenuVisible(menuID), this.menuHasVisibleSections(menuID)]).pipe(
+      map(([menuVisible, visibleSections]) => menuVisible && visibleSections)
+    );
+  }
+
   /**
    * Check if a given menu is visible
    * @param {MenuID} menuID The ID of the menu that is to be checked
@@ -192,6 +204,19 @@ export class MenuService {
     );
   }
 
+  /**
+   * Check if a menu has at least one section that is visible.
+   * @param {MenuID} menuID The ID of the menu that is to be checked
+   * @returns {Observable<boolean>} Emits true if the given menu has visible sections, emits false otherwise
+   */ 
+  menuHasVisibleSections(menuID: MenuID): Observable<boolean> {
+    return this.getMenu(menuID).pipe(
+      map((state: MenuState) => hasValue(state)
+        ? Object.values(state.sections).map(section => section.visible).reduce((x,y) => x || y, false)
+        : undefined)
+    );
+  }
+
   /**
    * Expands a given menu
    * @param {MenuID} menuID The ID of the menu

From fa87b1d94e053082af61feddf225c267e00d94f4 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Tue, 6 Dec 2022 14:33:04 +0100
Subject: [PATCH 030/160] 97183 MenuResolver tests for regular user

---
 src/app/menu.resolver.spec.ts               | 154 +++++++++++++++-----
 src/app/shared/testing/menu-service.stub.ts |   4 +
 2 files changed, 122 insertions(+), 36 deletions(-)

diff --git a/src/app/menu.resolver.spec.ts b/src/app/menu.resolver.spec.ts
index 4fd44efe66..afe053d1d4 100644
--- a/src/app/menu.resolver.spec.ts
+++ b/src/app/menu.resolver.spec.ts
@@ -19,6 +19,7 @@ import { cold } from 'jasmine-marbles';
 import createSpy = jasmine.createSpy;
 import { createSuccessfulRemoteDataObject$ } from './shared/remote-data.utils';
 import { createPaginatedList } from './shared/testing/utils.test';
+import { Feature } from './core/shared/feature.model';
 
 const BOOLEAN = { t: true, f: false };
 const MENU_STATE = {
@@ -142,29 +143,7 @@ describe('MenuResolver', () => {
   });
 
   describe('createAdminMenu$', () => {
-    it('should retrieve the menu by ID return an Observable that emits true as soon as it is created', () => {
-      (menuService as any).getMenu.and.returnValue(cold('--u--m', {
-        u: undefined,
-        m: MENU_STATE,
-      }));
-
-      expect(resolver.createAdminMenu$()).toBeObservable(cold('-----(t|)', BOOLEAN));
-      expect(menuService.getMenu).toHaveBeenCalledOnceWith(MenuID.ADMIN);
-    });
-
-    describe('for regular user', () => {
-      beforeEach(() => {
-        authorizationService.isAuthorized = createSpy('isAuthorized').and.callFake(() => {
-          return observableOf(false);
-        });
-      });
-
-      beforeEach((done) => {
-        resolver.createAdminMenu$().subscribe((_) => {
-          done();
-        });
-      });
-
+    const dontShowAdminSections = () => {
       it('should not show site admin section', () => {
         expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
           id: 'admin_search', visible: false,
@@ -183,19 +162,6 @@ describe('MenuResolver', () => {
         }));
       });
 
-      it('should not show edit_community', () => {
-        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
-          id: 'edit_community', visible: false,
-        }));
-
-      });
-
-      it('should not show edit_collection', () => {
-        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
-          id: 'edit_collection', visible: false,
-        }));
-      });
-
       it('should not show access control section', () => {
         expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
           id: 'access_control', visible: false,
@@ -222,6 +188,122 @@ describe('MenuResolver', () => {
           id: 'export', visible: true,
         }));
       });
+    };
+
+    const dontShowNewSection = () => {
+      it('should not show the "New" section', () => {
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'new_community', visible: false,
+        }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'new_collection', visible: false,
+        }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'new_item', visible: false,
+        }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'new', visible: false,
+        }));
+      });
+    };
+
+    const dontShowEditSection = () => {
+      it('should not show the "Edit" section', () => {
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'edit_community', visible: false,
+        }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'edit_collection', visible: false,
+        }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'edit_item', visible: false,
+        }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'edit', visible: false,
+        }));
+      });
+    };
+
+    it('should retrieve the menu by ID return an Observable that emits true as soon as it is created', () => {
+      (menuService as any).getMenu.and.returnValue(cold('--u--m', {
+        u: undefined,
+        m: MENU_STATE,
+      }));
+
+      expect(resolver.createAdminMenu$()).toBeObservable(cold('-----(t|)', BOOLEAN));
+      expect(menuService.getMenu).toHaveBeenCalledOnceWith(MenuID.ADMIN);
+    });
+
+    describe('for regular user', () => {
+      beforeEach(() => {
+        authorizationService.isAuthorized = createSpy('isAuthorized').and.callFake((featureID) => {
+          return observableOf(false);
+        });
+      });
+
+      beforeEach((done) => {
+        resolver.createAdminMenu$().subscribe((_) => {
+          done();
+        });
+      });
+
+      dontShowAdminSections();
+      dontShowNewSection();
+      dontShowEditSection();
+    });
+
+    describe('regular user who can submit', () => {
+      beforeEach(() => {
+        authorizationService.isAuthorized = createSpy('isAuthorized')
+          .and.callFake((featureID: FeatureID) => {
+            return observableOf(featureID === FeatureID.CanSubmit);
+          });
+      });
+
+      beforeEach((done) => {
+        resolver.createAdminMenu$().subscribe((_) => {
+          done();
+        });
+      });
+
+      it('should show "New Item" section', () => {
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'new_item', visible: true,
+        }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'new', visible: true,
+        }));
+      });
+
+      dontShowAdminSections();
+      dontShowEditSection();
+    });
+
+    describe('regular user who can edit items', () => {
+      beforeEach(() => {
+        authorizationService.isAuthorized = createSpy('isAuthorized')
+          .and.callFake((featureID: FeatureID) => {
+            return observableOf(featureID === FeatureID.CanEditItem);
+          });
+      });
+
+      beforeEach((done) => {
+        resolver.createAdminMenu$().subscribe((_) => {
+          done();
+        });
+      });
+
+      it('should show "Edit Item" section', () => {
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'edit_item', visible: true,
+        }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'edit', visible: true,
+        }));
+      });
+
+      dontShowAdminSections();
+      dontShowNewSection();
     });
 
     describe('for site admin', () => {
diff --git a/src/app/shared/testing/menu-service.stub.ts b/src/app/shared/testing/menu-service.stub.ts
index 926232bad0..71ee777157 100644
--- a/src/app/shared/testing/menu-service.stub.ts
+++ b/src/app/shared/testing/menu-service.stub.ts
@@ -66,6 +66,10 @@ export class MenuServiceStub {
     return observableOf(true);
   }
 
+  isMenuVisibleWithVisibleSections(id: MenuID): Observable<boolean> {
+    return observableOf(true);
+  }
+
   isMenuCollapsed(id: MenuID): Observable<boolean> {
     return observableOf(false);
   }

From 4f20d200cac0c117ef3f975adf7daee43c922227 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Tue, 6 Dec 2022 15:45:46 +0100
Subject: [PATCH 031/160] 97183 Tests for
 MenuService.isMenuVisibleWithVisibleSections

---
 src/app/shared/menu/menu.service.spec.ts | 78 ++++++++++++++++++++++++
 src/app/shared/menu/menu.service.ts      |  8 ++-
 2 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/menu/menu.service.spec.ts b/src/app/shared/menu/menu.service.spec.ts
index 7a6b304ec1..26f32b64ef 100644
--- a/src/app/shared/menu/menu.service.spec.ts
+++ b/src/app/shared/menu/menu.service.spec.ts
@@ -243,6 +243,84 @@ describe('MenuService', () => {
     });
   });
 
+  describe('isMenuVisibleWithVisibleSections', () => {
+    it('should return false when the menu is empty', () => {
+      const fakeMenu = {
+        id: MenuID.ADMIN,
+        collapsed: false,
+        visible: true,
+        sections: {},
+        previewCollapsed: false,
+        sectionToSubsectionIndex: {}
+      } as any;
+      spyOn(service, 'getMenu').and.returnValue(observableOf(fakeMenu));
+
+      const result = service.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
+      const expected = cold('(b|)', {
+        b: false
+      });
+
+      expect(result).toBeObservable(expected);
+    });
+    it('should return false when no top-level sections are visible', () => {
+      const noTopLevelVisibleSections = {
+        section: {id: 's1', visible: false},
+        section_2: {id: 's2', visible: false},
+        section_3: {id: 's3', visible: false},
+        section_4: {id: 's1_1', visible: true, parentID: 's1'},
+        section_5: {id: 's2_1', visible: true, parentID: 's2'},
+      }
+      const fakeMenu = {
+        id: MenuID.ADMIN,
+        collapsed: false,
+        visible: true,
+        sections: noTopLevelVisibleSections,
+        previewCollapsed: false,
+        sectionToSubsectionIndex: {
+          'section': ['section_4'],
+          'section_2': ['section_5'],
+        }
+      } as any;
+      spyOn(service, 'getMenu').and.returnValue(observableOf(fakeMenu));
+
+      const result = service.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
+      const expected = cold('(b|)', {
+        b: false
+      });
+
+      expect(result).toBeObservable(expected);
+    });
+
+    it('should return true when any top-level section is visible', () => {
+      const noTopLevelVisibleSections = {
+        section: {id: 's1', visible: false},
+        section_2: {id: 's2', visible: true},
+        section_3: {id: 's3', visible: false},
+        section_4: {id: 's1_1', visible: true, parentID: 's1'},
+        section_5: {id: 's2_1', visible: true, parentID: 's2'},
+      }
+      const fakeMenu = {
+        id: MenuID.ADMIN,
+        collapsed: false,
+        visible: true,
+        sections: noTopLevelVisibleSections,
+        previewCollapsed: false,
+        sectionToSubsectionIndex: {
+          'section': ['section_4'],
+          'section_2': ['section_5'],
+        }
+      } as any;
+      spyOn(service, 'getMenu').and.returnValue(observableOf(fakeMenu));
+
+      const result = service.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
+      const expected = cold('(b|)', {
+        b: true
+      });
+
+      expect(result).toBeObservable(expected);
+    });
+  });
+
   describe('isMenuVisible', () => {
     beforeEach(() => {
       spyOn(service, 'getMenu').and.returnValue(observableOf(fakeMenu));
diff --git a/src/app/shared/menu/menu.service.ts b/src/app/shared/menu/menu.service.ts
index ab513fbbdf..8e2cb8a894 100644
--- a/src/app/shared/menu/menu.service.ts
+++ b/src/app/shared/menu/menu.service.ts
@@ -182,7 +182,7 @@ export class MenuService {
   }
 
   /**
-   * Check if a given menu is visible and has visible sections
+   * Check if a given menu is visible and has visible top-level (!) sections
    * @param {MenuID} menuID The ID of the menu that is to be checked
    * @returns {Observable<boolean>} Emits true if the given menu is
    *   visible and has visible sections, emits false when it's hidden
@@ -205,14 +205,16 @@ export class MenuService {
   }
 
   /**
-   * Check if a menu has at least one section that is visible.
+   * Check if a menu has at least one top-level (!) section that is visible.
    * @param {MenuID} menuID The ID of the menu that is to be checked
    * @returns {Observable<boolean>} Emits true if the given menu has visible sections, emits false otherwise
    */ 
   menuHasVisibleSections(menuID: MenuID): Observable<boolean> {
     return this.getMenu(menuID).pipe(
       map((state: MenuState) => hasValue(state)
-        ? Object.values(state.sections).map(section => section.visible).reduce((x,y) => x || y, false)
+        ? Object.values(state.sections)
+          .map(section => section.visible && section.parentID === undefined)
+          .reduce((x,y) => x || y, false)
         : undefined)
     );
   }

From 92c7922fbea17a5656f1a31240340223d81ffaed Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Tue, 6 Dec 2022 15:59:01 +0100
Subject: [PATCH 032/160] 97183 Fixed linting issues

---
 src/app/menu.resolver.ts                 |  4 ++--
 src/app/shared/menu/menu.service.spec.ts | 16 ++++++++--------
 src/app/shared/menu/menu.service.ts      |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts
index 19413ab4be..933014c93a 100644
--- a/src/app/menu.resolver.ts
+++ b/src/app/menu.resolver.ts
@@ -275,7 +275,7 @@ export class MenuResolver implements Resolve<boolean> {
         } as TextMenuItemModel,
         icon: 'plus',
         index: 0
-      }
+      };
       const editSubMenu = {
         id: 'edit',
         active: false,
@@ -286,7 +286,7 @@ export class MenuResolver implements Resolve<boolean> {
         } as TextMenuItemModel,
         icon: 'pencil-alt',
         index: 1
-      }
+      };
 
       const menuList = [
         ...newSubMenuList,
diff --git a/src/app/shared/menu/menu.service.spec.ts b/src/app/shared/menu/menu.service.spec.ts
index 26f32b64ef..589b5ebf6b 100644
--- a/src/app/shared/menu/menu.service.spec.ts
+++ b/src/app/shared/menu/menu.service.spec.ts
@@ -245,7 +245,7 @@ describe('MenuService', () => {
 
   describe('isMenuVisibleWithVisibleSections', () => {
     it('should return false when the menu is empty', () => {
-      const fakeMenu = {
+      const testMenu = {
         id: MenuID.ADMIN,
         collapsed: false,
         visible: true,
@@ -253,7 +253,7 @@ describe('MenuService', () => {
         previewCollapsed: false,
         sectionToSubsectionIndex: {}
       } as any;
-      spyOn(service, 'getMenu').and.returnValue(observableOf(fakeMenu));
+      spyOn(service, 'getMenu').and.returnValue(observableOf(testMenu));
 
       const result = service.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
       const expected = cold('(b|)', {
@@ -269,8 +269,8 @@ describe('MenuService', () => {
         section_3: {id: 's3', visible: false},
         section_4: {id: 's1_1', visible: true, parentID: 's1'},
         section_5: {id: 's2_1', visible: true, parentID: 's2'},
-      }
-      const fakeMenu = {
+      };
+      const testMenu = {
         id: MenuID.ADMIN,
         collapsed: false,
         visible: true,
@@ -281,7 +281,7 @@ describe('MenuService', () => {
           'section_2': ['section_5'],
         }
       } as any;
-      spyOn(service, 'getMenu').and.returnValue(observableOf(fakeMenu));
+      spyOn(service, 'getMenu').and.returnValue(observableOf(testMenu));
 
       const result = service.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
       const expected = cold('(b|)', {
@@ -298,8 +298,8 @@ describe('MenuService', () => {
         section_3: {id: 's3', visible: false},
         section_4: {id: 's1_1', visible: true, parentID: 's1'},
         section_5: {id: 's2_1', visible: true, parentID: 's2'},
-      }
-      const fakeMenu = {
+      };
+      const testMenu = {
         id: MenuID.ADMIN,
         collapsed: false,
         visible: true,
@@ -310,7 +310,7 @@ describe('MenuService', () => {
           'section_2': ['section_5'],
         }
       } as any;
-      spyOn(service, 'getMenu').and.returnValue(observableOf(fakeMenu));
+      spyOn(service, 'getMenu').and.returnValue(observableOf(testMenu));
 
       const result = service.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
       const expected = cold('(b|)', {
diff --git a/src/app/shared/menu/menu.service.ts b/src/app/shared/menu/menu.service.ts
index 8e2cb8a894..eeb6c0f2c2 100644
--- a/src/app/shared/menu/menu.service.ts
+++ b/src/app/shared/menu/menu.service.ts
@@ -208,7 +208,7 @@ export class MenuService {
    * Check if a menu has at least one top-level (!) section that is visible.
    * @param {MenuID} menuID The ID of the menu that is to be checked
    * @returns {Observable<boolean>} Emits true if the given menu has visible sections, emits false otherwise
-   */ 
+   */
   menuHasVisibleSections(menuID: MenuID): Observable<boolean> {
     return this.getMenu(menuID).pipe(
       map((state: MenuState) => hasValue(state)

From f378d53d4cdf338a31a9aca69be54ad690f2c34b Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Wed, 7 Dec 2022 12:16:45 -0800
Subject: [PATCH 033/160] Item back button and tests.

---
 .../journal-issue.component.html              |   8 ++
 .../journal-volume.component.html             |   8 ++
 .../item-pages/journal/journal.component.html |   8 ++
 .../journal/journal.component.spec.ts         |   3 +-
 .../org-unit/org-unit.component.html          |   8 ++
 .../item-pages/person/person.component.html   |   8 ++
 .../item-pages/project/project.component.html |   8 ++
 .../publication/publication.component.html    |   8 ++
 .../publication/publication.component.spec.ts |  21 ++-
 .../item-types/shared/item.component.spec.ts  | 126 +++++++++++++++++-
 .../item-types/shared/item.component.ts       |  28 +++-
 .../untyped-item/untyped-item.component.html  |   9 ++
 .../untyped-item.component.spec.ts            |  29 ++--
 .../versioned-item.component.ts               |   6 +-
 src/assets/i18n/en.json5                      |   3 +
 15 files changed, 251 insertions(+), 30 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
index bf73a62447..5e98a5f3f0 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
@@ -1,3 +1,11 @@
+<div class="row" *ngIf="showBackButton | async" (click)="back()">
+  <div class="col-12">
+    <button class="btn btn-secondary ng-tns-c242-28" >
+      <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
+      {{"search-browse-item-return" | translate}}</button>
+  </div>
+</div>
+
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
index b370431a27..75b159f9eb 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -1,3 +1,11 @@
+<div class="row" *ngIf="showBackButton | async" (click)="back()">
+  <div class="col-12">
+    <button class="btn btn-secondary ng-tns-c242-28" >
+      <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
+      {{"search-browse-item-return" | translate}}</button>
+  </div>
+</div>
+
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index 27ee373237..5f5cd09a49 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -1,3 +1,11 @@
+<div class="row" *ngIf="showBackButton | async" (click)="back()">
+  <div class="col-12">
+    <button class="btn btn-secondary ng-tns-c242-28" >
+      <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
+      {{"search-browse-item-return" | translate}}</button>
+  </div>
+</div>
+
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
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 4469a2ac29..7e20edca6b 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
@@ -34,6 +34,7 @@ import { VersionHistoryDataService } from '../../../../core/data/version-history
 import { VersionDataService } from '../../../../core/data/version-data.service';
 import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
 import { SearchService } from '../../../../core/shared/search/search.service';
+import { mockRouteService } from '../../../../item-page/simple/item-types/shared/item.component.spec';
 
 let comp: JournalComponent;
 let fixture: ComponentFixture<JournalComponent>;
@@ -99,7 +100,7 @@ describe('JournalComponent', () => {
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
         { provide: WorkspaceitemDataService, useValue: {} },
         { provide: SearchService, useValue: {} },
-        { provide: RouteService, useValue: {} }
+        { provide: RouteService, useValue: mockRouteService }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
index ac92e4ad6d..e743aeb935 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -1,3 +1,11 @@
+<div class="row" *ngIf="showBackButton | async" (click)="back()">
+  <div class="col-12">
+    <button class="btn btn-secondary ng-tns-c242-28" >
+      <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
+      {{"search-browse-item-return" | translate}}</button>
+  </div>
+</div>
+
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
index a73236006b..d046578873 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -1,3 +1,11 @@
+<div class="row" *ngIf="showBackButton | async" (click)="back()">
+  <div class="col-12">
+    <button class="btn btn-secondary ng-tns-c242-28" >
+      <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
+      {{"search-browse-item-return" | translate}}</button>
+  </div>
+</div>
+
 <div class="d-flex flex-row">
   <ds-item-page-title-field class="mr-auto" [item]="object">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
index 3fb5e2d520..808ba17f36 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
@@ -1,3 +1,11 @@
+<div class="row" *ngIf="showBackButton | async" (click)="back()">
+  <div class="col-12">
+    <button class="btn btn-secondary ng-tns-c242-28" >
+      <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
+      {{"search-browse-item-return" | translate}}</button>
+  </div>
+</div>
+
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html
index 181480b789..e2f78a7f32 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/item-page/simple/item-types/publication/publication.component.html
@@ -1,3 +1,11 @@
+<div class="row" *ngIf="showBackButton | async" (click)="back()">
+  <div class="col-12">
+    <button class="btn btn-secondary ng-tns-c242-28" >
+      <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
+      {{"search-browse-item-return" | translate}}</button>
+  </div>
+</div>
+
 <div class="row" *ngIf="iiifEnabled">
   <div class="col-12">
     <ds-mirador-viewer  id="iiif-viewer"
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 1ccb33eb32..3c2ff4f844 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
@@ -163,12 +163,12 @@ describe('PublicationComponent', () => {
 
   describe('with IIIF viewer and search', () => {
 
+    const localMockRouteService = {
+      getPreviousUrl(): Observable<string> {
+        return of('/search?query=test%20query&fakeParam=true');
+      }
+    };
     beforeEach(waitForAsync(() => {
-      const localMockRouteService = {
-        getPreviousUrl(): Observable<string> {
-          return of('/search?query=test%20query&fakeParam=true');
-        }
-      };
       const iiifEnabledMap: MetadataMap = {
         'dspace.iiif.enabled': [getIIIFEnabled(true)],
         'iiif.search.enabled': [getIIIFSearchEnabled(true)],
@@ -193,13 +193,12 @@ describe('PublicationComponent', () => {
   });
 
   describe('with IIIF viewer and search but no previous search query', () => {
-
+    const localMockRouteService = {
+      getPreviousUrl(): Observable<string> {
+        return of('/item');
+      }
+    };
     beforeEach(waitForAsync(() => {
-      const localMockRouteService = {
-        getPreviousUrl(): Observable<string> {
-          return of('/item');
-        }
-      };
       const iiifEnabledMap: MetadataMap = {
         'dspace.iiif.enabled': [getIIIFEnabled(true)],
         'iiif.search.enabled': [getIIIFSearchEnabled(true)],
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 b14e56a58e..b47d12caee 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
@@ -39,6 +39,12 @@ import { VersionHistoryDataService } from '../../../../core/data/version-history
 import { RouterTestingModule } from '@angular/router/testing';
 import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
 import { ResearcherProfileDataService } from '../../../../core/profile/researcher-profile-data.service';
+import { Router } from '@angular/router';
+
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { ItemComponent } from './item.component';
+import { ItemVersionsSharedService } from '../../../../shared/item/item-versions/item-versions-shared.service';
 
 export function getIIIFSearchEnabled(enabled: boolean): MetadataValue {
   return Object.assign(new MetadataValue(), {
@@ -60,7 +66,11 @@ export function getIIIFEnabled(enabled: boolean): MetadataValue {
   });
 }
 
-export const mockRouteService = jasmine.createSpyObj('RouteService', ['getPreviousUrl']);
+export const mockRouteService = {
+  getPreviousUrl(): Observable<string> {
+    return observableOf('');
+  }
+};
 
 /**
  * Create a generic test for an item-page-fields component using a mockItem and the type of component
@@ -115,7 +125,7 @@ export function getItemPageFieldsTest(mockItem: Item, component) {
           { provide: BitstreamDataService, useValue: mockBitstreamDataService },
           { provide: WorkspaceitemDataService, useValue: {} },
           { provide: SearchService, useValue: {} },
-          { provide: RouteService, useValue: {} },
+          { provide: RouteService, useValue: mockRouteService },
           { provide: AuthorizationDataService, useValue: authorizationService },
           { provide: ResearcherProfileDataService, useValue: {} }
         ],
@@ -377,4 +387,116 @@ describe('ItemComponent', () => {
     });
   });
 
+  const mockItem: Item = Object.assign(new Item(), {
+    bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
+    metadata: {
+      'publicationissue.issueNumber': [
+        {
+          language: 'en_US',
+          value: '1234'
+        }
+      ],
+      'dc.description': [
+        {
+          language: 'en_US',
+          value: 'desc'
+        }
+      ]
+    },
+  });
+
+  describe('back to results', () => {
+    let comp: ItemComponent;
+    let fixture: ComponentFixture<any>;
+    let router: Router;
+
+    const searchUrl = '/search?query=test&spc.page=2';
+    const browseUrl = '/browse/title?scope=0cc&bbm.page=3';
+    const recentSubmissionsUrl = '/collections/be7b8430-77a5-4016-91c9-90863e50583a?cp.page=3';
+
+    beforeEach(waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [
+          TranslateModule.forRoot({
+            loader: {
+              provide: TranslateLoader,
+              useClass: TranslateLoaderMock
+            }
+          }),
+          RouterTestingModule,
+        ],
+        declarations: [ItemComponent, GenericItemPageFieldComponent, TruncatePipe ],
+        providers: [
+          { provide: ItemDataService, useValue: {} },
+          { provide: TruncatableService, useValue: {} },
+          { provide: RelationshipDataService, useValue: {} },
+          { provide: ObjectCacheService, useValue: {} },
+          { provide: UUIDService, useValue: {} },
+          { provide: Store, useValue: {} },
+          { provide: RemoteDataBuildService, useValue: {} },
+          { provide: CommunityDataService, useValue: {} },
+          { provide: HALEndpointService, useValue: {} },
+          { provide: NotificationsService, useValue: {} },
+          { provide: HttpClient, useValue: {} },
+          { provide: DSOChangeAnalyzer, useValue: {} },
+          { provide: DefaultChangeAnalyzer, useValue: {} },
+          { provide: VersionHistoryDataService, useValue: {} },
+          { provide: VersionDataService, useValue: {} },
+          { provide: BitstreamDataService, useValue: {} },
+          { provide: WorkspaceitemDataService, useValue: {} },
+          { provide: SearchService, useValue: {} },
+          { provide: ItemDataService, useValue: {} },
+          { provide: ItemVersionsSharedService, useValue: {} },
+          { provide: RouteService, useValue: mockRouteService }
+        ],
+        schemas: [NO_ERRORS_SCHEMA]
+      }).overrideComponent(ItemComponent, {
+        set: {changeDetection: ChangeDetectionStrategy.Default}
+      });
+    }));
+
+    beforeEach(waitForAsync(() => {
+      router = TestBed.inject(Router);
+      spyOn(router, 'navigateByUrl');
+      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(''));
+      TestBed.compileComponents();
+      fixture = TestBed.createComponent(ItemComponent);
+      comp = fixture.componentInstance;
+      comp.object = mockItem;
+      fixture.detectChanges();
+    }));
+
+    it('should hide back button',() => {
+      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(''));
+      comp.showBackButton.subscribe((val) => {
+        expect(val).toBeFalse();
+      });
+    });
+    it('should show back button', () => {
+      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(searchUrl));
+      comp.ngOnInit();
+      comp.showBackButton.subscribe((val) => {
+        expect(val).toBeTrue();
+      });
+    });
+    it('should navigate back to the search list', () => {
+      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(searchUrl));
+      comp.back();
+      expect(mockRouteService.getPreviousUrl).toHaveBeenCalled();
+      expect(router.navigateByUrl).toHaveBeenCalledWith(searchUrl);
+    });
+    it('should navigate back to the browse list', () => {
+      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(browseUrl));
+      comp.back();
+      expect(mockRouteService.getPreviousUrl).toHaveBeenCalled();
+      expect(router.navigateByUrl).toHaveBeenCalledWith(browseUrl);
+    });
+    it('should navigate back to the recent submissions list', () => {
+      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(recentSubmissionsUrl));
+      comp.back();
+      expect(mockRouteService.getPreviousUrl).toHaveBeenCalled();
+      expect(router.navigateByUrl).toHaveBeenCalledWith(recentSubmissionsUrl);
+    });
+  });
+
 });
diff --git a/src/app/item-page/simple/item-types/shared/item.component.ts b/src/app/item-page/simple/item-types/shared/item.component.ts
index 71b0b5b678..b5037924f3 100644
--- a/src/app/item-page/simple/item-types/shared/item.component.ts
+++ b/src/app/item-page/simple/item-types/shared/item.component.ts
@@ -5,6 +5,8 @@ import { getItemPageRoute } from '../../../item-page-routing-paths';
 import { RouteService } from '../../../../core/services/route.service';
 import { Observable } from 'rxjs';
 import { getDSpaceQuery, isIiifEnabled, isIiifSearchEnabled } from './item-iiif-utils';
+import { filter, map, take } from 'rxjs/operators';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'ds-item',
@@ -36,12 +38,29 @@ export class ItemComponent implements OnInit {
    */
   iiifQuery$: Observable<string>;
 
+  /**
+   * Used to configure search in mirador.
+   */
+  showBackButton: Observable<boolean>;
+
   mediaViewer;
 
-  constructor(protected routeService: RouteService) {
+  constructor(protected routeService: RouteService,
+              protected router: Router) {
     this.mediaViewer = environment.mediaViewer;
   }
 
+  /**
+   * Navigate back from the item to the previous pagination url.
+   */
+  public back() {
+    this.routeService.getPreviousUrl().pipe(
+      take(1)
+    ).subscribe(
+      (url => this.router.navigateByUrl(url))
+    );
+  }
+
   ngOnInit(): void {
     this.itemPageRoute = getItemPageRoute(this.object);
     // check to see if iiif viewer is required.
@@ -50,5 +69,12 @@ export class ItemComponent implements OnInit {
     if (this.iiifSearchEnabled) {
       this.iiifQuery$ = getDSpaceQuery(this.object, this.routeService);
     }
+    // Show the back to results button when the previous context was search, browse,
+    // or recent submissions pagination.
+    this.showBackButton = this.routeService.getPreviousUrl().pipe(
+      filter(url => /^(\/search|\/browse|\/collections)/.test(url)),
+      take(1),
+      map(() => true)
+    );
   }
 }
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
index 5c3e5e77b0..2b0458d14c 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -1,3 +1,11 @@
+<div class="row" *ngIf="showBackButton | async" (click)="back()">
+  <div class="col-12">
+    <button class="btn btn-secondary ng-tns-c242-28" >
+      <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
+      {{"search-browse-item-return" | translate}}</button>
+  </div>
+</div>
+
 <div class="row" *ngIf="iiifEnabled">
   <div class="col-12">
     <ds-mirador-viewer id="iiif-viewer"
@@ -7,6 +15,7 @@
     </ds-mirador-viewer>
   </div>
 </div>
+
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
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 57f546fbec..135810d543 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
@@ -169,13 +169,12 @@ describe('UntypedItemComponent', () => {
   });
 
   describe('with IIIF viewer and search', () => {
-
+    const localMockRouteService = {
+      getPreviousUrl(): Observable<string> {
+        return of('/search?query=test%20query&fakeParam=true');
+      }
+    };
     beforeEach(waitForAsync(() => {
-      const localMockRouteService = {
-        getPreviousUrl(): Observable<string> {
-          return of('/search?query=test%20query&fakeParam=true');
-        }
-      };
       const iiifEnabledMap: MetadataMap = {
         'dspace.iiif.enabled': [getIIIFEnabled(true)],
         'iiif.search.enabled': [getIIIFSearchEnabled(true)],
@@ -183,6 +182,7 @@ describe('UntypedItemComponent', () => {
       TestBed.overrideProvider(RouteService, {useValue: localMockRouteService});
       TestBed.compileComponents();
       fixture = TestBed.createComponent(UntypedItemComponent);
+      spyOn(localMockRouteService, 'getPreviousUrl').and.callThrough();
       comp = fixture.componentInstance;
       comp.object = getItem(iiifEnabledMap);
       fixture.detectChanges();
@@ -196,17 +196,21 @@ describe('UntypedItemComponent', () => {
     it('should retrieve the query term for previous route', (): void => {
       expect(comp.iiifQuery$.subscribe(result => expect(result).toEqual('test query')));
     });
-
+    it('should navigate back to the browse list', () => {
+      comp.back();
+      expect(localMockRouteService.getPreviousUrl).toHaveBeenCalled();
+      //expect(routerSpy.navigateByUrl).toHaveBeenCalledWith(url);
+    });
   });
 
   describe('with IIIF viewer and search but no previous search query', () => {
 
+    const localMockRouteService = {
+      getPreviousUrl(): Observable<string> {
+        return of('/item');
+      }
+    };
     beforeEach(waitForAsync(() => {
-      const localMockRouteService = {
-        getPreviousUrl(): Observable<string> {
-          return of('/item');
-        }
-      };
       const iiifEnabledMap: MetadataMap = {
         'dspace.iiif.enabled': [getIIIFEnabled(true)],
         'iiif.search.enabled': [getIIIFSearchEnabled(true)],
@@ -214,6 +218,7 @@ describe('UntypedItemComponent', () => {
       TestBed.overrideProvider(RouteService, {useValue: localMockRouteService});
       TestBed.compileComponents();
       fixture = TestBed.createComponent(UntypedItemComponent);
+
       comp = fixture.componentInstance;
       comp.object = getItem(iiifEnabledMap);
       fixture.detectChanges();
diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
index 7f61cee10b..2dbbd494d6 100644
--- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
+++ b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
@@ -31,13 +31,13 @@ export class VersionedItemComponent extends ItemComponent {
     private translateService: TranslateService,
     private versionService: VersionDataService,
     private itemVersionShared: ItemVersionsSharedService,
-    private router: Router,
+    protected router: Router,
     private workspaceItemDataService: WorkspaceitemDataService,
     private searchService: SearchService,
     private itemService: ItemDataService,
-    protected routeService: RouteService
+    protected routeService: RouteService,
   ) {
-    super(routeService);
+    super(routeService, router);
   }
 
   /**
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index a806588701..68c7d55522 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -780,6 +780,9 @@
   "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
 
 
+  "search-browse-item-return": "Back to Results",
+
+
   "chips.remove": "Remove chip",
 
 

From 9fefe064bf99c70051b1b0a91eee715bdc4633ca Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Wed, 7 Dec 2022 13:45:54 -0800
Subject: [PATCH 034/160] Added some space below the button.

---
 .../item-pages/journal-issue/journal-issue.component.html     | 2 +-
 .../item-pages/journal-issue/journal-issue.component.scss     | 4 ++++
 .../item-pages/journal-volume/journal-volume.component.html   | 2 +-
 .../item-pages/journal-volume/journal-volume.component.scss   | 4 ++++
 .../item-pages/journal/journal.component.html                 | 2 +-
 .../item-pages/journal/journal.component.scss                 | 4 ++++
 .../item-pages/org-unit/org-unit.component.html               | 2 +-
 .../item-pages/org-unit/org-unit.component.scss               | 4 ++++
 .../research-entities/item-pages/person/person.component.html | 2 +-
 .../research-entities/item-pages/person/person.component.scss | 4 ++++
 .../item-pages/project/project.component.html                 | 2 +-
 .../item-pages/project/project.component.scss                 | 4 ++++
 .../simple/item-types/publication/publication.component.html  | 2 +-
 .../simple/item-types/publication/publication.component.scss  | 4 ++++
 .../item-types/untyped-item/untyped-item.component.html       | 2 +-
 .../item-types/untyped-item/untyped-item.component.scss       | 3 +++
 16 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
index 5e98a5f3f0..22002d4af6 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
@@ -1,6 +1,6 @@
 <div class="row" *ngIf="showBackButton | async" (click)="back()">
   <div class="col-12">
-    <button class="btn btn-secondary ng-tns-c242-28" >
+    <button class="btn btn-secondary back-btn ng-tns-c242-28" >
       <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
       {{"search-browse-item-return" | translate}}</button>
   </div>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss
index 3575cae797..b596e76018 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss
@@ -1 +1,5 @@
 @import '../../../../../styles/variables.scss';
+
+button.back-btn {
+  margin-bottom: 10px;
+}
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
index 75b159f9eb..23b600691c 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -1,6 +1,6 @@
 <div class="row" *ngIf="showBackButton | async" (click)="back()">
   <div class="col-12">
-    <button class="btn btn-secondary ng-tns-c242-28" >
+    <button class="btn btn-secondary back-btn ng-tns-c242-28" >
       <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
       {{"search-browse-item-return" | translate}}</button>
   </div>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss
index 3575cae797..b596e76018 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss
@@ -1 +1,5 @@
 @import '../../../../../styles/variables.scss';
+
+button.back-btn {
+  margin-bottom: 10px;
+}
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index 5f5cd09a49..f52990f539 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -1,6 +1,6 @@
 <div class="row" *ngIf="showBackButton | async" (click)="back()">
   <div class="col-12">
-    <button class="btn btn-secondary ng-tns-c242-28" >
+    <button class="btn btn-secondary back-btn ng-tns-c242-28" >
       <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
       {{"search-browse-item-return" | translate}}</button>
   </div>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss
index 3575cae797..b596e76018 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss
@@ -1 +1,5 @@
 @import '../../../../../styles/variables.scss';
+
+button.back-btn {
+  margin-bottom: 10px;
+}
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
index e743aeb935..bd75e0bcde 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -1,6 +1,6 @@
 <div class="row" *ngIf="showBackButton | async" (click)="back()">
   <div class="col-12">
-    <button class="btn btn-secondary ng-tns-c242-28" >
+    <button class="btn btn-secondary back-btn ng-tns-c242-28" >
       <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
       {{"search-browse-item-return" | translate}}</button>
   </div>
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss
index 3575cae797..b596e76018 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss
@@ -1 +1,5 @@
 @import '../../../../../styles/variables.scss';
+
+button.back-btn {
+  margin-bottom: 10px;
+}
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
index d046578873..a1486fde0e 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -1,6 +1,6 @@
 <div class="row" *ngIf="showBackButton | async" (click)="back()">
   <div class="col-12">
-    <button class="btn btn-secondary ng-tns-c242-28" >
+    <button class="btn btn-secondary back-btn ng-tns-c242-28" >
       <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
       {{"search-browse-item-return" | translate}}</button>
   </div>
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.scss b/src/app/entity-groups/research-entities/item-pages/person/person.component.scss
index 3575cae797..b596e76018 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.scss
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.scss
@@ -1 +1,5 @@
 @import '../../../../../styles/variables.scss';
+
+button.back-btn {
+  margin-bottom: 10px;
+}
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
index 808ba17f36..991cbf864d 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
@@ -1,6 +1,6 @@
 <div class="row" *ngIf="showBackButton | async" (click)="back()">
   <div class="col-12">
-    <button class="btn btn-secondary ng-tns-c242-28" >
+    <button class="btn btn-secondary back-btn ng-tns-c242-28" >
       <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
       {{"search-browse-item-return" | translate}}</button>
   </div>
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.scss b/src/app/entity-groups/research-entities/item-pages/project/project.component.scss
index 3575cae797..b596e76018 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.scss
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.scss
@@ -1 +1,5 @@
 @import '../../../../../styles/variables.scss';
+
+button.back-btn {
+  margin-bottom: 10px;
+}
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html
index e2f78a7f32..9c02fc8fd8 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/item-page/simple/item-types/publication/publication.component.html
@@ -1,6 +1,6 @@
 <div class="row" *ngIf="showBackButton | async" (click)="back()">
   <div class="col-12">
-    <button class="btn btn-secondary ng-tns-c242-28" >
+    <button class="btn btn-secondary back-btn ng-tns-c242-28" >
       <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
       {{"search-browse-item-return" | translate}}</button>
   </div>
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.scss b/src/app/item-page/simple/item-types/publication/publication.component.scss
index 3575cae797..b596e76018 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.scss
+++ b/src/app/item-page/simple/item-types/publication/publication.component.scss
@@ -1 +1,5 @@
 @import '../../../../../styles/variables.scss';
+
+button.back-btn {
+  margin-bottom: 10px;
+}
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
index 2b0458d14c..ebc4aaa38a 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -1,6 +1,6 @@
 <div class="row" *ngIf="showBackButton | async" (click)="back()">
   <div class="col-12">
-    <button class="btn btn-secondary ng-tns-c242-28" >
+    <button class="btn btn-secondary back-btn ng-tns-c242-28" >
       <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
       {{"search-browse-item-return" | translate}}</button>
   </div>
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss
index 3575cae797..efbfe5c4f9 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss
@@ -1 +1,4 @@
 @import '../../../../../styles/variables.scss';
+button.back-btn {
+  margin-bottom: 10px;
+}

From 86164f743e07f9c6ffa915132f20e261c5b8c45c Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 8 Dec 2022 11:05:11 +0100
Subject: [PATCH 035/160] 97075: Edit metadata - Reset reinstatable on change

---
 .../dso-edit-metadata-form.ts                 | 21 +++++++++++++++++++
 .../dso-edit-metadata.component.html          | 20 +++++++++---------
 .../dso-edit-metadata.component.ts            |  1 +
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
index 984bec575e..9e5f2c22e1 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
@@ -130,6 +130,14 @@ export class DsoEditMetadataValue {
   isReinstatable(): boolean {
     return hasValue(this.reinstatableValue) || hasValue(this.reinstatableChange);
   }
+
+  /**
+   * Reset the state of the re-instatable properties
+   */
+  resetReinstatable() {
+    this.reinstatableValue = undefined;
+    this.reinstatableChange = undefined;
+  }
 }
 
 /**
@@ -242,6 +250,7 @@ export class DsoEditMetadataForm {
    * undone afterwards
    */
   discard(): void {
+    this.resetReinstatable();
     Object.entries(this.fields).forEach(([field, values]) => {
       let removeFromIndex = -1;
       values.forEach((value, index) => {
@@ -293,6 +302,18 @@ export class DsoEditMetadataForm {
           .some((value) => value.isReinstatable()));
   }
 
+  /**
+   * Reset the state of the re-instatable properties and values
+   */
+  resetReinstatable() {
+    this.reinstatableNewValues = {};
+    Object.values(this.fields).forEach((values) => {
+      values.forEach((value) => {
+        value.resetReinstatable();
+      });
+    });
+  }
+
   /**
    * Get the json PATCH operations for the current changes within this form
    */
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index 7578f2ec99..9664fd4d93 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -43,19 +43,19 @@
         </div>
         <div class="text-center ds-flex-cell ds-edit-cell">
           <div class="btn-group edit-field">
-            <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.buttons.confirm' | translate }}"
+            <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}"
                     [disabled]="!newMdField || (saving$ | async) || (loadingFieldValidation$ | async)" (click)="setMetadataField()">
               <i class="fas fa-check fa-fw"></i>
             </button>
-            <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.buttons.remove' | translate }}"
+            <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
                     [disabled]="true">
               <i class="fas fa-trash-alt fa-fw"></i>
             </button>
-            <button class="btn btn-outline-warning btn-sm" ngbTooltip="{{ dsoType + '.edit.buttons.undo' | translate }}"
+            <button class="btn btn-outline-warning btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
                     [disabled]="(saving$ | async) || (loadingFieldValidation$ | async)" (click)="form.newValue = undefined">
               <i class="fas fa-undo-alt fa-fw"></i>
             </button>
-            <button class="btn btn-outline-secondary ds-drag-handle btn-sm disabled" ngbTooltip="{{ dsoType + '.edit.buttons.drag' | translate }}"
+            <button class="btn btn-outline-secondary ds-drag-handle btn-sm disabled" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}"
                     [disabled]="true">
               <i class="fas fa-grip-vertical fa-fw"></i>
             </button>
@@ -82,25 +82,25 @@
         </div>
         <div class="text-center ds-flex-cell ds-edit-cell">
           <div class="btn-group edit-field">
-            <button class="btn btn-outline-primary btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.buttons.edit' | translate }}" *ngIf="!mdValue.editing"
+            <button class="btn btn-outline-primary btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}" *ngIf="!mdValue.editing"
                     [disabled]="mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="mdValue.editing = true">
               <i class="fas fa-edit fa-fw"></i>
             </button>
-            <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.buttons.confirm' | translate }}" *ngIf="mdValue.editing"
-                    [disabled]="(saving$ | async)" (click)="mdValue.confirmChanges(); onValueSaved()">
+            <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}" *ngIf="mdValue.editing"
+                    [disabled]="(saving$ | async)" (click)="mdValue.confirmChanges(); form.resetReinstatable(); onValueSaved()">
               <i class="fas fa-check fa-fw"></i>
             </button>
-            <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.buttons.remove' | translate }}"
+            <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
                     [disabled]="mdValue.change || mdValue.editing || (saving$ | async)" (click)="mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE; onValueSaved()">
               <i class="fas fa-trash-alt fa-fw"></i>
             </button>
-            <button class="btn btn-outline-warning btn-sm" ngbTooltip="{{ dsoType + '.edit.buttons.undo' | translate }}"
+            <button class="btn btn-outline-warning btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
                     [disabled]="(!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.discard(); onValueSaved()">
               <i class="fas fa-undo-alt fa-fw"></i>
             </button>
             <!-- TODO: Enable drag -->
             <button class="btn btn-outline-secondary ds-drag-handle btn-sm"
-                    [ngClass]="{'disabled': form.fields[mdField].length === 1 || (saving$ | async)}" ngbTooltip="{{ dsoType + '.edit.buttons.drag' | translate }}" [disabled]="form.fields[mdField].length === 1 || (saving$ | async)">
+                    [ngClass]="{'disabled': form.fields[mdField].length === 1 || (saving$ | async)}" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}" [disabled]="form.fields[mdField].length === 1 || (saving$ | async)">
               <i class="fas fa-grip-vertical fa-fw"></i>
             </button>
           </div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
index eee2bc963c..2f6f32c1c1 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -186,6 +186,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
    * Validate the metadata field first
    */
   setMetadataField() {
+    this.form.resetReinstatable();
     this.loadingFieldValidation$.next(true);
     this.metadataFieldSelectorComponent.validate().subscribe((valid) => {
       this.loadingFieldValidation$.next(false);

From c24e904c660bd63db83718064508dd697e4046ae Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 8 Dec 2022 11:08:15 +0100
Subject: [PATCH 036/160] 97075: Edit metadata - reset reinstatable on value
 delete

---
 .../dso-edit-metadata/dso-edit-metadata.component.html          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index 9664fd4d93..d3d1ee1596 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -91,7 +91,7 @@
               <i class="fas fa-check fa-fw"></i>
             </button>
             <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
-                    [disabled]="mdValue.change || mdValue.editing || (saving$ | async)" (click)="mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE; onValueSaved()">
+                    [disabled]="mdValue.change || mdValue.editing || (saving$ | async)" (click)="mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE; form.resetReinstatable(); onValueSaved()">
               <i class="fas fa-trash-alt fa-fw"></i>
             </button>
             <button class="btn btn-outline-warning btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"

From 9cde4c119e22c69e749895f351e4eb033394261b Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Thu, 8 Dec 2022 17:52:49 +0100
Subject: [PATCH 037/160] 97049: Fixing inconsistent tests

---
 .../search-hierarchy-filter.component.spec.ts          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
index 872d0772bd..29d033fb17 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -1,5 +1,5 @@
 import { SearchHierarchyFilterComponent } from './search-hierarchy-filter.component';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { DebugElement, EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
@@ -89,12 +89,12 @@ describe('SearchHierarchyFilterComponent', () => {
 
   describe('if the vocabulary doesn\'t exist', () => {
 
-    beforeEach(() => {
+    beforeEach(waitForAsync(() => {
       spyOn(vocabularyService, 'searchTopEntries').and.returnValue(observableOf(new RemoteData(
         undefined, 0, 0, RequestEntryState.Error, undefined, undefined, 404
       )));
       init();
-    });
+    }));
 
     it('should not show the vocabulary tree link', () => {
       expect(showVocabularyTreeLink).toBeNull();
@@ -103,12 +103,12 @@ describe('SearchHierarchyFilterComponent', () => {
 
   describe('if the vocabulary exists', () => {
 
-    beforeEach(() => {
+    beforeEach(waitForAsync(() => {
       spyOn(vocabularyService, 'searchTopEntries').and.returnValue(observableOf(new RemoteData(
         undefined, 0, 0, RequestEntryState.Success, undefined, buildPaginatedList(new PageInfo(), []), 200
       )));
       init();
-    });
+    }));
 
     it('should show the vocabulary tree link', () => {
       expect(showVocabularyTreeLink).toBeTruthy();

From 742b68b7060fd7aebc4acf25aba9a4c5d0d57dcd Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Fri, 9 Dec 2022 14:52:41 +0100
Subject: [PATCH 038/160] 97183 Minor fixes (code review)

---
 src/app/menu.resolver.spec.ts       | 6 ++++++
 src/app/menu.resolver.ts            | 6 +++---
 src/app/shared/menu/menu.service.ts | 3 +--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/app/menu.resolver.spec.ts b/src/app/menu.resolver.spec.ts
index afe053d1d4..eb49fe1a11 100644
--- a/src/app/menu.resolver.spec.ts
+++ b/src/app/menu.resolver.spec.ts
@@ -319,6 +319,12 @@ describe('MenuResolver', () => {
         });
       });
 
+      it('should show new_process', () => {
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'new_process', visible: true,
+        }))
+      });
+
       it('should contain site admin section', () => {
         expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
           id: 'admin_search', visible: true,
diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts
index 933014c93a..eb13e3ec8b 100644
--- a/src/app/menu.resolver.ts
+++ b/src/app/menu.resolver.ts
@@ -215,7 +215,7 @@ export class MenuResolver implements Resolve<boolean> {
           id: 'new_process',
           parentID: 'new',
           active: false,
-          visible: isCollectionAdmin,
+          visible: isSiteAdmin,
           model: {
             type: MenuItemType.LINK,
             text: 'menu.section.new_process',
@@ -268,7 +268,7 @@ export class MenuResolver implements Resolve<boolean> {
       const newSubMenu = {
         id: 'new',
         active: false,
-        visible: newSubMenuList.map(subMenu => subMenu.visible).reduce((x,y) => x || y),
+        visible: newSubMenuList.some(subMenu => subMenu.visible),
         model: {
           type: MenuItemType.TEXT,
           text: 'menu.section.new'
@@ -279,7 +279,7 @@ export class MenuResolver implements Resolve<boolean> {
       const editSubMenu = {
         id: 'edit',
         active: false,
-        visible: editSubMenuList.map(subMenu => subMenu.visible).reduce((x,y) => x || y),
+        visible: editSubMenuList.some(subMenu => subMenu.visible),
         model: {
           type: MenuItemType.TEXT,
           text: 'menu.section.edit'
diff --git a/src/app/shared/menu/menu.service.ts b/src/app/shared/menu/menu.service.ts
index eeb6c0f2c2..087145ae82 100644
--- a/src/app/shared/menu/menu.service.ts
+++ b/src/app/shared/menu/menu.service.ts
@@ -213,8 +213,7 @@ export class MenuService {
     return this.getMenu(menuID).pipe(
       map((state: MenuState) => hasValue(state)
         ? Object.values(state.sections)
-          .map(section => section.visible && section.parentID === undefined)
-          .reduce((x,y) => x || y, false)
+          .some(section => section.visible && section.parentID === undefined)
         : undefined)
     );
   }

From 69bd324da52c014148f49947e1a91606556c0f7f Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Mon, 12 Dec 2022 10:01:04 +0100
Subject: [PATCH 039/160] 97183 Fix linter issue

---
 src/app/menu.resolver.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/menu.resolver.spec.ts b/src/app/menu.resolver.spec.ts
index eb49fe1a11..c647178c88 100644
--- a/src/app/menu.resolver.spec.ts
+++ b/src/app/menu.resolver.spec.ts
@@ -322,7 +322,7 @@ describe('MenuResolver', () => {
       it('should show new_process', () => {
         expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
           id: 'new_process', visible: true,
-        }))
+        }));
       });
 
       it('should contain site admin section', () => {

From e31781b5d054961aa86d564430ba3731b7913eb6 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Mon, 12 Dec 2022 10:07:00 +0100
Subject: [PATCH 040/160] 97183 Fix linter issue, again

---
 src/app/menu.resolver.spec.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/menu.resolver.spec.ts b/src/app/menu.resolver.spec.ts
index c647178c88..eef5c2d5af 100644
--- a/src/app/menu.resolver.spec.ts
+++ b/src/app/menu.resolver.spec.ts
@@ -19,7 +19,6 @@ import { cold } from 'jasmine-marbles';
 import createSpy = jasmine.createSpy;
 import { createSuccessfulRemoteDataObject$ } from './shared/remote-data.utils';
 import { createPaginatedList } from './shared/testing/utils.test';
-import { Feature } from './core/shared/feature.model';
 
 const BOOLEAN = { t: true, f: false };
 const MENU_STATE = {

From 105308cdf8bc814b5c37df667cccbfb97d60593a Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 12 Dec 2022 11:18:31 +0100
Subject: [PATCH 041/160] 97049: Fixing inconsistent tests

---
 .../search-hierarchy-filter.component.spec.ts | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
index 29d033fb17..add8061e58 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -89,29 +89,31 @@ describe('SearchHierarchyFilterComponent', () => {
 
   describe('if the vocabulary doesn\'t exist', () => {
 
-    beforeEach(waitForAsync(() => {
+    beforeEach(() => {
       spyOn(vocabularyService, 'searchTopEntries').and.returnValue(observableOf(new RemoteData(
         undefined, 0, 0, RequestEntryState.Error, undefined, undefined, 404
       )));
       init();
-    }));
+    });
 
-    it('should not show the vocabulary tree link', () => {
+    it('should not show the vocabulary tree link', (done) => {
       expect(showVocabularyTreeLink).toBeNull();
+      done();
     });
   });
 
   describe('if the vocabulary exists', () => {
 
-    beforeEach(waitForAsync(() => {
+    beforeEach(() => {
       spyOn(vocabularyService, 'searchTopEntries').and.returnValue(observableOf(new RemoteData(
         undefined, 0, 0, RequestEntryState.Success, undefined, buildPaginatedList(new PageInfo(), []), 200
       )));
       init();
-    }));
+    });
 
-    it('should show the vocabulary tree link', () => {
+    it('should show the vocabulary tree link', (done) => {
       expect(showVocabularyTreeLink).toBeTruthy();
+      done();
     });
 
     describe('when clicking the vocabulary tree link', () => {
@@ -120,8 +122,9 @@ describe('SearchHierarchyFilterComponent', () => {
         showVocabularyTreeLink.nativeElement.click();
       });
 
-      it('should open the vocabulary tree modal', () => {
+      it('should open the vocabulary tree modal', (done) => {
         expect(ngbModal.open).toHaveBeenCalled();
+        done();
       });
 
       describe('when selecting a value from the vocabulary tree', () => {
@@ -141,7 +144,7 @@ describe('SearchHierarchyFilterComponent', () => {
           }));
         });
 
-        it('should add a new search filter to the existing search filters', () => {
+        it('should add a new search filter to the existing search filters', (done) => {
           expect(router.navigate).toHaveBeenCalledWith([testSearchLink], {
             queryParams: {
               [`f.${testSearchFilter}`]: [
@@ -151,6 +154,7 @@ describe('SearchHierarchyFilterComponent', () => {
             },
             queryParamsHandling: 'merge',
           });
+          done();
         });
       });
     });

From 1af1d511d0ebd7e6315cbcf648dc1a00f8c1d524 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 12 Dec 2022 11:23:19 +0100
Subject: [PATCH 042/160] 97049: Lint issue

---
 .../search-hierarchy-filter.component.spec.ts                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
index add8061e58..165db5e43b 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -1,5 +1,5 @@
 import { SearchHierarchyFilterComponent } from './search-hierarchy-filter.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { DebugElement, EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';

From 3c9623a2b00634008f1092a589ddb63ec0def52f Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 12 Dec 2022 13:26:45 +0100
Subject: [PATCH 043/160] 97075: Feedback 2022-12-09 - improvements

---
 .../dso-edit-metadata/dso-edit-metadata-form.ts        |  6 ++++--
 .../dso-edit-metadata/dso-edit-metadata.component.html |  7 ++++---
 .../dso-edit-metadata/dso-edit-metadata.component.scss | 10 +++++-----
 src/styles/_custom_variables.scss                      |  4 ++++
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
index 9e5f2c22e1..2bbc923187 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
@@ -67,7 +67,7 @@ export class DsoEditMetadataValue {
    * the original value
    * It will also set the editing flag to false
    */
-  confirmChanges() {
+  confirmChanges(finishEditing = false) {
     if (hasNoValue(this.change) || this.change === DsoEditMetadataChangeType.UPDATE) {
       if ((this.originalValue.value !== this.newValue.value || this.originalValue.language !== this.newValue.language)) {
         this.change = DsoEditMetadataChangeType.UPDATE;
@@ -75,7 +75,9 @@ export class DsoEditMetadataValue {
         this.change = undefined;
       }
     }
-    this.editing = false;
+    if (finishEditing) {
+      this.editing = false;
+    }
   }
 
   /**
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index d3d1ee1596..b9ad2b7162 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -31,7 +31,7 @@
   </div>
   <div class="d-flex flex-row ds-field-row" *ngIf="form.newValue">
     <div class="lbl-cell ds-success">
-      <ds-metadata-field-selector [(mdField)]="newMdField" [autofocus]="true"></ds-metadata-field-selector>
+      <ds-metadata-field-selector [dsoType]="dsoType" [(mdField)]="newMdField" [autofocus]="true"></ds-metadata-field-selector>
     </div>
     <div class="flex-grow-1 ds-drop-list">
       <div class="d-flex flex-row ds-value-row ds-success h-100">
@@ -74,7 +74,8 @@
            *ngFor="let mdValue of form.fields[mdField]; let idx = index">
         <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex align-items-center">
           <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing">{{ mdValue.newValue.value }}</div>
-          <textarea class="form-control" rows="2" *ngIf="mdValue.editing" [(ngModel)]="mdValue.newValue.value" ></textarea>
+          <textarea class="form-control" rows="2" *ngIf="mdValue.editing" [(ngModel)]="mdValue.newValue.value"
+                    [dsDebounce]="300" (onDebounce)="mdValue.confirmChanges(); form.resetReinstatable(); onValueSaved()"></textarea>
         </div>
         <div class="ds-flex-cell ds-lang-cell">
           <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing">{{ mdValue.newValue.language }}</div>
@@ -87,7 +88,7 @@
               <i class="fas fa-edit fa-fw"></i>
             </button>
             <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}" *ngIf="mdValue.editing"
-                    [disabled]="(saving$ | async)" (click)="mdValue.confirmChanges(); form.resetReinstatable(); onValueSaved()">
+                    [disabled]="(saving$ | async)" (click)="mdValue.confirmChanges(true); form.resetReinstatable(); onValueSaved()">
               <i class="fas fa-check fa-fw"></i>
             </button>
             <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
index 8e038d7ef8..954d15d10d 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
@@ -1,6 +1,6 @@
 .lbl-cell {
-  min-width: 210px;
-  max-width: 210px;
+  min-width: var(--ds-dso-edit-field-width);
+  max-width: var(--ds-dso-edit-field-width);
   background-color: var(--bs-gray-100);
   font-weight: bold;
 
@@ -17,12 +17,12 @@
 }
 
 .ds-lang-cell {
-  min-width: 90px;
-  max-width: 90px;
+  min-width: var(--ds-dso-edit-lang-width);
+  max-width: var(--ds-dso-edit-lang-width);
 }
 
 .ds-edit-cell {
-  min-width: 173px;
+  min-width: var(--ds-dso-edit-actions-width);
 }
 
 .ds-value-row {
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 66e0e87f93..e01018c044 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -85,4 +85,8 @@
   --ds-slider-handle-width: 18px;
 
   --ds-search-form-scope-max-width: 150px;
+
+  --ds-dso-edit-field-width: 210px;
+  --ds-dso-edit-lang-width: 90px;
+  --ds-dso-edit-actions-width: 173px;
 }

From 1ca217e748dafa3a95dc1bf8974f8e60b40a8b9e Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 12 Dec 2022 16:28:01 +0100
Subject: [PATCH 044/160] 97075: Feedback 2022-12-09 - splitting into multiple
 components

---
 ...-edit-metadata-field-values.component.html | 12 +++
 ...-edit-metadata-field-values.component.scss |  3 +
 ...so-edit-metadata-field-values.component.ts | 45 +++++++++
 .../dso-edit-metadata-headers.component.html  | 10 ++
 .../dso-edit-metadata-headers.component.scss  | 12 +++
 .../dso-edit-metadata-headers.component.ts    | 17 ++++
 .../dso-edit-metadata-cells.scss              | 49 +++++++++
 .../dso-edit-metadata-value.component.html    | 37 +++++++
 .../dso-edit-metadata-value.component.scss    |  8 ++
 .../dso-edit-metadata-value.component.ts      | 62 ++++++++++++
 .../dso-edit-metadata.component.html          | 99 ++++---------------
 .../dso-edit-metadata.component.scss          | 62 +-----------
 .../dso-edit-metadata.component.ts            | 28 ++++--
 src/app/dso-shared/dso-shared.module.ts       |  6 ++
 14 files changed, 304 insertions(+), 146 deletions(-)
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.scss
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.html
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.scss
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.ts
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts

diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
new file mode 100644
index 0000000000..b600e6a228
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
@@ -0,0 +1,12 @@
+<div class="flex-grow-1 ds-drop-list">
+  <ds-dso-edit-metadata-value *ngFor="let mdValue of form.fields[mdField]; let idx = index"
+                              [mdValue]="mdValue"
+                              [dsoType]="dsoType"
+                              [saving$]="saving$"
+                              [isOnlyValue]="form.fields[mdField].length === 1"
+                              (edit)="mdValue.editing = true"
+                              (confirm)="mdValue.confirmChanges($event); form.resetReinstatable(); valueSaved.emit()"
+                              (remove)="mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE; form.resetReinstatable(); valueSaved.emit()"
+                              (undo)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.discard(); valueSaved.emit()">
+  </ds-dso-edit-metadata-value>
+</div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.scss
new file mode 100644
index 0000000000..afe5084bc2
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.scss
@@ -0,0 +1,3 @@
+.ds-drop-list {
+  background-color: var(--bs-gray-500);
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
new file mode 100644
index 0000000000..b24eccd16c
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
@@ -0,0 +1,45 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { DsoEditMetadataChangeType, DsoEditMetadataForm } from '../dso-edit-metadata-form';
+import { Observable } from 'rxjs/internal/Observable';
+
+@Component({
+  selector: 'ds-dso-edit-metadata-field-values',
+  styleUrls: ['./dso-edit-metadata-field-values.component.scss'],
+  templateUrl: './dso-edit-metadata-field-values.component.html',
+})
+/**
+ * Component displaying table rows for each value for a certain metadata field within a form
+ */
+export class DsoEditMetadataFieldValuesComponent {
+  /**
+   * A dynamic form object containing all information about the metadata and the changes made to them, see {@link DsoEditMetadataForm}
+   */
+  @Input() form: DsoEditMetadataForm;
+
+  /**
+   * Metadata field to display values for
+   */
+  @Input() mdField: string;
+
+  /**
+   * Type of DSO we're displaying values for
+   * Determines i18n messages
+   */
+  @Input() dsoType: string;
+
+  /**
+   * Observable to check if the form is being saved or not
+   */
+  @Input() saving$: Observable<boolean>;
+
+  /**
+   * Emit when the value has been saved within the form
+   */
+  @Output() valueSaved: EventEmitter<any> = new EventEmitter<any>();
+
+  /**
+   * The DsoEditMetadataChangeType enumeration for access in the component's template
+   * @type {DsoEditMetadataChangeType}
+   */
+  public DsoEditMetadataChangeTypeEnum = DsoEditMetadataChangeType;
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.html
new file mode 100644
index 0000000000..ecaf2aa744
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.html
@@ -0,0 +1,10 @@
+<div class="d-flex flex-row ds-field-row ds-header-row">
+  <div class="lbl-cell">{{ dsoType + '.edit.metadata.headers.field' | translate }}</div>
+  <div class="flex-grow-1">
+    <div class="d-flex flex-row">
+      <div class="flex-grow-1 ds-flex-cell ds-value-cell"><b class="dont-break-out preserve-line-breaks">{{ dsoType + '.edit.metadata.headers.value' | translate }}</b></div>
+      <div class="ds-flex-cell ds-lang-cell"><b>{{ dsoType + '.edit.metadata.headers.language' | translate }}</b></div>
+      <div class="text-center ds-flex-cell ds-edit-cell"><b>{{ dsoType + '.edit.metadata.headers.edit' | translate }}</b></div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.scss
new file mode 100644
index 0000000000..d46751d4b0
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.scss
@@ -0,0 +1,12 @@
+.lbl-cell {
+  min-width: var(--ds-dso-edit-field-width);
+  max-width: var(--ds-dso-edit-field-width);
+  background-color: var(--bs-gray-100);
+  font-weight: bold;
+  padding: 1rem;
+  border: 1px solid var(--bs-gray-200);
+}
+
+.ds-header-row {
+  background-color: var(--bs-gray-100);
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.ts
new file mode 100644
index 0000000000..9c21c8ac9e
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.ts
@@ -0,0 +1,17 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'ds-dso-edit-metadata-headers',
+  styleUrls: ['./dso-edit-metadata-headers.component.scss', '../dso-edit-metadata-shared/dso-edit-metadata-cells.scss'],
+  templateUrl: './dso-edit-metadata-headers.component.html',
+})
+/**
+ * Component displaying the header table row for DSO edit metadata page
+ */
+export class DsoEditMetadataHeadersComponent {
+  /**
+   * Type of DSO we're displaying values for
+   * Determines i18n messages
+   */
+  @Input() dsoType: string;
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss
new file mode 100644
index 0000000000..20d479ac88
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss
@@ -0,0 +1,49 @@
+.ds-field-row {
+  border: 1px solid var(--bs-gray-400);
+}
+
+.ds-flex-cell {
+  padding: 1rem;
+  border: 1px solid var(--bs-gray-200);
+}
+
+.ds-lang-cell {
+  min-width: var(--ds-dso-edit-lang-width);
+  max-width: var(--ds-dso-edit-lang-width);
+}
+
+.ds-edit-cell {
+  min-width: var(--ds-dso-edit-actions-width);
+}
+
+.ds-value-row {
+  background-color: white;
+
+  &:active {
+    cursor: grabbing;
+  }
+
+  &.ds-warning {
+    background-color: var(--bs-warning-bg);
+
+    .ds-flex-cell {
+      border: 1px solid var(--bs-warning);
+    }
+  }
+
+  &.ds-danger {
+    background-color: var(--bs-danger-bg);
+
+    .ds-flex-cell {
+      border: 1px solid var(--bs-danger);
+    }
+  }
+
+  &.ds-success {
+    background-color: var(--bs-success-bg);
+
+    .ds-flex-cell {
+      border: 1px solid var(--bs-success);
+    }
+  }
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
new file mode 100644
index 0000000000..b9da828bd4
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
@@ -0,0 +1,37 @@
+<div class="d-flex flex-row ds-value-row"
+     [ngClass]="{ 'ds-warning': mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD, 'h-100': isOnlyValue }">
+  <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex align-items-center">
+    <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing">{{ mdValue.newValue.value }}</div>
+    <textarea class="form-control" rows="2" *ngIf="mdValue.editing" [(ngModel)]="mdValue.newValue.value"
+              [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
+  </div>
+  <div class="ds-flex-cell ds-lang-cell">
+    <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing">{{ mdValue.newValue.language }}</div>
+    <input class="form-control" type="text" *ngIf="mdValue.editing" [(ngModel)]="mdValue.newValue.language" />
+  </div>
+  <div class="text-center ds-flex-cell ds-edit-cell">
+    <div class="btn-group edit-field">
+      <button class="btn btn-outline-primary btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}" *ngIf="!mdValue.editing"
+              [disabled]="mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="edit.emit()">
+        <i class="fas fa-edit fa-fw"></i>
+      </button>
+      <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}" *ngIf="mdValue.editing"
+              [disabled]="(saving$ | async)" (click)="confirm.emit(true)">
+        <i class="fas fa-check fa-fw"></i>
+      </button>
+      <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
+              [disabled]="mdValue.change || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
+        <i class="fas fa-trash-alt fa-fw"></i>
+      </button>
+      <button class="btn btn-outline-warning btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
+              [disabled]="(!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
+        <i class="fas fa-undo-alt fa-fw"></i>
+      </button>
+      <!-- TODO: Enable drag -->
+      <button class="btn btn-outline-secondary ds-drag-handle btn-sm"
+              [ngClass]="{'disabled': isOnlyValue || (saving$ | async)}" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}" [disabled]="isOnlyValue || (saving$ | async)">
+        <i class="fas fa-grip-vertical fa-fw"></i>
+      </button>
+    </div>
+  </div>
+</div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
new file mode 100644
index 0000000000..926dc6f471
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
@@ -0,0 +1,8 @@
+.ds-success {
+  background-color: var(--bs-success-bg);
+  border: 1px solid var(--bs-success);
+}
+
+.ds-drag-handle:not(.disabled) {
+  cursor: grab;
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
new file mode 100644
index 0000000000..767bcf70bc
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
@@ -0,0 +1,62 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { DsoEditMetadataChangeType, DsoEditMetadataValue } from '../dso-edit-metadata-form';
+import { Observable } from 'rxjs/internal/Observable';
+
+@Component({
+  selector: 'ds-dso-edit-metadata-value',
+  styleUrls: ['./dso-edit-metadata-value.component.scss', '../dso-edit-metadata-shared/dso-edit-metadata-cells.scss'],
+  templateUrl: './dso-edit-metadata-value.component.html',
+})
+/**
+ * Component displaying a single editable row for a metadata value
+ */
+export class DsoEditMetadataValueComponent {
+  /**
+   * Editable metadata value to show
+   */
+  @Input() mdValue: DsoEditMetadataValue;
+
+  /**
+   * Type of DSO we're displaying values for
+   * Determines i18n messages
+   */
+  @Input() dsoType: string;
+
+  /**
+   * Observable to check if the form is being saved or not
+   * Will disable certain functionality while saving
+   */
+  @Input() saving$: Observable<boolean>;
+
+  /**
+   * Is this value the only one within its list?
+   * Will disable certain functionality like dragging (because dragging within a list of 1 is pointless)
+   */
+  @Input() isOnlyValue = false;
+
+  /**
+   * Emits when the user clicked edit
+   */
+  @Output() edit: EventEmitter<any> = new EventEmitter<any>();
+
+  /**
+   * Emits when the user clicked confirm
+   */
+  @Output() confirm: EventEmitter<boolean> = new EventEmitter<boolean>();
+
+  /**
+   * Emits when the user clicked remove
+   */
+  @Output() remove: EventEmitter<any> = new EventEmitter<any>();
+
+  /**
+   * Emits when the user clicked undo
+   */
+  @Output() undo: EventEmitter<any> = new EventEmitter<any>();
+
+  /**
+   * The DsoEditMetadataChangeType enumeration for access in the component's template
+   * @type {DsoEditMetadataChangeType}
+   */
+  public DsoEditMetadataChangeTypeEnum = DsoEditMetadataChangeType;
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index b9ad2b7162..026490da7c 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -19,95 +19,36 @@
     </button>
   </div>
 
-  <div class="d-flex flex-row ds-field-row ds-header-row">
-    <div class="lbl-cell">{{ dsoType + '.edit.metadata.headers.field' | translate }}</div>
-    <div class="flex-grow-1">
-      <div class="d-flex flex-row">
-        <div class="flex-grow-1 ds-flex-cell ds-value-cell"><b class="dont-break-out preserve-line-breaks">{{ dsoType + '.edit.metadata.headers.value' | translate }}</b></div>
-        <div class="ds-flex-cell ds-lang-cell"><b>{{ dsoType + '.edit.metadata.headers.language' | translate }}</b></div>
-        <div class="text-center ds-flex-cell ds-edit-cell"><b>{{ dsoType + '.edit.metadata.headers.edit' | translate }}</b></div>
-      </div>
-    </div>
-  </div>
+  <ds-dso-edit-metadata-headers [dsoType]="dsoType"></ds-dso-edit-metadata-headers>
   <div class="d-flex flex-row ds-field-row" *ngIf="form.newValue">
     <div class="lbl-cell ds-success">
-      <ds-metadata-field-selector [dsoType]="dsoType" [(mdField)]="newMdField" [autofocus]="true"></ds-metadata-field-selector>
+      <ds-metadata-field-selector [dsoType]="dsoType"
+                                  [(mdField)]="newMdField"
+                                  [autofocus]="true">
+      </ds-metadata-field-selector>
     </div>
     <div class="flex-grow-1 ds-drop-list">
-      <div class="d-flex flex-row ds-value-row ds-success h-100">
-        <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex align-items-center">
-          <textarea class="form-control" rows="2" [(ngModel)]="form.newValue.newValue.value"></textarea>
-        </div>
-        <div class="ds-flex-cell ds-lang-cell">
-          <input class="form-control" type="text" [(ngModel)]="form.newValue.newValue.language" />
-        </div>
-        <div class="text-center ds-flex-cell ds-edit-cell">
-          <div class="btn-group edit-field">
-            <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}"
-                    [disabled]="!newMdField || (saving$ | async) || (loadingFieldValidation$ | async)" (click)="setMetadataField()">
-              <i class="fas fa-check fa-fw"></i>
-            </button>
-            <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
-                    [disabled]="true">
-              <i class="fas fa-trash-alt fa-fw"></i>
-            </button>
-            <button class="btn btn-outline-warning btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
-                    [disabled]="(saving$ | async) || (loadingFieldValidation$ | async)" (click)="form.newValue = undefined">
-              <i class="fas fa-undo-alt fa-fw"></i>
-            </button>
-            <button class="btn btn-outline-secondary ds-drag-handle btn-sm disabled" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}"
-                    [disabled]="true">
-              <i class="fas fa-grip-vertical fa-fw"></i>
-            </button>
-          </div>
-        </div>
-      </div>
+      <ds-dso-edit-metadata-value [mdValue]="form.newValue"
+                                  [dsoType]="dsoType"
+                                  [saving$]="savingOrLoadingFieldValidation$"
+                                  [isOnlyValue]="true"
+                                  (confirm)="confirmNewValue($event)"
+                                  (remove)="form.newValue = undefined"
+                                  (undo)="form.newValue = undefined">
+      </ds-dso-edit-metadata-value>
     </div>
   </div>
   <div class="d-flex flex-row ds-field-row" *ngFor="let mdField of form.fieldKeys">
     <div class="lbl-cell">
       <span class="dont-break-out preserve-line-breaks">{{ mdField }}</span>
     </div>
-    <div class="flex-grow-1 ds-drop-list">
-      <div class="d-flex flex-row ds-value-row"
-           [ngClass]="{ 'ds-warning': mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD, 'h-100': form.fields[mdField].length === 1 }"
-           *ngFor="let mdValue of form.fields[mdField]; let idx = index">
-        <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex align-items-center">
-          <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing">{{ mdValue.newValue.value }}</div>
-          <textarea class="form-control" rows="2" *ngIf="mdValue.editing" [(ngModel)]="mdValue.newValue.value"
-                    [dsDebounce]="300" (onDebounce)="mdValue.confirmChanges(); form.resetReinstatable(); onValueSaved()"></textarea>
-        </div>
-        <div class="ds-flex-cell ds-lang-cell">
-          <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing">{{ mdValue.newValue.language }}</div>
-          <input class="form-control" type="text" *ngIf="mdValue.editing" [(ngModel)]="mdValue.newValue.language" />
-        </div>
-        <div class="text-center ds-flex-cell ds-edit-cell">
-          <div class="btn-group edit-field">
-            <button class="btn btn-outline-primary btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}" *ngIf="!mdValue.editing"
-                    [disabled]="mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="mdValue.editing = true">
-              <i class="fas fa-edit fa-fw"></i>
-            </button>
-            <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}" *ngIf="mdValue.editing"
-                    [disabled]="(saving$ | async)" (click)="mdValue.confirmChanges(true); form.resetReinstatable(); onValueSaved()">
-              <i class="fas fa-check fa-fw"></i>
-            </button>
-            <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
-                    [disabled]="mdValue.change || mdValue.editing || (saving$ | async)" (click)="mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE; form.resetReinstatable(); onValueSaved()">
-              <i class="fas fa-trash-alt fa-fw"></i>
-            </button>
-            <button class="btn btn-outline-warning btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
-                    [disabled]="(!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.discard(); onValueSaved()">
-              <i class="fas fa-undo-alt fa-fw"></i>
-            </button>
-            <!-- TODO: Enable drag -->
-            <button class="btn btn-outline-secondary ds-drag-handle btn-sm"
-                    [ngClass]="{'disabled': form.fields[mdField].length === 1 || (saving$ | async)}" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}" [disabled]="form.fields[mdField].length === 1 || (saving$ | async)">
-              <i class="fas fa-grip-vertical fa-fw"></i>
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
+    <ds-dso-edit-metadata-field-values class="flex-grow-1"
+                                       [form]="form"
+                                       [dsoType]="dsoType"
+                                       [saving$]="saving$"
+                                       [mdField]="mdField"
+                                       (valueSaved)="onValueSaved()">
+    </ds-dso-edit-metadata-field-values>
   </div>
 
   <div *ngIf="isEmpty">
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
index 954d15d10d..caf84010f3 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
@@ -3,6 +3,8 @@
   max-width: var(--ds-dso-edit-field-width);
   background-color: var(--bs-gray-100);
   font-weight: bold;
+  padding: 1rem;
+  border: 1px solid var(--bs-gray-200);
 
   &.ds-success {
     background-color: var(--bs-success-bg);
@@ -10,66 +12,6 @@
   }
 }
 
-.lbl-cell,
-.ds-flex-cell {
-  padding: 1rem;
-  border: 1px solid var(--bs-gray-200);
-}
-
-.ds-lang-cell {
-  min-width: var(--ds-dso-edit-lang-width);
-  max-width: var(--ds-dso-edit-lang-width);
-}
-
-.ds-edit-cell {
-  min-width: var(--ds-dso-edit-actions-width);
-}
-
-.ds-value-row {
-  background-color: white;
-
-  &:active {
-    cursor: grabbing;
-  }
-
-  &.ds-warning {
-    background-color: var(--bs-warning-bg);
-
-    .ds-flex-cell {
-      border: 1px solid var(--bs-warning);
-    }
-  }
-
-  &.ds-danger {
-    background-color: var(--bs-danger-bg);
-
-    .ds-flex-cell {
-      border: 1px solid var(--bs-danger);
-    }
-  }
-
-  &.ds-success {
-    background-color: var(--bs-success-bg);
-
-    .ds-flex-cell {
-      border: 1px solid var(--bs-success);
-    }
-  }
-}
-
-.ds-drop-list {
-  background-color: var(--bs-gray-500);
-}
-
 .ds-field-row {
   border: 1px solid var(--bs-gray-400);
 }
-
-
-.ds-header-row {
-  background-color: var(--bs-gray-100);
-}
-
-.ds-drag-handle:not(.disabled) {
-  cursor: grab;
-}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
index 2f6f32c1c1..bc7bfd9593 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -1,7 +1,7 @@
 import { Component, Injector, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { AlertType } from '../../shared/alert/aletr-type';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { DsoEditMetadataChangeType, DsoEditMetadataForm } from './dso-edit-metadata-form';
+import { DsoEditMetadataForm } from './dso-edit-metadata-form';
 import { map } from 'rxjs/operators';
 import { ActivatedRoute, Data } from '@angular/router';
 import { combineLatest as observableCombineLatest } from 'rxjs/internal/observable/combineLatest';
@@ -18,6 +18,7 @@ import { ResourceType } from '../../core/shared/resource-type';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { MetadataFieldSelectorComponent } from './metadata-field-selector/metadata-field-selector.component';
+import { Observable } from 'rxjs/internal/Observable';
 
 @Component({
   selector: 'ds-dso-edit-metadata',
@@ -76,18 +77,18 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
    */
   loadingFieldValidation$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
+  /**
+   * Combination of saving$ and loadingFieldValidation$
+   * Emits true when any of the two emit true
+   */
+  savingOrLoadingFieldValidation$: Observable<boolean>;
+
   /**
    * The AlertType enumeration for access in the component's template
    * @type {AlertType}
    */
   public AlertTypeEnum = AlertType;
 
-  /**
-   * The DsoEditMetadataChangeType enumeration for access in the component's template
-   * @type {DsoEditMetadataChangeType}
-   */
-  public DsoEditMetadataChangeTypeEnum = DsoEditMetadataChangeType;
-
   /**
    * Subscription for updating the current DSpaceObject
    * Unsubscribed from in ngOnDestroy()
@@ -118,6 +119,9 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
       this.initDataService();
       this.initForm();
     }
+    this.savingOrLoadingFieldValidation$ = observableCombineLatest([this.saving$, this.loadingFieldValidation$]).pipe(
+      map(([saving, loading]) => saving || loading),
+    );
   }
 
   /**
@@ -180,6 +184,16 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
     });
   }
 
+  /**
+   * Confirm the newly added value
+   * @param saved Whether or not the value was manually saved (only then, add the value to its metadata field)
+   */
+  confirmNewValue(saved: boolean) {
+    if (saved) {
+      this.setMetadataField();
+    }
+  }
+
   /**
    * Set the metadata field of the temporary added new metadata value
    * This will move the new value to its respective parent metadata field
diff --git a/src/app/dso-shared/dso-shared.module.ts b/src/app/dso-shared/dso-shared.module.ts
index 263d394906..0a9294105b 100644
--- a/src/app/dso-shared/dso-shared.module.ts
+++ b/src/app/dso-shared/dso-shared.module.ts
@@ -2,6 +2,9 @@ import { NgModule } from '@angular/core';
 import { SharedModule } from '../shared/shared.module';
 import { DsoEditMetadataComponent } from './dso-edit-metadata/dso-edit-metadata.component';
 import { MetadataFieldSelectorComponent } from './dso-edit-metadata/metadata-field-selector/metadata-field-selector.component';
+import { DsoEditMetadataFieldValuesComponent } from './dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component';
+import { DsoEditMetadataValueComponent } from './dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component';
+import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component';
 
 @NgModule({
   imports: [
@@ -10,6 +13,9 @@ import { MetadataFieldSelectorComponent } from './dso-edit-metadata/metadata-fie
   declarations: [
     DsoEditMetadataComponent,
     MetadataFieldSelectorComponent,
+    DsoEditMetadataFieldValuesComponent,
+    DsoEditMetadataValueComponent,
+    DsoEditMetadataHeadersComponent,
   ],
   exports: [
     DsoEditMetadataComponent,

From 454bfd2f9fb3488e67cc0728e4583a8a8e4b484f Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 12 Dec 2022 16:32:13 +0100
Subject: [PATCH 045/160] 97075: Feedback 2022-12-09 - debounce on language
 input

---
 .../dso-edit-metadata-value.component.html                     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
index b9da828bd4..458b9d9e82 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
@@ -7,7 +7,8 @@
   </div>
   <div class="ds-flex-cell ds-lang-cell">
     <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing">{{ mdValue.newValue.language }}</div>
-    <input class="form-control" type="text" *ngIf="mdValue.editing" [(ngModel)]="mdValue.newValue.language" />
+    <input class="form-control" type="text" *ngIf="mdValue.editing" [(ngModel)]="mdValue.newValue.language"
+           [dsDebounce]="300" (onDebounce)="confirm.emit(false)" />
   </div>
   <div class="text-center ds-flex-cell ds-edit-cell">
     <div class="btn-group edit-field">

From 50f7211947193e41abe4504590270fe0a0220c4d Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 13 Dec 2022 14:38:53 +0100
Subject: [PATCH 046/160] 93746: Edit metadata redesign - Virtual metadata

---
 src/app/core/data/relationship.service.ts     | 37 +++++++++++-
 ...-edit-metadata-field-values.component.html |  3 +-
 ...so-edit-metadata-field-values.component.ts |  6 ++
 .../dso-edit-metadata-value.component.html    | 46 ++++++++-------
 .../dso-edit-metadata-value.component.ts      | 56 ++++++++++++++++++-
 .../dso-edit-metadata.component.html          |  4 +-
 .../metadata-representation-list.component.ts | 33 +----------
 src/assets/i18n/en.json5                      |  2 +
 8 files changed, 130 insertions(+), 57 deletions(-)

diff --git a/src/app/core/data/relationship.service.ts b/src/app/core/data/relationship.service.ts
index b99541f3c5..50a4888343 100644
--- a/src/app/core/data/relationship.service.ts
+++ b/src/app/core/data/relationship.service.ts
@@ -1,7 +1,7 @@
 import { HttpClient, 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';
+import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
 import { distinctUntilChanged, filter, map, mergeMap, startWith, switchMap, take, tap } from 'rxjs/operators';
 import {
   compareArraysUsingIds, PAGINATED_RELATIONS_TO_ITEMS_OPERATOR,
@@ -44,6 +44,11 @@ import { DeleteRequest, FindListOptions, PostRequest, RestRequest } from './requ
 import { RequestService } from './request.service';
 import { RequestEntryState } from './request.reducer';
 import { NoContent } from '../shared/NoContent.model';
+import { MetadataValue } from '../shared/metadata.models';
+import { MetadataRepresentation } from '../shared/metadata-representation/metadata-representation.model';
+import { MetadatumRepresentation } from '../shared/metadata-representation/metadatum/metadatum-representation.model';
+import { ItemMetadataRepresentation } from '../shared/metadata-representation/item/item-metadata-representation.model';
+import { DSpaceObject } from '../shared/dspace-object.model';
 
 const relationshipListsStateSelector = (state: AppState) => state.relationshipLists;
 
@@ -523,4 +528,34 @@ export class RelationshipService extends DataService<Relationship> {
       }) as Observable<RemoteData<PaginatedList<Relationship>>>;
 
   }
+
+  /**
+   * Resolve a {@link MetadataValue} into a {@link MetadataRepresentation} of the correct type
+   * @param metadatum   {@link MetadataValue} to resolve
+   * @param parentItem  Parent dspace object the metadata value belongs to
+   * @param itemType    The type of item this metadata value represents (will only be used when no related item can be found, as a fallback)
+   */
+  resolveMetadataRepresentation(metadatum: MetadataValue, parentItem: DSpaceObject, itemType: string): Observable<MetadataRepresentation> {
+    if (metadatum.isVirtual) {
+      return this.findById(metadatum.virtualValue, true, false, followLink('leftItem'), followLink('rightItem')).pipe(
+        getFirstSucceededRemoteData(),
+        switchMap((relRD: RemoteData<Relationship>) =>
+          observableCombineLatest(relRD.payload.leftItem, relRD.payload.rightItem).pipe(
+            filter(([leftItem, rightItem]) => leftItem.hasCompleted && rightItem.hasCompleted),
+            map(([leftItem, rightItem]) => {
+              if (!leftItem.hasSucceeded || !rightItem.hasSucceeded) {
+                return observableOf(Object.assign(new MetadatumRepresentation(itemType), metadatum));
+              } else if (rightItem.hasSucceeded && leftItem.payload.id === parentItem.id) {
+                return rightItem.payload;
+              } else if (rightItem.payload.id === parentItem.id) {
+                return leftItem.payload;
+              }
+            }),
+            map((item: Item) => Object.assign(new ItemMetadataRepresentation(metadatum), item))
+          )
+        ));
+    } else {
+      return observableOf(Object.assign(new MetadatumRepresentation(itemType), metadatum));
+    }
+  }
 }
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
index b600e6a228..6a0386da8e 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
@@ -1,5 +1,6 @@
-<div class="flex-grow-1 ds-drop-list">
+<div class="flex-grow-1 ds-drop-list h-100">
   <ds-dso-edit-metadata-value *ngFor="let mdValue of form.fields[mdField]; let idx = index"
+                              [dso]="dso"
                               [mdValue]="mdValue"
                               [dsoType]="dsoType"
                               [saving$]="saving$"
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
index b24eccd16c..0db427c218 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
@@ -1,6 +1,7 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { DsoEditMetadataChangeType, DsoEditMetadataForm } from '../dso-edit-metadata-form';
 import { Observable } from 'rxjs/internal/Observable';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 
 @Component({
   selector: 'ds-dso-edit-metadata-field-values',
@@ -11,6 +12,11 @@ import { Observable } from 'rxjs/internal/Observable';
  * Component displaying table rows for each value for a certain metadata field within a form
  */
 export class DsoEditMetadataFieldValuesComponent {
+  /**
+   * The parent {@link DSpaceObject} to display a metadata form for
+   * Also used to determine metadata-representations in case of virtual metadata
+   */
+  @Input() dso: DSpaceObject;
   /**
    * A dynamic form object containing all information about the metadata and the changes made to them, see {@link DsoEditMetadataForm}
    */
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
index 458b9d9e82..e72a9e8444 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
@@ -1,9 +1,13 @@
-<div class="d-flex flex-row ds-value-row"
+<div class="d-flex flex-row ds-value-row" *ngVar="mdValue.newValue.isVirtual as isVirtual"
      [ngClass]="{ 'ds-warning': mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD, 'h-100': isOnlyValue }">
-  <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex align-items-center">
-    <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing">{{ mdValue.newValue.value }}</div>
-    <textarea class="form-control" rows="2" *ngIf="mdValue.editing" [(ngModel)]="mdValue.newValue.value"
+  <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex align-items-center" *ngVar="(mdRepresentation$ | async) as mdRepresentation">
+    <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing && !mdRepresentation">{{ mdValue.newValue.value }}</div>
+    <textarea class="form-control" rows="2" *ngIf="mdValue.editing && !mdRepresentation" [(ngModel)]="mdValue.newValue.value"
               [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
+    <div class="d-flex" *ngIf="mdRepresentation">
+      <a class="mr-2" target="_blank" [routerLink]="mdRepresentationItemRoute$ | async">{{ mdRepresentationName$ | async }}</a>
+      <ds-type-badge [object]="mdRepresentation"></ds-type-badge>
+    </div>
   </div>
   <div class="ds-flex-cell ds-lang-cell">
     <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing">{{ mdValue.newValue.language }}</div>
@@ -12,22 +16,24 @@
   </div>
   <div class="text-center ds-flex-cell ds-edit-cell">
     <div class="btn-group edit-field">
-      <button class="btn btn-outline-primary btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}" *ngIf="!mdValue.editing"
-              [disabled]="mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="edit.emit()">
-        <i class="fas fa-edit fa-fw"></i>
-      </button>
-      <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}" *ngIf="mdValue.editing"
-              [disabled]="(saving$ | async)" (click)="confirm.emit(true)">
-        <i class="fas fa-check fa-fw"></i>
-      </button>
-      <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
-              [disabled]="mdValue.change || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
-        <i class="fas fa-trash-alt fa-fw"></i>
-      </button>
-      <button class="btn btn-outline-warning btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
-              [disabled]="(!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
-        <i class="fas fa-undo-alt fa-fw"></i>
-      </button>
+      <div class="btn-group" [ngbTooltip]="isVirtual ? (dsoType + '.edit.metadata.edit.buttons.virtual' | translate) : null">
+        <button class="btn btn-outline-primary btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}" *ngIf="!mdValue.editing"
+                [disabled]="isVirtual || mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="edit.emit()">
+          <i class="fas fa-edit fa-fw"></i>
+        </button>
+        <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}" *ngIf="mdValue.editing"
+                [disabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
+          <i class="fas fa-check fa-fw"></i>
+        </button>
+        <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
+                [disabled]="isVirtual || mdValue.change || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
+          <i class="fas fa-trash-alt fa-fw"></i>
+        </button>
+        <button class="btn btn-outline-warning btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
+                [disabled]="isVirtual || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
+          <i class="fas fa-undo-alt fa-fw"></i>
+        </button>
+      </div>
       <!-- TODO: Enable drag -->
       <button class="btn btn-outline-secondary ds-drag-handle btn-sm"
               [ngClass]="{'disabled': isOnlyValue || (saving$ | async)}" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}" [disabled]="isOnlyValue || (saving$ | async)">
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
index 767bcf70bc..64024ef302 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
@@ -1,6 +1,14 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DsoEditMetadataChangeType, DsoEditMetadataValue } from '../dso-edit-metadata-form';
 import { Observable } from 'rxjs/internal/Observable';
+import { MetadataRepresentationType } from '../../../core/shared/metadata-representation/metadata-representation.model';
+import { RelationshipService } from '../../../core/data/relationship.service';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { of } from 'rxjs/internal/observable/of';
+import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import { map } from 'rxjs/operators';
+import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 
 @Component({
   selector: 'ds-dso-edit-metadata-value',
@@ -10,7 +18,13 @@ import { Observable } from 'rxjs/internal/Observable';
 /**
  * Component displaying a single editable row for a metadata value
  */
-export class DsoEditMetadataValueComponent {
+export class DsoEditMetadataValueComponent implements OnInit {
+  /**
+   * The parent {@link DSpaceObject} to display a metadata form for
+   * Also used to determine metadata-representations in case of virtual metadata
+   */
+  @Input() dso: DSpaceObject;
+
   /**
    * Editable metadata value to show
    */
@@ -59,4 +73,42 @@ export class DsoEditMetadataValueComponent {
    * @type {DsoEditMetadataChangeType}
    */
   public DsoEditMetadataChangeTypeEnum = DsoEditMetadataChangeType;
+
+  /**
+   * The item this metadata value represents in case it's virtual (if any, otherwise null)
+   */
+  mdRepresentation$: Observable<ItemMetadataRepresentation | null>;
+
+  /**
+   * The route to the item represented by this virtual metadata value (otherwise null)
+   */
+  mdRepresentationItemRoute$: Observable<string | null>;
+
+  /**
+   * The name of the item represented by this virtual metadata value (otherwise null)
+   */
+  mdRepresentationName$: Observable<string | null>;
+
+  constructor(protected relationshipService: RelationshipService,
+              protected dsoNameService: DSONameService) {
+  }
+
+  ngOnInit(): void {
+    this.initVirtualProperties();
+  }
+
+  /**
+   * Initialise potential properties of a virtual metadata value
+   */
+  initVirtualProperties() {
+    this.mdRepresentation$ = this.mdValue.newValue.isVirtual ?
+      this.relationshipService.resolveMetadataRepresentation(this.mdValue.newValue, this.dso, 'Item')
+        .pipe(map((mdRepresentation) => mdRepresentation.representationType === MetadataRepresentationType.Item ? mdRepresentation : null)) : of(null);
+    this.mdRepresentationItemRoute$ = this.mdRepresentation$.pipe(
+      map((mdRepresentation) => mdRepresentation ? getItemPageRoute(mdRepresentation) : null),
+    );
+    this.mdRepresentationName$ = this.mdRepresentation$.pipe(
+      map((mdRepresentation) => mdRepresentation ? this.dsoNameService.getName(mdRepresentation) : null),
+    );
+  }
 }
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index 026490da7c..0ca62ff1b6 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -28,7 +28,8 @@
       </ds-metadata-field-selector>
     </div>
     <div class="flex-grow-1 ds-drop-list">
-      <ds-dso-edit-metadata-value [mdValue]="form.newValue"
+      <ds-dso-edit-metadata-value [dso]="dso"
+                                  [mdValue]="form.newValue"
                                   [dsoType]="dsoType"
                                   [saving$]="savingOrLoadingFieldValidation$"
                                   [isOnlyValue]="true"
@@ -43,6 +44,7 @@
       <span class="dont-break-out preserve-line-breaks">{{ mdField }}</span>
     </div>
     <ds-dso-edit-metadata-field-values class="flex-grow-1"
+                                       [dso]="dso"
                                        [form]="form"
                                        [dsoType]="dsoType"
                                        [saving$]="saving$"
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..1b9de34675 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
@@ -1,21 +1,12 @@
 import { Component, Input } from '@angular/core';
 import { MetadataRepresentation } from '../../../core/shared/metadata-representation/metadata-representation.model';
 import {
-  combineLatest as observableCombineLatest,
   Observable,
-  of as observableOf,
   zip as observableZip
 } from 'rxjs';
 import { RelationshipService } from '../../../core/data/relationship.service';
 import { MetadataValue } from '../../../core/shared/metadata.models';
-import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
-import { filter, map, switchMap } from 'rxjs/operators';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
 import { Item } from '../../../core/shared/item.model';
-import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
-import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
 
 @Component({
@@ -85,29 +76,7 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList
       ...metadata
         .slice((this.objects.length * this.incrementBy), (this.objects.length * this.incrementBy) + this.incrementBy)
         .map((metadatum: any) => Object.assign(new MetadataValue(), metadatum))
-        .map((metadatum: MetadataValue) => {
-          if (metadatum.isVirtual) {
-            return this.relationshipService.findById(metadatum.virtualValue, true, false, followLink('leftItem'), followLink('rightItem')).pipe(
-              getFirstSucceededRemoteData(),
-              switchMap((relRD: RemoteData<Relationship>) =>
-                observableCombineLatest(relRD.payload.leftItem, relRD.payload.rightItem).pipe(
-                  filter(([leftItem, rightItem]) => leftItem.hasCompleted && rightItem.hasCompleted),
-                  map(([leftItem, rightItem]) => {
-                    if (!leftItem.hasSucceeded || !rightItem.hasSucceeded) {
-                      return observableOf(Object.assign(new MetadatumRepresentation(this.itemType), metadatum));
-                    } else if (rightItem.hasSucceeded && leftItem.payload.id === this.parentItem.id) {
-                      return rightItem.payload;
-                    } else if (rightItem.payload.id === this.parentItem.id) {
-                      return leftItem.payload;
-                    }
-                  }),
-                  map((item: Item) => Object.assign(new ItemMetadataRepresentation(metadatum), item))
-                )
-              ));
-          } else {
-            return observableOf(Object.assign(new MetadatumRepresentation(this.itemType), metadatum));
-          }
-        })
+        .map((metadatum: MetadataValue) => this.relationshipService.resolveMetadataRepresentation(metadatum, this.parentItem, this.itemType)),
     );
   }
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 93ee1427af..6e9bae138e 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1803,6 +1803,8 @@
 
   "item.edit.metadata.edit.buttons.unedit": "Stop editing",
 
+  "item.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the \"Relationships\" tab",
+
   "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
 
   "item.edit.metadata.headers.edit": "Edit",

From 04e5510c6b1fc168b8d0225b70880cc618d9e9fb Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Tue, 13 Dec 2022 15:01:56 +0100
Subject: [PATCH 047/160] 97049: fix wrong import after merge

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

diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
index 3dd866c5b1..8504237f09 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
@@ -3,7 +3,7 @@ import { renderFacetFor } from '../search-filter-type-decorator';
 import { FilterType } from '../../../models/filter-type.model';
 import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { VocabularyTreeviewComponent } from '../../../../vocabulary-treeview/vocabulary-treeview.component';
+import { VocabularyTreeviewComponent } from '../../../../form/vocabulary-treeview/vocabulary-treeview.component';
 import {
   VocabularyEntryDetail
 } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';

From c2ef6893d37c3c031cb4df698a34f51f81a7fe87 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Tue, 13 Dec 2022 15:12:28 +0100
Subject: [PATCH 048/160] 97049: fix lint issue after merge

---
 .../form/vocabulary-treeview/vocabulary-treeview.component.ts    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
index 4b03a8c2b3..56909090c7 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -9,7 +9,6 @@ import { TranslateService } from '@ngx-translate/core';
 
 import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { hasValue, isEmpty, isNotEmpty } from '../../empty.util';
-import { isAuthenticated } from '../../../core/auth/selectors';
 import { VocabularyTreeviewService } from './vocabulary-treeview.service';
 import { LOAD_MORE, LOAD_MORE_ROOT, TreeviewFlatNode, TreeviewNode } from './vocabulary-treeview-node.model';
 import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';

From b04c8025dc96ca01dd1a06c0897d108e26ae69e1 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Wed, 14 Dec 2022 11:35:19 +0100
Subject: [PATCH 049/160] 97049: Attempt to fix aSync test

---
 .../search-hierarchy-filter.component.spec.ts            | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
index 165db5e43b..a7ee15db1a 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -1,5 +1,5 @@
 import { SearchHierarchyFilterComponent } from './search-hierarchy-filter.component';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { DebugElement, EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
@@ -144,8 +144,8 @@ describe('SearchHierarchyFilterComponent', () => {
           }));
         });
 
-        it('should add a new search filter to the existing search filters', (done) => {
-          expect(router.navigate).toHaveBeenCalledWith([testSearchLink], {
+        it('should add a new search filter to the existing search filters', () => {
+          waitForAsync(() => expect(router.navigate).toHaveBeenCalledWith([testSearchLink], {
             queryParams: {
               [`f.${testSearchFilter}`]: [
                 ...alreadySelectedValues,
@@ -153,8 +153,7 @@ describe('SearchHierarchyFilterComponent', () => {
               ].map((value => `${value},equals`)),
             },
             queryParamsHandling: 'merge',
-          });
-          done();
+          }));
         });
       });
     });

From 07fe4f261f1fc35c75a4f8d6952caedc497b7106 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Wed, 14 Dec 2022 11:52:00 +0100
Subject: [PATCH 050/160] 97049: Attempt to fix aSync test

---
 .../search-hierarchy-filter.component.spec.ts                    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
index a7ee15db1a..7fc21a3c31 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -154,6 +154,7 @@ describe('SearchHierarchyFilterComponent', () => {
             },
             queryParamsHandling: 'merge',
           }));
+          fixture.destroy();
         });
       });
     });

From 43d9e3f958804745ebcc24a372f80db26aa1c234 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 14 Dec 2022 16:00:10 +0100
Subject: [PATCH 051/160] 93746: Feedback 2022-12-14 - missing types & tooltip
 width

---
 .../dso-edit-metadata-form.ts                 | 38 +++++++++----------
 .../dso-edit-metadata-value.component.scss    |  4 ++
 .../dso-edit-metadata-value.component.ts      | 19 +++++++---
 .../dso-edit-metadata.component.ts            | 10 ++---
 .../metadata-field-selector.component.ts      |  8 ++--
 src/styles/_custom_variables.scss             |  1 +
 6 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
index 2bbc923187..fde0ecf9d4 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
@@ -187,7 +187,7 @@ export class DsoEditMetadataForm {
     Object.entries(metadata).forEach(([mdField, values]: [string, MetadataValue[]]) => {
       this.originalFieldKeys.push(mdField);
       this.fieldKeys.push(mdField);
-      this.fields[mdField] = values.map((value) => new DsoEditMetadataValue(value));
+      this.fields[mdField] = values.map((value: MetadataValue) => new DsoEditMetadataValue(value));
     });
   }
 
@@ -205,7 +205,7 @@ export class DsoEditMetadataForm {
    * Clear the temporary value afterwards
    * @param mdField
    */
-  setMetadataField(mdField: string) {
+  setMetadataField(mdField: string): void {
     this.newValue.editing = false;
     this.addValueToField(this.newValue, mdField);
     this.newValue = undefined;
@@ -217,7 +217,7 @@ export class DsoEditMetadataForm {
    * @param mdField
    * @private
    */
-  private addValueToField(value: DsoEditMetadataValue, mdField: string) {
+  private addValueToField(value: DsoEditMetadataValue, mdField: string): void {
     if (isEmpty(this.fields[mdField])) {
       this.fieldKeys.push(mdField);
       this.fields[mdField] = [];
@@ -230,7 +230,7 @@ export class DsoEditMetadataForm {
    * @param mdField
    * @param index
    */
-  remove(mdField: string, index: number) {
+  remove(mdField: string, index: number): void {
     if (isNotEmpty(this.fields[mdField])) {
       this.fields[mdField].splice(index, 1);
       if (this.fields[mdField].length === 0) {
@@ -244,7 +244,7 @@ export class DsoEditMetadataForm {
    * Returns if at least one value within the form contains a change
    */
   hasChanges(): boolean {
-    return Object.values(this.fields).some((values) => values.some((value) => value.hasChanges()));
+    return Object.values(this.fields).some((values: DsoEditMetadataValue[]) => values.some((value: DsoEditMetadataValue) => value.hasChanges()));
   }
 
   /**
@@ -253,9 +253,9 @@ export class DsoEditMetadataForm {
    */
   discard(): void {
     this.resetReinstatable();
-    Object.entries(this.fields).forEach(([field, values]) => {
+    Object.entries(this.fields).forEach(([field, values]: [string, DsoEditMetadataValue[]]) => {
       let removeFromIndex = -1;
-      values.forEach((value, index) => {
+      values.forEach((value: DsoEditMetadataValue, index: number) => {
         if (value.change === DsoEditMetadataChangeType.ADD) {
           if (isEmpty(this.reinstatableNewValues[field])) {
             this.reinstatableNewValues[field] = [];
@@ -272,7 +272,7 @@ export class DsoEditMetadataForm {
         this.fields[field].splice(removeFromIndex, this.fields[field].length - removeFromIndex);
       }
     });
-    this.fieldKeys.forEach((field) => {
+    this.fieldKeys.forEach((field: string) => {
       if (this.originalFieldKeys.indexOf(field) < 0) {
         delete this.fields[field];
       }
@@ -281,13 +281,13 @@ export class DsoEditMetadataForm {
   }
 
   reinstate(): void {
-    Object.values(this.fields).forEach((values) => {
-      values.forEach((value) => {
+    Object.values(this.fields).forEach((values: DsoEditMetadataValue[]) => {
+      values.forEach((value: DsoEditMetadataValue) => {
         value.reinstate();
       });
     });
-    Object.entries(this.reinstatableNewValues).forEach(([field, values]) => {
-      values.forEach((value) => {
+    Object.entries(this.reinstatableNewValues).forEach(([field, values]: [string, DsoEditMetadataValue[]]) => {
+      values.forEach((value: DsoEditMetadataValue) => {
         this.addValueToField(value, field);
       });
     });
@@ -300,17 +300,17 @@ export class DsoEditMetadataForm {
   isReinstatable(): boolean {
     return isNotEmpty(this.reinstatableNewValues) ||
       Object.values(this.fields)
-        .some((values) => values
-          .some((value) => value.isReinstatable()));
+        .some((values: DsoEditMetadataValue[]) => values
+          .some((value: DsoEditMetadataValue) => value.isReinstatable()));
   }
 
   /**
    * Reset the state of the re-instatable properties and values
    */
-  resetReinstatable() {
+  resetReinstatable(): void {
     this.reinstatableNewValues = {};
-    Object.values(this.fields).forEach((values) => {
-      values.forEach((value) => {
+    Object.values(this.fields).forEach((values: DsoEditMetadataValue[]) => {
+      values.forEach((value: DsoEditMetadataValue) => {
         value.resetReinstatable();
       });
     });
@@ -321,8 +321,8 @@ export class DsoEditMetadataForm {
    */
   getOperations(): Operation[] {
     const operations: Operation[] = [];
-    Object.entries(this.fields).forEach(([field, values]) => {
-      values.forEach((value, place) => {
+    Object.entries(this.fields).forEach(([field, values]: [string, DsoEditMetadataValue[]]) => {
+      values.forEach((value: DsoEditMetadataValue, place: number) => {
         if (value.hasChanges()) {
           let operation: MetadataPatchOperation;
           if (value.change === DsoEditMetadataChangeType.UPDATE) {
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
index 926dc6f471..1196aa1940 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
@@ -6,3 +6,7 @@
 .ds-drag-handle:not(.disabled) {
   cursor: grab;
 }
+
+::ng-deep .tooltip-inner {
+  min-width: var(--ds-dso-edit-virtual-tooltip-min-width);
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
index 64024ef302..b61255e4fe 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
@@ -1,14 +1,17 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DsoEditMetadataChangeType, DsoEditMetadataValue } from '../dso-edit-metadata-form';
 import { Observable } from 'rxjs/internal/Observable';
-import { MetadataRepresentationType } from '../../../core/shared/metadata-representation/metadata-representation.model';
+import {
+  MetadataRepresentation,
+  MetadataRepresentationType
+} from '../../../core/shared/metadata-representation/metadata-representation.model';
 import { RelationshipService } from '../../../core/data/relationship.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { of } from 'rxjs/internal/observable/of';
 import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
 import { map } from 'rxjs/operators';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { EMPTY } from 'rxjs/internal/observable/empty';
 
 @Component({
   selector: 'ds-dso-edit-metadata-value',
@@ -100,15 +103,19 @@ export class DsoEditMetadataValueComponent implements OnInit {
   /**
    * Initialise potential properties of a virtual metadata value
    */
-  initVirtualProperties() {
+  initVirtualProperties(): void {
     this.mdRepresentation$ = this.mdValue.newValue.isVirtual ?
       this.relationshipService.resolveMetadataRepresentation(this.mdValue.newValue, this.dso, 'Item')
-        .pipe(map((mdRepresentation) => mdRepresentation.representationType === MetadataRepresentationType.Item ? mdRepresentation : null)) : of(null);
+        .pipe(
+          map((mdRepresentation: MetadataRepresentation) =>
+            mdRepresentation.representationType === MetadataRepresentationType.Item ? mdRepresentation as ItemMetadataRepresentation : null
+          )
+        ) : EMPTY;
     this.mdRepresentationItemRoute$ = this.mdRepresentation$.pipe(
-      map((mdRepresentation) => mdRepresentation ? getItemPageRoute(mdRepresentation) : null),
+      map((mdRepresentation: ItemMetadataRepresentation) => mdRepresentation ? getItemPageRoute(mdRepresentation) : null),
     );
     this.mdRepresentationName$ = this.mdRepresentation$.pipe(
-      map((mdRepresentation) => mdRepresentation ? this.dsoNameService.getName(mdRepresentation) : null),
+      map((mdRepresentation: ItemMetadataRepresentation) => mdRepresentation ? this.dsoNameService.getName(mdRepresentation) : null),
     );
   }
 }
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
index bc7bfd9593..e98cc3663d 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -120,7 +120,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
       this.initForm();
     }
     this.savingOrLoadingFieldValidation$ = observableCombineLatest([this.saving$, this.loadingFieldValidation$]).pipe(
-      map(([saving, loading]) => saving || loading),
+      map(([saving, loading]: [boolean, boolean]) => saving || loading),
     );
   }
 
@@ -188,7 +188,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
    * Confirm the newly added value
    * @param saved Whether or not the value was manually saved (only then, add the value to its metadata field)
    */
-  confirmNewValue(saved: boolean) {
+  confirmNewValue(saved: boolean): void {
     if (saved) {
       this.setMetadataField();
     }
@@ -199,10 +199,10 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
    * This will move the new value to its respective parent metadata field
    * Validate the metadata field first
    */
-  setMetadataField() {
+  setMetadataField(): void {
     this.form.resetReinstatable();
     this.loadingFieldValidation$.next(true);
-    this.metadataFieldSelectorComponent.validate().subscribe((valid) => {
+    this.metadataFieldSelectorComponent.validate().subscribe((valid: boolean) => {
       this.loadingFieldValidation$.next(false);
       if (valid) {
         this.form.setMetadataField(this.newMdField);
@@ -238,7 +238,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
   /**
    * Unsubscribe from any open subscriptions
    */
-  ngOnDestroy() {
+  ngOnDestroy(): void {
     if (hasValue(this.dsoUpdateSubscription)) {
       this.dsoUpdateSubscription.unsubscribe();
     }
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
index 7fc56f8dc2..f3f6f15914 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
@@ -119,7 +119,7 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
     );
     this.mdFieldOptions$ = this.query$.pipe(
       distinctUntilChanged(),
-      switchMap((query) => {
+      switchMap((query: string) => {
         this.showInvalid = false;
         if (query !== null) {
           return this.registryService.queryMetadataFields(query, null, true, false, followLink('schema')).pipe(
@@ -152,7 +152,7 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
       metadataFieldsToString(),
       take(1),
       map((fields: string[]) => fields.indexOf(this.mdField) > -1),
-      tap((exists) => this.showInvalid = !exists),
+      tap((exists: boolean) => this.showInvalid = !exists),
     );
   }
 
@@ -160,7 +160,7 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    * Select a metadata field from the dropdown optipons
    * @param mdFieldOption
    */
-  select(mdFieldOption: string) {
+  select(mdFieldOption: string): void {
     this.selectedValueLoading = true;
     this.input.setValue(mdFieldOption);
   }
@@ -169,6 +169,6 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    * Unsubscribe from any open subscriptions
    */
   ngOnDestroy(): void {
-    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
+    this.subs.filter((sub: Subscription) => hasValue(sub)).forEach((sub: Subscription) => sub.unsubscribe());
   }
 }
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index e01018c044..3498deea7d 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -89,4 +89,5 @@
   --ds-dso-edit-field-width: 210px;
   --ds-dso-edit-lang-width: 90px;
   --ds-dso-edit-actions-width: 173px;
+  --ds-dso-edit-virtual-tooltip-min-width: 300px;
 }

From 64d96453c3b81e6e8b0bdafdac271df3a425b53e Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 15 Dec 2022 17:25:23 +0100
Subject: [PATCH 052/160] 93747: Edit metadata redesign - drag to reorder pt1

---
 .../metadata-patch-move-operation.model.ts    |  33 +++++
 ...-edit-metadata-field-values.component.html |   5 +-
 ...-edit-metadata-field-values.component.scss |   4 +
 ...so-edit-metadata-field-values.component.ts |  32 ++++-
 .../dso-edit-metadata-form.ts                 | 115 +++++++++++++-----
 .../dso-edit-metadata-value.component.html    |   4 +-
 .../dso-edit-metadata-value.component.scss    |   4 +
 .../dso-edit-metadata-value.component.ts      |   5 +
 .../dso-edit-metadata.component.html          |   1 +
 .../dso-edit-metadata.component.ts            |  13 +-
 10 files changed, 181 insertions(+), 35 deletions(-)
 create mode 100644 src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model.ts

diff --git a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model.ts b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model.ts
new file mode 100644
index 0000000000..962d53dfee
--- /dev/null
+++ b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model.ts
@@ -0,0 +1,33 @@
+import { MetadataPatchOperation } from './metadata-patch-operation.model';
+import { Operation } from 'fast-json-patch';
+
+/**
+ * Wrapper object for a metadata patch move Operation
+ */
+export class MetadataPatchMoveOperation extends MetadataPatchOperation {
+  static operationType = 'move';
+
+  /**
+   * The original place of the metadata value to move
+   */
+  from: number;
+
+  /**
+   * The new place to move the metadata value to
+   */
+  to: number;
+
+  constructor(field: string, from: number, to: number) {
+    super(MetadataPatchMoveOperation.operationType, field);
+    this.from = from;
+    this.to = to;
+  }
+
+  /**
+   * Transform the MetadataPatchOperation into a fast-json-patch Operation by constructing its path and other properties
+   * using the information provided.
+   */
+  toOperation(): Operation {
+    return { op: this.op as any, from: `/metadata/${this.field}/${this.from}`, path: `/metadata/${this.field}/${this.to}` };
+  }
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
index 6a0386da8e..190d5a7e31 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
@@ -1,4 +1,4 @@
-<div class="flex-grow-1 ds-drop-list h-100">
+<div class="flex-grow-1 ds-drop-list h-100" [class.disabled]="(draggingMdField$ | async) && (draggingMdField$ | async) !== mdField" cdkDropList (cdkDropListDropped)="drop($event)">
   <ds-dso-edit-metadata-value *ngFor="let mdValue of form.fields[mdField]; let idx = index"
                               [dso]="dso"
                               [mdValue]="mdValue"
@@ -8,6 +8,7 @@
                               (edit)="mdValue.editing = true"
                               (confirm)="mdValue.confirmChanges($event); form.resetReinstatable(); valueSaved.emit()"
                               (remove)="mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE; form.resetReinstatable(); valueSaved.emit()"
-                              (undo)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.discard(); valueSaved.emit()">
+                              (undo)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.discard(); valueSaved.emit()"
+                              (dragging)="$event ? draggingMdField$.next(mdField) : draggingMdField$.next(null)">
   </ds-dso-edit-metadata-value>
 </div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.scss
index afe5084bc2..6b52c4f4b3 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.scss
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.scss
@@ -1,3 +1,7 @@
 .ds-drop-list {
   background-color: var(--bs-gray-500);
+
+  &.disabled {
+    opacity: 0.3;
+  }
 }
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
index 0db427c218..2702e0ba1f 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
@@ -1,7 +1,9 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { DsoEditMetadataChangeType, DsoEditMetadataForm } from '../dso-edit-metadata-form';
+import { DsoEditMetadataChangeType, DsoEditMetadataForm, DsoEditMetadataValue } from '../dso-edit-metadata-form';
 import { Observable } from 'rxjs/internal/Observable';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
 
 @Component({
   selector: 'ds-dso-edit-metadata-field-values',
@@ -38,6 +40,12 @@ export class DsoEditMetadataFieldValuesComponent {
    */
   @Input() saving$: Observable<boolean>;
 
+  /**
+   * Tracks for which metadata-field a drag operation is taking place
+   * Null when no drag is currently happening for any field
+   */
+  @Input() draggingMdField$: BehaviorSubject<string>;
+
   /**
    * Emit when the value has been saved within the form
    */
@@ -48,4 +56,26 @@ export class DsoEditMetadataFieldValuesComponent {
    * @type {DsoEditMetadataChangeType}
    */
   public DsoEditMetadataChangeTypeEnum = DsoEditMetadataChangeType;
+
+  /**
+   * Drop a value into a new position
+   * Update the form's value array for the current field to match the dropped position
+   * Update the values their place property to match the new order
+   * Send an update to the parent
+   * @param event
+   */
+  drop(event: CdkDragDrop<any>) {
+    const dragIndex = event.previousIndex;
+    const dropIndex = event.currentIndex;
+    // Move the value within its field
+    moveItemInArray(this.form.fields[this.mdField], dragIndex, dropIndex);
+    // Update all the values in this field their place property
+    this.form.fields[this.mdField].forEach((value: DsoEditMetadataValue, index: number) => {
+      value.newValue.place = index;
+      value.confirmChanges();
+    });
+    // Update the form statuses
+    this.form.resetReinstatable();
+    this.valueSaved.emit();
+  }
 }
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
index fde0ecf9d4..cc1f55838b 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
@@ -1,10 +1,11 @@
 import { MetadataMap, MetadataValue } from '../../core/shared/metadata.models';
 import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { Operation } from 'fast-json-patch';
+import { MoveOperation, Operation } from 'fast-json-patch';
 import { MetadataPatchReplaceOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model';
 import { MetadataPatchRemoveOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model';
 import { MetadataPatchAddOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model';
-import { MetadataPatchOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-operation.model';
+import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service';
+import { MetadataPatchMoveOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model';
 
 /* tslint:disable:max-classes-per-file */
 
@@ -69,7 +70,7 @@ export class DsoEditMetadataValue {
    */
   confirmChanges(finishEditing = false) {
     if (hasNoValue(this.change) || this.change === DsoEditMetadataChangeType.UPDATE) {
-      if ((this.originalValue.value !== this.newValue.value || this.originalValue.language !== this.newValue.language)) {
+      if ((this.originalValue.value !== this.newValue.value || this.originalValue.language !== this.newValue.language || this.originalValue.place !== this.newValue.place)) {
         this.change = DsoEditMetadataChangeType.UPDATE;
       } else {
         this.change = undefined;
@@ -187,7 +188,7 @@ export class DsoEditMetadataForm {
     Object.entries(metadata).forEach(([mdField, values]: [string, MetadataValue[]]) => {
       this.originalFieldKeys.push(mdField);
       this.fieldKeys.push(mdField);
-      this.fields[mdField] = values.map((value: MetadataValue) => new DsoEditMetadataValue(value));
+      this.setValuesForFieldSorted(mdField, values.map((value: MetadataValue) => new DsoEditMetadataValue(value)));
     });
   }
 
@@ -208,6 +209,10 @@ export class DsoEditMetadataForm {
   setMetadataField(mdField: string): void {
     this.newValue.editing = false;
     this.addValueToField(this.newValue, mdField);
+    // Set the place property to match the new value's position within its field
+    const place = this.fields[mdField].length - 1;
+    this.fields[mdField][place].originalValue.place = place;
+    this.fields[mdField][place].newValue.place = place;
     this.newValue = undefined;
   }
 
@@ -253,6 +258,7 @@ export class DsoEditMetadataForm {
    */
   discard(): void {
     this.resetReinstatable();
+    // Discard changes from each value from each field
     Object.entries(this.fields).forEach(([field, values]: [string, DsoEditMetadataValue[]]) => {
       let removeFromIndex = -1;
       values.forEach((value: DsoEditMetadataValue, index: number) => {
@@ -272,25 +278,39 @@ export class DsoEditMetadataForm {
         this.fields[field].splice(removeFromIndex, this.fields[field].length - removeFromIndex);
       }
     });
+    // Delete new metadata fields
     this.fieldKeys.forEach((field: string) => {
       if (this.originalFieldKeys.indexOf(field) < 0) {
         delete this.fields[field];
       }
     });
     this.fieldKeys = [...this.originalFieldKeys];
+    // Reset the order of values within their fields to match their place property
+    this.fieldKeys.forEach((field: string) => {
+      this.setValuesForFieldSorted(field, this.fields[field]);
+    });
   }
 
+  /**
+   * Undo any previously discarded changes
+   */
   reinstate(): void {
+    // Reinstate each value
     Object.values(this.fields).forEach((values: DsoEditMetadataValue[]) => {
       values.forEach((value: DsoEditMetadataValue) => {
         value.reinstate();
       });
     });
+    // Re-add new values
     Object.entries(this.reinstatableNewValues).forEach(([field, values]: [string, DsoEditMetadataValue[]]) => {
       values.forEach((value: DsoEditMetadataValue) => {
         this.addValueToField(value, field);
       });
     });
+    // Reset the order of values within their fields to match their place property
+    this.fieldKeys.forEach((field: string) => {
+      this.setValuesForFieldSorted(field, this.fields[field]);
+    });
     this.reinstatableNewValues = {};
   }
 
@@ -317,34 +337,73 @@ export class DsoEditMetadataForm {
   }
 
   /**
-   * Get the json PATCH operations for the current changes within this form
+   * Set the values of a metadata field and sort them by their newValue's place property
+   * @param mdField
+   * @param values
    */
-  getOperations(): Operation[] {
+  private setValuesForFieldSorted(mdField: string, values: DsoEditMetadataValue[]) {
+    this.fields[mdField] = values.sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.newValue.place - b.newValue.place);
+  }
+
+  /**
+   * Get the json PATCH operations for the current changes within this form
+   * For each metadata field, it'll return operations in the following order: replace, remove (from last to first place), add and move
+   * This order is important, as each operation is executed in succession of the previous one
+   */
+  getOperations(moveAnalyser: ArrayMoveChangeAnalyzer<number>): Operation[] {
     const operations: Operation[] = [];
     Object.entries(this.fields).forEach(([field, values]: [string, DsoEditMetadataValue[]]) => {
-      values.forEach((value: DsoEditMetadataValue, place: number) => {
-        if (value.hasChanges()) {
-          let operation: MetadataPatchOperation;
-          if (value.change === DsoEditMetadataChangeType.UPDATE) {
-            operation = new MetadataPatchReplaceOperation(field, place, {
-              value: value.newValue.value,
-              language: value.newValue.language,
-            });
-          } else if (value.change === DsoEditMetadataChangeType.REMOVE) {
-            operation = new MetadataPatchRemoveOperation(field, place);
-          } else if (value.change === DsoEditMetadataChangeType.ADD) {
-            operation = new MetadataPatchAddOperation(field, {
-              value: value.newValue.value,
-              language: value.newValue.language,
-            });
-          } else {
-            console.warn('Illegal metadata change state detected for', value);
+      const replaceOperations: MetadataPatchReplaceOperation[] = [];
+      const removeOperations: MetadataPatchRemoveOperation[] = [];
+      const addOperations: MetadataPatchAddOperation[] = [];
+      values
+        .sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.originalValue.place - b.originalValue.place)
+        .forEach((value: DsoEditMetadataValue) => {
+          if (value.hasChanges()) {
+            if (value.change === DsoEditMetadataChangeType.UPDATE) {
+              // Only changes to value or language are considered "replace" operations. Changes to place are considered "move", which is processed below.
+              if (value.originalValue.value !== value.newValue.value || value.originalValue.language !== value.newValue.language) {
+                replaceOperations.push(new MetadataPatchReplaceOperation(field, value.originalValue.place, {
+                  value: value.newValue.value,
+                  language: value.newValue.language,
+                }));
+              }
+            } else if (value.change === DsoEditMetadataChangeType.REMOVE) {
+              removeOperations.push(new MetadataPatchRemoveOperation(field, value.originalValue.place));
+            } else if (value.change === DsoEditMetadataChangeType.ADD) {
+              addOperations.push(new MetadataPatchAddOperation(field, {
+                value: value.newValue.value,
+                language: value.newValue.language,
+              }));
+            } else {
+              console.warn('Illegal metadata change state detected for', value);
+            }
           }
-          if (hasValue(operation)) {
-            operations.push(operation.toOperation());
-          }
-        }
-      });
+        });
+
+      operations.push(...replaceOperations
+        .map((operation: MetadataPatchReplaceOperation) => operation.toOperation()));
+      operations.push(...removeOperations
+        // Sort remove operations backwards first, because they get executed in order. This avoids one removal affecting the next.
+        .sort((a: MetadataPatchRemoveOperation, b: MetadataPatchRemoveOperation) => b.place - a.place)
+        .map((operation: MetadataPatchRemoveOperation) => operation.toOperation()));
+      operations.push(...addOperations
+        .map((operation: MetadataPatchAddOperation) => operation.toOperation()));
+    });
+    // Calculate and add the move operations that need to happen in order to move value from their old place to their new within the field
+    // This uses an ArrayMoveChangeAnalyzer
+    Object.entries(this.fields).forEach(([field, values]: [string, DsoEditMetadataValue[]]) => {
+      // Exclude values marked for removal, because operations are executed in order (remove first, then move)
+      const valuesWithoutRemoved = values.filter((value: DsoEditMetadataValue) => value.change !== DsoEditMetadataChangeType.REMOVE);
+      const moveOperations = moveAnalyser
+        .diff(
+          valuesWithoutRemoved
+            .map((value: DsoEditMetadataValue) => value.originalValue.place),
+          valuesWithoutRemoved
+            .sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.newValue.place - b.newValue.place)
+            .map((value: DsoEditMetadataValue) => value.originalValue.place))
+        .map((operation: MoveOperation) => new MetadataPatchMoveOperation(field, +operation.from.substr(1), +operation.path.substr(1)).toOperation());
+      operations.push(...moveOperations);
     });
     return operations;
   }
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
index e72a9e8444..9941d03308 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
@@ -1,4 +1,5 @@
 <div class="d-flex flex-row ds-value-row" *ngVar="mdValue.newValue.isVirtual as isVirtual"
+     cdkDrag (cdkDragStarted)="dragging.emit(true)" (cdkDragEnded)="dragging.emit(false)"
      [ngClass]="{ 'ds-warning': mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD, 'h-100': isOnlyValue }">
   <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex align-items-center" *ngVar="(mdRepresentation$ | async) as mdRepresentation">
     <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing && !mdRepresentation">{{ mdValue.newValue.value }}</div>
@@ -34,8 +35,7 @@
           <i class="fas fa-undo-alt fa-fw"></i>
         </button>
       </div>
-      <!-- TODO: Enable drag -->
-      <button class="btn btn-outline-secondary ds-drag-handle btn-sm"
+      <button class="btn btn-outline-secondary ds-drag-handle btn-sm" cdkDragHandle
               [ngClass]="{'disabled': isOnlyValue || (saving$ | async)}" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}" [disabled]="isOnlyValue || (saving$ | async)">
         <i class="fas fa-grip-vertical fa-fw"></i>
       </button>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
index 1196aa1940..bcf491b9ce 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
@@ -10,3 +10,7 @@
 ::ng-deep .tooltip-inner {
   min-width: var(--ds-dso-edit-virtual-tooltip-min-width);
 }
+
+.cdk-drag-placeholder {
+  opacity: 0;
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
index b61255e4fe..dce0ec68b0 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
@@ -71,6 +71,11 @@ export class DsoEditMetadataValueComponent implements OnInit {
    */
   @Output() undo: EventEmitter<any> = new EventEmitter<any>();
 
+  /**
+   * Emits true when the user starts dragging a value, false when the user stops dragging
+   */
+  @Output() dragging: EventEmitter<boolean> = new EventEmitter<boolean>();
+
   /**
    * The DsoEditMetadataChangeType enumeration for access in the component's template
    * @type {DsoEditMetadataChangeType}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index 0ca62ff1b6..e498dc373e 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -48,6 +48,7 @@
                                        [form]="form"
                                        [dsoType]="dsoType"
                                        [saving$]="saving$"
+                                       [draggingMdField$]="draggingMdField$"
                                        [mdField]="mdField"
                                        (valueSaved)="onValueSaved()">
     </ds-dso-edit-metadata-field-values>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
index e98cc3663d..7f98720b2c 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -19,6 +19,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { TranslateService } from '@ngx-translate/core';
 import { MetadataFieldSelectorComponent } from './metadata-field-selector/metadata-field-selector.component';
 import { Observable } from 'rxjs/internal/Observable';
+import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service';
 
 @Component({
   selector: 'ds-dso-edit-metadata',
@@ -72,6 +73,13 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
    */
   saving$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
+  /**
+   * Tracks for which metadata-field a drag operation is taking place
+   * Null when no drag is currently happening for any field
+   * This is a BehaviorSubject that is passed down to child components, to give them the power to alter the state
+   */
+  draggingMdField$: BehaviorSubject<string> = new BehaviorSubject<string>(null);
+
   /**
    * Whether or not the metadata field is currently being validated
    */
@@ -98,7 +106,8 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
   constructor(protected route: ActivatedRoute,
               protected notificationsService: NotificationsService,
               protected translateService: TranslateService,
-              protected parentInjector: Injector) {
+              protected parentInjector: Injector,
+              protected arrayMoveChangeAnalyser: ArrayMoveChangeAnalyzer<number>) {
   }
 
   /**
@@ -167,7 +176,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
    */
   submit(): void {
     this.saving$.next(true);
-    this.updateDataService.patch(this.dso, this.form.getOperations()).pipe(
+    this.updateDataService.patch(this.dso, this.form.getOperations(this.arrayMoveChangeAnalyser)).pipe(
       getFirstCompletedRemoteData()
     ).subscribe((rd: RemoteData<DSpaceObject>) => {
       this.saving$.next(false);

From 2fea10aced4194c73da32385d74eccf9527e9376 Mon Sep 17 00:00:00 2001
From: Ying Jin <yj4@rice.edu>
Date: Thu, 15 Dec 2022 17:18:22 -0600
Subject: [PATCH 053/160] add/remove comments

---
 .../media-viewer/media-viewer-video/caption-info.ts        | 7 +++++++
 .../media-viewer-video/media-viewer-video.component.html   | 1 -
 .../media-viewer-video/media-viewer-video.component.ts     | 1 -
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/item-page/media-viewer/media-viewer-video/caption-info.ts b/src/app/item-page/media-viewer/media-viewer-video/caption-info.ts
index 011249027f..43996d096d 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/caption-info.ts
+++ b/src/app/item-page/media-viewer/media-viewer-video/caption-info.ts
@@ -1,3 +1,10 @@
+/*
+  The class is designed to host information related to Video Captioning support
+  and used in HTML 5 video track
+  src: source vtt file
+  srclang: two letter language code
+  langLabel: language label
+ */
 export class CaptionInfo {
   constructor(public src: string, public srclang: string, public langLabel: string ) {
   }
diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
index 5e74437393..0cc854b272 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
+++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
@@ -10,7 +10,6 @@
   preload="none"
   controls
 >
-<!--  <track default kind="captions" src="./assets/vtt/JusticeAndTransformation_caption.mp4-en.vtt" label="English" type="text/vtt"/>-->
   <ng-container *ngIf="getMediaCap(filteredMedias[currentIndex].bitstream.name) as capInfos">
     <ng-container *ngFor="let capInfo of capInfos">
       <track [src]="capInfo.src" [label]="capInfo.langLabel" [srclang]="capInfo.srclang" />
diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
index c4806d8306..cc08d2b4a0 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
@@ -52,7 +52,6 @@ export class MediaViewerVideoComponent implements OnInit {
       filteredCapMedias
         .forEach((media, index) => {
           let srclang: string = media.bitstream.name.slice(-6, -4).toLowerCase();
-          //capInfos[index] = new CaptionInfo(
           capInfos.push(new CaptionInfo(
             media.bitstream._links.content.href,
             srclang,

From a40d93a9411890502a3fe56826f4ee9c5efdb14c Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Fri, 16 Dec 2022 11:41:09 +0100
Subject: [PATCH 054/160] 97399 Implemented basic working tooltip on top level
 community list

---
 .../top-level-community-list.component.html   |  6 +++-
 .../context-help-wrapper.component.html       | 26 +++++++++++++++++
 .../context-help-wrapper.component.scss       | 25 ++++++++++++++++
 .../context-help-wrapper.component.spec.ts    | 25 ++++++++++++++++
 .../context-help-wrapper.component.ts         | 23 +++++++++++++++
 src/app/shared/context-help.directive.spec.ts |  8 +++++
 src/app/shared/context-help.directive.ts      | 29 +++++++++++++++++++
 src/app/shared/shared.module.ts               |  7 ++++-
 src/assets/i18n/en.json5                      |  5 +++-
 src/styles/_custom_variables.scss             |  3 ++
 10 files changed, 154 insertions(+), 3 deletions(-)
 create mode 100644 src/app/shared/context-help-wrapper/context-help-wrapper.component.html
 create mode 100644 src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
 create mode 100644 src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
 create mode 100644 src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
 create mode 100644 src/app/shared/context-help.directive.spec.ts
 create mode 100644 src/app/shared/context-help.directive.ts

diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.html b/src/app/home-page/top-level-community-list/top-level-community-list.component.html
index dbea87a175..064b308ed5 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.html
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.html
@@ -1,6 +1,10 @@
 <ng-container *ngVar="(communitiesRD$ | async) as communitiesRD">
   <div *ngIf="communitiesRD?.hasSucceeded ">
-  <h2>{{'home.top-level-communities.head' | translate}}</h2>
+    <h2>
+      <span *dsContextHelp="'context-help.multi-para.test'"
+            dsTooltipPlacment="right left">
+          {{'home.top-level-communities.head' | translate}}</span>
+    </h2>
   <p class="lead">{{'home.top-level-communities.help' | translate}}</p>
   <ds-viewable-collection
     [config]="config"
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.html b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
new file mode 100644
index 0000000000..c5c21502dc
--- /dev/null
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
@@ -0,0 +1,26 @@
+<!-- Set tooltip text. -->
+<ng-template #help>
+  <div class="preserve-line-breaks ds-context-help-content">{{ content | translate }}</div>
+</ng-template>
+
+<!-- Help icon, add tooltip to help icon. -->
+<i class="ds-context-help-icon fas fa-question-circle shadow-sm"
+   [ngbTooltip]="help"
+   container="'body'"
+   triggers="click:blur">
+</i>
+
+<!-- Indicate where to put the template (that is, the contents of
+     whatever component the context help directive was used on).
+-->
+<ng-container *ngTemplateOutlet="templateRef"></ng-container>
+
+
+
+<!-- <i class="ds-context-help-icon fas fa-question-circle shadow-sm"></i> -->
+<!-- <ng-container *ngTemplateOutlet="templateRef"></ng-container> -->
+
+
+<!--    *ngClass="{'ds-context-help-icon-right': tooltipPlacement === 'right', 'ds-context-help-icon-left': tooltipPlacement === 'left'}" -->
+
+
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss b/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
new file mode 100644
index 0000000000..30bbac02ff
--- /dev/null
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
@@ -0,0 +1,25 @@
+:host {
+    position: relative;
+}
+
+.ds-context-help-icon {
+    position: absolute;
+    top: 0;
+}
+
+.ds-context-help-icon-left {
+    left: var(--ds-context-x-offset);
+    color: var(--bs-info);
+    background-color: var(--bs-white);
+    font-size: (--dscontext-help-icon-size);
+    line-height: 1;
+    border-radius: 50%;
+}
+
+.ds-context-help-icon-right {
+    right: var(--ds-context-icon-width);
+}
+
+::ng-deep .tooltip-inner {
+    max-width: 300px;
+}
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
new file mode 100644
index 0000000000..aee7a0c696
--- /dev/null
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ContextHelpWrapperComponent } from './context-help-wrapper.component';
+
+describe('ContextHelpWrapperComponent', () => {
+  let component: ContextHelpWrapperComponent;
+  let fixture: ComponentFixture<ContextHelpWrapperComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ContextHelpWrapperComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ContextHelpWrapperComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
new file mode 100644
index 0000000000..b39c2b2f06
--- /dev/null
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
@@ -0,0 +1,23 @@
+import { Component, Input, OnInit, TemplateRef } from '@angular/core';
+import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
+
+export type PlacementDir = 'left' | 'right';
+
+@Component({
+  selector: 'ds-context-help-wrapper',
+  templateUrl: './context-help-wrapper.component.html',
+  styleUrls: ['./context-help-wrapper.component.scss']
+})
+export class ContextHelpWrapperComponent implements OnInit {
+  @Input() templateRef: TemplateRef<any>;
+  @Input() content: string;
+  @Input() tooltipPlacement: PlacementArray; // TODO: type
+  // @Input('iconPlacement') iconPlacement: string;
+
+  constructor() { }
+
+  ngOnInit(): void {
+    // console.log("In ContextHelpWrapperComponent.ngOnInit:", this.content); // XXX
+  }
+
+}
diff --git a/src/app/shared/context-help.directive.spec.ts b/src/app/shared/context-help.directive.spec.ts
new file mode 100644
index 0000000000..f00fb9d355
--- /dev/null
+++ b/src/app/shared/context-help.directive.spec.ts
@@ -0,0 +1,8 @@
+import { ContextHelpDirective } from './context-help.directive';
+
+describe('ContextHelpDirective', () => {
+  it('should create an instance', () => {
+    const directive = new ContextHelpDirective();
+    expect(directive).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/context-help.directive.ts b/src/app/shared/context-help.directive.ts
new file mode 100644
index 0000000000..712950a6f1
--- /dev/null
+++ b/src/app/shared/context-help.directive.ts
@@ -0,0 +1,29 @@
+import { ComponentFactoryResolver, ComponentRef, Directive, Input, OnInit, TemplateRef, ViewContainerRef } from '@angular/core';
+import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
+import { ContextHelpWrapperComponent, PlacementDir } from './context-help-wrapper/context-help-wrapper.component';
+
+@Directive({
+  selector: '[dsContextHelp]'
+})
+export class ContextHelpDirective implements OnInit {
+  @Input('dsContextHelp') content: string;
+  @Input('dsTooltipPlacement') tooltipPlacement: PlacementArray;
+  // @Input('iconPlacement') iconPlacement: PlacementDir;
+
+  protected wrapper: ComponentRef<ContextHelpWrapperComponent>;
+
+  constructor(
+    private templateRef: TemplateRef<any>,
+    private viewContainerRef: ViewContainerRef,
+    private componentFactoryResolver: ComponentFactoryResolver
+  ){}
+
+  ngOnInit() {
+    const factory
+      = this.componentFactoryResolver.resolveComponentFactory(ContextHelpWrapperComponent);
+    this.wrapper = this.viewContainerRef.createComponent(factory);
+    this.wrapper.instance.templateRef = this.templateRef;
+    this.wrapper.instance.content = this.content;
+    this.wrapper.instance.tooltipPlacement = this.tooltipPlacement;
+  }
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 715ee66a99..0b51ba131c 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -177,6 +177,8 @@ import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/
 import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-page/bitstream-request-a-copy-page.component';
 import { DsSelectComponent } from './ds-select/ds-select.component';
 import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component';
+import { ContextHelpDirective } from './context-help.directive';
+import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -454,6 +456,8 @@ const DIRECTIVES = [
     ...SHARED_ITEM_PAGE_COMPONENTS,
     ItemVersionsSummaryModalComponent,
     ItemVersionsDeleteModalComponent,
+    ContextHelpDirective,
+    ContextHelpWrapperComponent,
   ],
   providers: [
     ...PROVIDERS
@@ -464,7 +468,8 @@ const DIRECTIVES = [
     ...COMPONENTS,
     ...SHARED_ITEM_PAGE_COMPONENTS,
     ...DIRECTIVES,
-    TranslateModule
+    TranslateModule,
+    ContextHelpDirective
   ]
 })
 
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index f742273edb..c9d9a32699 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4162,5 +4162,8 @@
 
   "idle-modal.log-out": "Log out",
 
-  "idle-modal.extend-session": "Extend session"
+  "idle-modal.extend-session": "Extend session",
+
+  "context-help.multi-para.test": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In facilisis ac metus ut tristique. Integer eros risus, efficitur non urna eu, ultrices mollis felis. Nullam mi sapien, mattis eu nunc in, rhoncus vulputate risus. \n\nDuis pharetra et nibh aliquam sodales. Integer ut rutrum dolor, ut maximus quam. Nunc sit amet maximus urna. In nec erat vulputate, facilisis nulla a, scelerisque orci. Ut pellentesque sapien et eros euismod scelerisque finibus at sem. Duis egestas convallis ligula nec laoreet. \n\nProin ut magna sit amet libero consequat ultrices et sed mi. Nam congue sed risus ac fringilla. Suspendisse potenti. Cras mattis, est non laoreet elementum, erat enim interdum tortor, eu placerat enim metus sit amet enim.",
+
 }
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 66e0e87f93..15c595a564 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -85,4 +85,7 @@
   --ds-slider-handle-width: 18px;
 
   --ds-search-form-scope-max-width: 150px;
+
+  --ds-context-x-offset: -16px;
+  --dscontext-help-icon-size: 16px;
 }

From bf9612e9674edb76cfba59194dc480fdde0d9c52 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Fri, 16 Dec 2022 15:08:32 +0100
Subject: [PATCH 055/160] 93747: Edit metadata redesign - drag to reorder pt2

---
 ...-edit-metadata-field-values.component.html |  2 +-
 .../dso-edit-metadata-form.ts                 | 67 +++++++++++++++----
 .../dso-edit-metadata-value.component.html    |  6 +-
 .../dso-edit-metadata.component.html          |  4 ++
 .../dso-edit-metadata.component.scss          |  4 ++
 src/assets/i18n/en.json5                      |  2 +
 6 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
index 190d5a7e31..cfa457580f 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
@@ -7,7 +7,7 @@
                               [isOnlyValue]="form.fields[mdField].length === 1"
                               (edit)="mdValue.editing = true"
                               (confirm)="mdValue.confirmChanges($event); form.resetReinstatable(); valueSaved.emit()"
-                              (remove)="mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE; form.resetReinstatable(); valueSaved.emit()"
+                              (remove)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE; form.resetReinstatable(); valueSaved.emit()"
                               (undo)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.discard(); valueSaved.emit()"
                               (dragging)="$event ? draggingMdField$.next(mdField) : draggingMdField$.next(null)">
   </ds-dso-edit-metadata-value>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
index cc1f55838b..b97c838ffb 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
@@ -48,6 +48,11 @@ export class DsoEditMetadataValue {
    */
   change: DsoEditMetadataChangeType;
 
+  /**
+   * A flag to keep track if the value has been reordered (place has changed)
+   */
+  reordered = false;
+
   /**
    * A type or change that can be used to undo any discarding that took place
    */
@@ -69,8 +74,9 @@ export class DsoEditMetadataValue {
    * It will also set the editing flag to false
    */
   confirmChanges(finishEditing = false) {
+    this.reordered = this.originalValue.place !== this.newValue.place;
     if (hasNoValue(this.change) || this.change === DsoEditMetadataChangeType.UPDATE) {
-      if ((this.originalValue.value !== this.newValue.value || this.originalValue.language !== this.newValue.language || this.originalValue.place !== this.newValue.place)) {
+      if ((this.originalValue.value !== this.newValue.value || this.originalValue.language !== this.newValue.language)) {
         this.change = DsoEditMetadataChangeType.UPDATE;
       } else {
         this.change = undefined;
@@ -87,7 +93,7 @@ export class DsoEditMetadataValue {
    * return false (which is desired)
    */
   hasChanges(): boolean {
-    return hasValue(this.change);
+    return hasValue(this.change) || this.reordered;
   }
 
   /**
@@ -95,21 +101,25 @@ export class DsoEditMetadataValue {
    * properties
    */
   discardAndMarkReinstatable(): void {
-    if (this.change === DsoEditMetadataChangeType.UPDATE) {
+    if (this.change === DsoEditMetadataChangeType.UPDATE || this.reordered) {
       this.reinstatableValue = this.newValue;
     }
     this.reinstatableChange = this.change;
-    this.discard();
+    this.discard(false);
   }
 
   /**
    * Discard the current changes
    * Call discardAndMarkReinstatable() instead, if the discard should be re-instatable
    */
-  discard(): void {
+  discard(keepPlace = true): void {
     this.change = undefined;
+    const place = this.newValue.place;
     this.newValue = Object.assign(new MetadataValue(), this.originalValue);
-    this.editing = false;
+    if (keepPlace) {
+      this.newValue.place = place;
+    }
+    this.confirmChanges(true);
   }
 
   /**
@@ -124,6 +134,7 @@ export class DsoEditMetadataValue {
       this.change = this.reinstatableChange;
       this.reinstatableChange = undefined;
     }
+    this.confirmChanges();
   }
 
   /**
@@ -190,6 +201,7 @@ export class DsoEditMetadataForm {
       this.fieldKeys.push(mdField);
       this.setValuesForFieldSorted(mdField, values.map((value: MetadataValue) => new DsoEditMetadataValue(value)));
     });
+    this.sortFieldKeys();
   }
 
   /**
@@ -225,6 +237,7 @@ export class DsoEditMetadataForm {
   private addValueToField(value: DsoEditMetadataValue, mdField: string): void {
     if (isEmpty(this.fields[mdField])) {
       this.fieldKeys.push(mdField);
+      this.sortFieldKeys();
       this.fields[mdField] = [];
     }
     this.fields[mdField].push(value);
@@ -252,6 +265,14 @@ export class DsoEditMetadataForm {
     return Object.values(this.fields).some((values: DsoEditMetadataValue[]) => values.some((value: DsoEditMetadataValue) => value.hasChanges()));
   }
 
+  /**
+   * Check if a metadata field contains changes within its order (place property of values)
+   * @param mdField
+   */
+  hasOrderChanges(mdField: string): boolean {
+    return this.fields[mdField].some((value: DsoEditMetadataValue) => value.originalValue.place !== value.newValue.place);
+  }
+
   /**
    * Discard all changes within the form and store their current values within re-instatable properties so they can be
    * undone afterwards
@@ -285,12 +306,34 @@ export class DsoEditMetadataForm {
       }
     });
     this.fieldKeys = [...this.originalFieldKeys];
+    this.sortFieldKeys();
     // Reset the order of values within their fields to match their place property
     this.fieldKeys.forEach((field: string) => {
       this.setValuesForFieldSorted(field, this.fields[field]);
     });
   }
 
+  /**
+   * Reset the order of values within a metadata field to their original places
+   * Update the actual array to match the place properties
+   * @param mdField
+   */
+  resetOrder(mdField: string) {
+    this.fields[mdField].forEach((value: DsoEditMetadataValue) => {
+      value.newValue.place = value.originalValue.place;
+      value.confirmChanges();
+    });
+    this.setValuesForFieldSorted(mdField, this.fields[mdField]);
+  }
+
+  /**
+   * Sort fieldKeys alphabetically
+   * Should be called whenever a field is added to ensure the alphabetical order is kept
+   */
+  sortFieldKeys() {
+    this.fieldKeys.sort((a: string, b: string) => a.localeCompare(b));
+  }
+
   /**
    * Undo any previously discarded changes
    */
@@ -356,10 +399,10 @@ export class DsoEditMetadataForm {
       const replaceOperations: MetadataPatchReplaceOperation[] = [];
       const removeOperations: MetadataPatchRemoveOperation[] = [];
       const addOperations: MetadataPatchAddOperation[] = [];
-      values
+      [...values]
         .sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.originalValue.place - b.originalValue.place)
         .forEach((value: DsoEditMetadataValue) => {
-          if (value.hasChanges()) {
+          if (hasValue(value.change)) {
             if (value.change === DsoEditMetadataChangeType.UPDATE) {
               // Only changes to value or language are considered "replace" operations. Changes to place are considered "move", which is processed below.
               if (value.originalValue.value !== value.newValue.value || value.originalValue.language !== value.newValue.language) {
@@ -398,10 +441,10 @@ export class DsoEditMetadataForm {
       const moveOperations = moveAnalyser
         .diff(
           valuesWithoutRemoved
-            .map((value: DsoEditMetadataValue) => value.originalValue.place),
-          valuesWithoutRemoved
-            .sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.newValue.place - b.newValue.place)
-            .map((value: DsoEditMetadataValue) => value.originalValue.place))
+            .map((value: DsoEditMetadataValue) => value.newValue.place),
+          [...valuesWithoutRemoved]
+            .sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.originalValue.place - b.originalValue.place)
+            .map((value: DsoEditMetadataValue) => value.newValue.place))
         .map((operation: MoveOperation) => new MetadataPatchMoveOperation(field, +operation.from.substr(1), +operation.path.substr(1)).toOperation());
       operations.push(...moveOperations);
     });
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
index 9941d03308..4e5890ae7d 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
@@ -1,6 +1,6 @@
 <div class="d-flex flex-row ds-value-row" *ngVar="mdValue.newValue.isVirtual as isVirtual"
      cdkDrag (cdkDragStarted)="dragging.emit(true)" (cdkDragEnded)="dragging.emit(false)"
-     [ngClass]="{ 'ds-warning': mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD, 'h-100': isOnlyValue }">
+     [ngClass]="{ 'ds-warning': mdValue.reordered || mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD, 'h-100': isOnlyValue }">
   <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex align-items-center" *ngVar="(mdRepresentation$ | async) as mdRepresentation">
     <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing && !mdRepresentation">{{ mdValue.newValue.value }}</div>
     <textarea class="form-control" rows="2" *ngIf="mdValue.editing && !mdRepresentation" [(ngModel)]="mdValue.newValue.value"
@@ -27,11 +27,11 @@
           <i class="fas fa-check fa-fw"></i>
         </button>
         <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
-                [disabled]="isVirtual || mdValue.change || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
+                [disabled]="isVirtual || (mdValue.change && mdValue.change !== DsoEditMetadataChangeTypeEnum.ADD) || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
           <i class="fas fa-trash-alt fa-fw"></i>
         </button>
         <button class="btn btn-outline-warning btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
-                [disabled]="isVirtual || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
+                [disabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
           <i class="fas fa-undo-alt fa-fw"></i>
         </button>
       </div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index e498dc373e..8e0f889bbb 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -42,6 +42,10 @@
   <div class="d-flex flex-row ds-field-row" *ngFor="let mdField of form.fieldKeys">
     <div class="lbl-cell">
       <span class="dont-break-out preserve-line-breaks">{{ mdField }}</span>
+      <div class="btn btn-warning reset-order-button mt-2 w-100" *ngIf="form.hasOrderChanges(mdField)"
+           (click)="form.resetOrder(mdField); onValueSaved()">
+        {{ dsoType + '.edit.metadata.reset-order-button' | translate }}
+      </div>
     </div>
     <ds-dso-edit-metadata-field-values class="flex-grow-1"
                                        [dso]="dso"
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
index caf84010f3..4e5e9ff1d4 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
@@ -15,3 +15,7 @@
 .ds-field-row {
   border: 1px solid var(--bs-gray-400);
 }
+
+.reset-order-button:hover {
+  cursor: pointer;
+}
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 6e9bae138e..f8afd69efe 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1837,6 +1837,8 @@
 
   "item.edit.metadata.reinstate-button": "Undo",
 
+  "item.edit.metadata.reset-order-button": "Reset value order",
+
   "item.edit.metadata.save-button": "Save",
 
 

From 247e61ce2b734087a162f087d5cd9bcc38571056 Mon Sep 17 00:00:00 2001
From: Nikunj Sharma <nikunj.sharma@4science.com>
Date: Fri, 16 Dec 2022 19:15:28 +0530
Subject: [PATCH 056/160] [CST-7604] fixed as per tom comment to highlight
 Journal, Project, OrgUnit or Person) or is a Community or Collection

---
 ...rch-result-list-submission-element.component.ts |  2 +-
 ...rch-result-list-submission-element.component.ts |  2 +-
 ...em-search-result-grid-element.component.spec.ts | 14 +++++++++++++-
 .../item-search-result-grid-element.component.ts   |  3 ++-
 .../item-search-result-list-element.component.html |  4 ++--
 .../search-result-list-element.component.ts        |  2 +-
 6 files changed, 20 insertions(+), 7 deletions(-)

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 7a38a02cf4..954f7bc591 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
@@ -61,7 +61,7 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
     this.useNameVariants = this.context === Context.EntitySearchModalWithNameVariants;
 
     if (this.useNameVariants) {
-      const defaultValue = this.dsoTitle;
+      const defaultValue = this.dso ? this.dsoNameService.getName(this.dso) : undefined;
       const alternatives = this.allMetadataValues(this.alternativeField);
       this.allSuggestions = [defaultValue, ...alternatives];
 
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 7d761c42dd..305407f8d2 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
@@ -55,7 +55,7 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu
 
   ngOnInit() {
     super.ngOnInit();
-    const defaultValue = this.dsoTitle;
+    const defaultValue = this.dso ? this.dsoNameService.getName(this.dso) : undefined;
     const alternatives = this.allMetadataValues(this.alternativeField);
     this.allSuggestions = [defaultValue, ...alternatives];
 
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts
index 57b863a1b1..97dda155c5 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts
@@ -28,13 +28,14 @@ import { ItemSearchResultGridElementComponent } from './item-search-result-grid-
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
+const dcTitle = 'This is just another <em>title</em>';
 mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
+        value: dcTitle
       }
     ],
     'dc.contributor.author': [
@@ -154,6 +155,17 @@ export function getEntityGridElementTestComponent(component, searchResultWithMet
           expect(itemAuthorField).toBeNull();
         });
       });
+
+      describe('When the item has title', () => {
+        beforeEach(() => {
+          comp.object = mockItemWithMetadata;
+          fixture.detectChanges();
+        });
+        it('should show highlighted title', () => {
+          const titleField = fixture.debugElement.query(By.css('.card-title'));
+          expect(titleField.nativeNode.innerHTML).toEqual(dcTitle);
+        });
+      });
     });
   };
 }
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
index b5f9c016e4..fc24d5450b 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
@@ -42,6 +42,7 @@ export class ItemSearchResultGridElementComponent extends SearchResultGridElemen
   ngOnInit(): void {
     super.ngOnInit();
     this.itemPageRoute = getItemPageRoute(this.dso);
-    this.dsoTitle = this.dsoNameService.getName(this.dso);
+    this.dsoTitle = this.firstMetadataValue('dc.title') ??
+      (this.dso ? this.dsoNameService.getName(this.dso) : undefined);
   }
 }
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index ad0206bd4e..6b2951495d 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -19,9 +19,9 @@
     <ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">
       <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="firstMetadataValue('dc.title') ?? dsoTitle"></a>
+         [innerHTML]="dsoTitle"></a>
       <span *ngIf="linkType == linkTypes.None" class="lead item-list-title dont-break-out"
-            [innerHTML]="firstMetadataValue('dc.title') ?? dsoTitle"></span>
+            [innerHTML]="dsoTitle"></span>
       <span class="text-muted">
       <ds-truncatable-part [id]="dso.id" [minLines]="1">
         <ng-container *ngIf="dso.firstMetadataValue('dc.publisher') || dso.firstMetadataValue('dc.date.issued')">
diff --git a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
index 72120a6b68..c69044e907 100644
--- a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
@@ -33,7 +33,7 @@ export class SearchResultListElementComponent<T extends SearchResult<K>, K exten
   ngOnInit(): void {
     if (hasValue(this.object)) {
       this.dso = this.object.indexableObject;
-      this.dsoTitle = this.dsoNameService.getName(this.dso);
+      this.dsoTitle = this.firstMetadataValue('dc.title') ?? this.dsoNameService.getName(this.dso);
     }
   }
 

From 28a127ca0e8493872265fb19d0b1caa5cf15deaf Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Fri, 16 Dec 2022 16:50:17 +0100
Subject: [PATCH 057/160] 97399 Improvements to ContextHelpDirective and
 ContextHelpWrapperComponent

---
 .../top-level-community-list.component.html   |  7 ++--
 .../context-help-wrapper.component.html       | 22 +++----------
 .../context-help-wrapper.component.scss       | 18 ++++++-----
 .../context-help-wrapper.component.ts         | 17 ++++------
 .../placement-dir.model.ts                    |  1 +
 src/app/shared/context-help.directive.ts      | 32 ++++++++++++-------
 src/app/shared/shared.module.ts               |  1 +
 src/styles/_custom_variables.scss             |  2 +-
 8 files changed, 49 insertions(+), 51 deletions(-)
 create mode 100644 src/app/shared/context-help-wrapper/placement-dir.model.ts

diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.html b/src/app/home-page/top-level-community-list/top-level-community-list.component.html
index 064b308ed5..71ffee7dc6 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.html
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.html
@@ -1,9 +1,10 @@
 <ng-container *ngVar="(communitiesRD$ | async) as communitiesRD">
   <div *ngIf="communitiesRD?.hasSucceeded ">
     <h2>
-      <span *dsContextHelp="'context-help.multi-para.test'"
-            dsTooltipPlacment="right left">
-          {{'home.top-level-communities.head' | translate}}</span>
+        <span *dsContextHelp="{content: 'context-help.multi-para.test',
+                               tooltipPlacement: 'top',
+                               iconPlacement: 'right'}">
+            {{'home.top-level-communities.head' | translate}}</span>
     </h2>
   <p class="lead">{{'home.top-level-communities.help' | translate}}</p>
   <ds-viewable-collection
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.html b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
index c5c21502dc..f75eb77e2e 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
@@ -1,26 +1,12 @@
-<!-- Set tooltip text. -->
 <ng-template #help>
   <div class="preserve-line-breaks ds-context-help-content">{{ content | translate }}</div>
 </ng-template>
-
-<!-- Help icon, add tooltip to help icon. -->
-<i class="ds-context-help-icon fas fa-question-circle shadow-sm"
+<i [ngClass]="{'ds-context-help-icon fas fa-question-circle shadow-sm': true,
+              'ds-context-help-icon-right': iconPlacement == 'right',
+              'ds-context-help-icon-left': iconPlacement == 'left'}"
    [ngbTooltip]="help"
+   [placement]="tooltipPlacement"
    container="'body'"
    triggers="click:blur">
 </i>
-
-<!-- Indicate where to put the template (that is, the contents of
-     whatever component the context help directive was used on).
--->
 <ng-container *ngTemplateOutlet="templateRef"></ng-container>
-
-
-
-<!-- <i class="ds-context-help-icon fas fa-question-circle shadow-sm"></i> -->
-<!-- <ng-container *ngTemplateOutlet="templateRef"></ng-container> -->
-
-
-<!--    *ngClass="{'ds-context-help-icon-right': tooltipPlacement === 'right', 'ds-context-help-icon-left': tooltipPlacement === 'left'}" -->
-
-
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss b/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
index 30bbac02ff..a58feda71f 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
@@ -3,21 +3,23 @@
 }
 
 .ds-context-help-icon {
-    position: absolute;
-    top: 0;
+  position: absolute;
+  top: 0;
+  cursor: pointer;
+  color: var(--bs-info);
+  background-color: var(--bs-white);
+  font-size: 16px; // not relative, because we don't want the icon to resize based on the container
+  line-height: 1;
+  border-radius: 50%;
 }
 
+
 .ds-context-help-icon-left {
     left: var(--ds-context-x-offset);
-    color: var(--bs-info);
-    background-color: var(--bs-white);
-    font-size: (--dscontext-help-icon-size);
-    line-height: 1;
-    border-radius: 50%;
 }
 
 .ds-context-help-icon-right {
-    right: var(--ds-context-icon-width);
+    right: calc(-1 * var(--ds-context-help-icon-size));
 }
 
 ::ng-deep .tooltip-inner {
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
index b39c2b2f06..bed977f858 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
@@ -1,23 +1,20 @@
 import { Component, Input, OnInit, TemplateRef } from '@angular/core';
 import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
+import { PlacementDir } from './placement-dir.model';
+
+// export type PlacementDir = 'left' | 'right';
 
-export type PlacementDir = 'left' | 'right';
 
 @Component({
   selector: 'ds-context-help-wrapper',
   templateUrl: './context-help-wrapper.component.html',
-  styleUrls: ['./context-help-wrapper.component.scss']
+  styleUrls: ['./context-help-wrapper.component.scss'],
 })
-export class ContextHelpWrapperComponent implements OnInit {
+export class ContextHelpWrapperComponent {
   @Input() templateRef: TemplateRef<any>;
   @Input() content: string;
-  @Input() tooltipPlacement: PlacementArray; // TODO: type
-  // @Input('iconPlacement') iconPlacement: string;
+  @Input() tooltipPlacement: PlacementArray;
+  @Input() iconPlacement: PlacementDir;
 
   constructor() { }
-
-  ngOnInit(): void {
-    // console.log("In ContextHelpWrapperComponent.ngOnInit:", this.content); // XXX
-  }
-
 }
diff --git a/src/app/shared/context-help-wrapper/placement-dir.model.ts b/src/app/shared/context-help-wrapper/placement-dir.model.ts
new file mode 100644
index 0000000000..a02c3e3ec9
--- /dev/null
+++ b/src/app/shared/context-help-wrapper/placement-dir.model.ts
@@ -0,0 +1 @@
+export type PlacementDir = 'left' | 'right';
diff --git a/src/app/shared/context-help.directive.ts b/src/app/shared/context-help.directive.ts
index 712950a6f1..2473b6505d 100644
--- a/src/app/shared/context-help.directive.ts
+++ b/src/app/shared/context-help.directive.ts
@@ -1,29 +1,39 @@
-import { ComponentFactoryResolver, ComponentRef, Directive, Input, OnInit, TemplateRef, ViewContainerRef } from '@angular/core';
+import { ComponentFactoryResolver, ComponentRef, Directive, ElementRef, Input, OnChanges, OnInit, TemplateRef, ViewContainerRef } from '@angular/core';
 import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
-import { ContextHelpWrapperComponent, PlacementDir } from './context-help-wrapper/context-help-wrapper.component';
+import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component';
+import { PlacementDir } from './context-help-wrapper/placement-dir.model';
+
+export type ContextHelpDirectiveInput = {
+  content: string,
+  tooltipPlacement?: PlacementArray,
+  iconPlacement?: PlacementDir
+}
 
 @Directive({
-  selector: '[dsContextHelp]'
+  selector: '[dsContextHelp]',
 })
-export class ContextHelpDirective implements OnInit {
-  @Input('dsContextHelp') content: string;
-  @Input('dsTooltipPlacement') tooltipPlacement: PlacementArray;
-  // @Input('iconPlacement') iconPlacement: PlacementDir;
+export class ContextHelpDirective implements OnChanges {
+  @Input() dsContextHelp: string | ContextHelpDirectiveInput;
 
   protected wrapper: ComponentRef<ContextHelpWrapperComponent>;
 
   constructor(
     private templateRef: TemplateRef<any>,
     private viewContainerRef: ViewContainerRef,
-    private componentFactoryResolver: ComponentFactoryResolver
+    private componentFactoryResolver: ComponentFactoryResolver,
   ){}
 
-  ngOnInit() {
+  ngOnChanges() {
+    const input: ContextHelpDirectiveInput = typeof(this.dsContextHelp) === 'string'
+      ? {content: this.dsContextHelp}
+      : this.dsContextHelp;
+
     const factory
       = this.componentFactoryResolver.resolveComponentFactory(ContextHelpWrapperComponent);
     this.wrapper = this.viewContainerRef.createComponent(factory);
     this.wrapper.instance.templateRef = this.templateRef;
-    this.wrapper.instance.content = this.content;
-    this.wrapper.instance.tooltipPlacement = this.tooltipPlacement;
+    this.wrapper.instance.content = input.content;
+    this.wrapper.instance.tooltipPlacement = input.tooltipPlacement;
+    this.wrapper.instance.iconPlacement = input.iconPlacement;
   }
 }
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 0b51ba131c..d97da4562b 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -180,6 +180,7 @@ import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component'
 import { ContextHelpDirective } from './context-help.directive';
 import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component';
 
+
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
   CommonModule,
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 15c595a564..2013562dec 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -87,5 +87,5 @@
   --ds-search-form-scope-max-width: 150px;
 
   --ds-context-x-offset: -16px;
-  --dscontext-help-icon-size: 16px;
+  --ds-context-help-icon-size: 16px;
 }

From 2afc835b7f1ed1d3b717801c0cc14cd51243fd95 Mon Sep 17 00:00:00 2001
From: "Mark H. Wood" <mwood@iu.edu>
Date: Fri, 16 Dec 2022 17:17:55 -0500
Subject: [PATCH 058/160] Catch and report errors from non-JSON responses.

---
 src/app/core/auth/auth.interceptor.ts | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts
index e55d0c0ff9..672879f436 100644
--- a/src/app/core/auth/auth.interceptor.ts
+++ b/src/app/core/auth/auth.interceptor.ts
@@ -196,7 +196,24 @@ export class AuthInterceptor implements HttpInterceptor {
       authStatus.token = new AuthTokenInfo(accessToken);
     } else {
       authStatus.authenticated = false;
-      authStatus.error = isNotEmpty(error) ? ((typeof error === 'string') ? JSON.parse(error) : error) : null;
+      if (isNotEmpty(error)) {
+        if (typeof error === 'string') {
+          try {
+            authStatus.error = JSON.parse(error);
+          } catch (e) {
+            console.error('Unknown auth error "', error, '" caused ', e);
+            authStatus.error = {
+              error: 'Unknown',
+              message: 'Unknown auth error',
+              status: 500,
+              timestamp: Date.now(),
+              path: ''
+              };
+          }
+        } else {
+          authStatus.error = error;
+        }
+      }
     }
     return authStatus;
   }

From 1ae18ec9f7abc8ac2e27a084e6d716599910a620 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Mon, 19 Dec 2022 14:55:55 +0100
Subject: [PATCH 059/160] 97399 Added support for links in tooltips

---
 src/app/footer/footer.component.html          |  6 +-
 .../context-help-wrapper.component.html       | 18 ++++-
 .../context-help-wrapper.component.scss       |  2 +-
 .../context-help-wrapper.component.ts         | 70 +++++++++++++++++--
 src/app/shared/context-help.directive.ts      | 11 +++
 src/assets/i18n/en.json5                      |  2 +-
 6 files changed, 96 insertions(+), 13 deletions(-)

diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index 2c1a34ccae..58f264a5ef 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -64,7 +64,11 @@
       </p>
       <ul class="footer-info list-unstyled small d-flex justify-content-center mb-0">
         <li>
-          <a class="text-white" href="javascript:void(0);"
+            <a *dsContextHelp="{content: 'context-help.multi-para.test',
+                                tooltipPlacement: 'top',
+                                iconPlacement: 'left'
+                               }"
+                class="text-white" href="javascript:void(0);"
              (click)="showCookieSettings()">{{ 'footer.link.cookies' | translate}}</a>
         </li>
         <li>
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.html b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
index f75eb77e2e..e6fd49608f 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
@@ -1,9 +1,21 @@
+
+
 <ng-template #help>
-  <div class="preserve-line-breaks ds-context-help-content">{{ content | translate }}</div>
+    <div class="preserve-line-breaks ds-context-help-content">
+        <ng-container *ngFor="let elem of (parsedContent$ | async)">
+            <ng-container *ngIf="elem.href">
+                <a href="{{elem.href}}" target="_blank">{{elem.text}}</a>
+            </ng-container>
+            <ng-container *ngIf="elem.href === undefined">
+                {{ elem }}
+            </ng-container>
+        </ng-container>
+        <!--         {{ content | translate }} -->
+    </div>
 </ng-template>
 <i [ngClass]="{'ds-context-help-icon fas fa-question-circle shadow-sm': true,
-              'ds-context-help-icon-right': iconPlacement == 'right',
-              'ds-context-help-icon-left': iconPlacement == 'left'}"
+              'ds-context-help-icon-right': iconPlacement !== 'left',
+              'ds-context-help-icon-left': iconPlacement === 'left'}"
    [ngbTooltip]="help"
    [placement]="tooltipPlacement"
    container="'body'"
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss b/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
index a58feda71f..d945548ca4 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
@@ -23,5 +23,5 @@
 }
 
 ::ng-deep .tooltip-inner {
-    max-width: 300px;
+    width: 300px;
 }
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
index bed977f858..7f555463cf 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
@@ -1,10 +1,10 @@
 import { Component, Input, OnInit, TemplateRef } from '@angular/core';
 import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable, of as observableOf } from 'rxjs';
+import { map } from 'rxjs/operators';
 import { PlacementDir } from './placement-dir.model';
 
-// export type PlacementDir = 'left' | 'right';
-
-
 @Component({
   selector: 'ds-context-help-wrapper',
   templateUrl: './context-help-wrapper.component.html',
@@ -12,9 +12,65 @@ import { PlacementDir } from './placement-dir.model';
 })
 export class ContextHelpWrapperComponent {
   @Input() templateRef: TemplateRef<any>;
-  @Input() content: string;
-  @Input() tooltipPlacement: PlacementArray;
-  @Input() iconPlacement: PlacementDir;
+  @Input() tooltipPlacement?: PlacementArray;
+  @Input() iconPlacement?: PlacementDir;
+  @Input() dontParseLinks?: boolean;
 
-  constructor() { }
+  // TODO: dependent on evaluation order of input setters?
+  parsedContent$: Observable<(string | {href: string, text: string})[]> = observableOf([]);
+  @Input() set content(content : string) {
+    this.parsedContent$ = this.translateService.get(content).pipe(
+      map(this.dontParseLinks
+        ? ((text: string) => [text])
+        : this.parseLinks)
+    );
+  }
+
+  constructor(private translateService: TranslateService) { }
+
+  /*
+   * Parses Markdown-style links, splitting up a given text
+   * into link-free pieces of text and objects of the form
+   * {href: string, text: string} (which represent links).
+   * This function makes no effort to check whether the href is a
+   * correct URL. Currently this function does not support escape
+   * characters: its behavior when given a string containing square
+   * brackets that do not deliminate a link is undefined.
+   * Regular parentheses outside of links do work, however.
+   *
+   * For example:
+   * parseLinks("This is text, [this](https://google.com) is a link, and [so is this](https://youtube.com)")
+   * =
+   * [ "This is text, ",
+   *   {href: "https://google.com", text: "this"},
+   *   " is a link, and ",
+   *   {href: "https://youtube.com", text: "so is this"}
+   * ]
+   */ 
+  private parseLinks(content: string): (string | {href: string, text: string})[] {
+    // Implementation note: due to unavailability of `matchAll` method on strings,
+    // separate "split" and "parse" steps are needed.
+
+    // We use splitRegexp (the outer `match` call) to split the text
+    // into link-free pieces of text (matched by /[^\[]+/) and pieces
+    // of text of the form "[some link text](some.link.here)" (matched
+    // by /\[([^\]]*)\]\(([^\)]*)\)/)
+    const splitRegexp = /[^\[]+|\[([^\]]*)\]\(([^\)]*)\)/g;
+
+    // Once the array is split up in link-representing strings and
+    // non-link-representing strings, we use parseRegexp (the inner
+    // `match` call) to transform the link-representing strings into
+    // {href: string, text: string} objects.
+    const parseRegexp = /^\[([^\]]*)\]\(([^\)]*)\)$/;
+
+    return content.match(splitRegexp).map((substring: string) => {
+      const match = substring.match(parseRegexp);
+      return match === null
+        ? substring
+        : ({href: match[2], text: match[1]});
+    });
+  }
 }
+
+
+  
diff --git a/src/app/shared/context-help.directive.ts b/src/app/shared/context-help.directive.ts
index 2473b6505d..4ffa4d24d6 100644
--- a/src/app/shared/context-help.directive.ts
+++ b/src/app/shared/context-help.directive.ts
@@ -9,10 +9,21 @@ export type ContextHelpDirectiveInput = {
   iconPlacement?: PlacementDir
 }
 
+/*
+ * Directive to add a clickable tooltip icon to an element.
+ * The tooltip icon's position is configurable ('left' or 'right')
+ * and so is the position of the tooltip itself (PlacementArray).
+ */
 @Directive({
   selector: '[dsContextHelp]',
 })
 export class ContextHelpDirective implements OnChanges {
+  /*
+   * Expects an object with the following fields:
+   * - content: a string referring to an entry in the i18n files
+   * - tooltipPlacement: a PlacementArray describing where the tooltip should expand, relative to the tooltip icon
+   * - iconPlacement: a string 'left' or 'right', describing where the tooltip icon should be placed, relative to the element
+   */
   @Input() dsContextHelp: string | ContextHelpDirectiveInput;
 
   protected wrapper: ComponentRef<ContextHelpWrapperComponent>;
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index c9d9a32699..4151e4202d 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4164,6 +4164,6 @@
 
   "idle-modal.extend-session": "Extend session",
 
-  "context-help.multi-para.test": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In facilisis ac metus ut tristique. Integer eros risus, efficitur non urna eu, ultrices mollis felis. Nullam mi sapien, mattis eu nunc in, rhoncus vulputate risus. \n\nDuis pharetra et nibh aliquam sodales. Integer ut rutrum dolor, ut maximus quam. Nunc sit amet maximus urna. In nec erat vulputate, facilisis nulla a, scelerisque orci. Ut pellentesque sapien et eros euismod scelerisque finibus at sem. Duis egestas convallis ligula nec laoreet. \n\nProin ut magna sit amet libero consequat ultrices et sed mi. Nam congue sed risus ac fringilla. Suspendisse potenti. Cras mattis, est non laoreet elementum, erat enim interdum tortor, eu placerat enim metus sit amet enim.",
+  "context-help.multi-para.test": "Lorem ipsum dolor [sit amet](https://google.com), consectetur adipiscing [elit](https://youtube.com). In facilisis ac metus ut tristique. Integer eros risus, efficitur non urna eu, ultrices mollis felis. Nullam mi sapien, mattis eu nunc in, rhoncus vulputate risus. \n\nDuis pharetra et nibh aliquam sodales. Integer ut rutrum dolor, ut maximus quam. Nunc sit amet maximus urna. In nec erat vulputate, facilisis nulla a, scelerisque orci. Ut pellentesque sapien et eros euismod scelerisque finibus at sem. Duis egestas convallis ligula nec laoreet. \n\nProin ut magna sit amet libero consequat ultrices et sed mi. Nam congue sed risus ac fringilla. Suspendisse potenti. Cras mattis, est non laoreet elementum, erat enim interdum tortor, eu placerat enim metus sit amet enim.",
 
 }

From c158fd18c9b26278f528bc4001a39e8c377fd5ee Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Mon, 19 Dec 2022 17:05:26 +0100
Subject: [PATCH 060/160] 97399 Documentation

---
 .../context-help-wrapper.component.html       |  3 ---
 .../context-help-wrapper.component.ts         | 20 +++++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.html b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
index e6fd49608f..939ad8323c 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
@@ -1,5 +1,3 @@
-
-
 <ng-template #help>
     <div class="preserve-line-breaks ds-context-help-content">
         <ng-container *ngFor="let elem of (parsedContent$ | async)">
@@ -10,7 +8,6 @@
                 {{ elem }}
             </ng-container>
         </ng-container>
-        <!--         {{ content | translate }} -->
     </div>
 </ng-template>
 <i [ngClass]="{'ds-context-help-icon fas fa-question-circle shadow-sm': true,
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
index 7f555463cf..1792425798 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
@@ -5,15 +5,35 @@ import { Observable, of as observableOf } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { PlacementDir } from './placement-dir.model';
 
+/*
+ * This component renders an info icon next to the wrapped element which
+ * produces a tooltip when clicked.
+ */
 @Component({
   selector: 'ds-context-help-wrapper',
   templateUrl: './context-help-wrapper.component.html',
   styleUrls: ['./context-help-wrapper.component.scss'],
 })
 export class ContextHelpWrapperComponent {
+  /*
+   * Template reference for the wrapped element.
+   */
   @Input() templateRef: TemplateRef<any>;
+
+  /*
+   * Indicate where the tooltip should show up, relative to the info icon.
+   */
   @Input() tooltipPlacement?: PlacementArray;
+
+  /*
+   * Indicate whether the info icon should appear to the left or to
+   * the right of the wrapped element.
+   */
   @Input() iconPlacement?: PlacementDir;
+
+  /*
+   * If true, don't process text to render links.
+   */
   @Input() dontParseLinks?: boolean;
 
   // TODO: dependent on evaluation order of input setters?

From d029e804953e1a2b1636dbf3dcc431de302b34b3 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Mon, 19 Dec 2022 12:32:53 -0800
Subject: [PATCH 061/160] Convert to themed, shared component

---
 .../journal-issue.component.html              |  6 +--
 .../journal-volume.component.html             |  6 +--
 .../item-pages/journal/journal.component.html |  6 +--
 .../org-unit/org-unit.component.html          |  6 +--
 .../item-pages/person/person.component.html   |  6 +--
 .../item-pages/project/project.component.html |  6 +--
 .../publication/publication.component.html    |  6 +--
 .../item-types/shared/item.component.spec.ts  | 18 -------
 .../item-types/shared/item.component.ts       | 16 +------
 .../untyped-item/untyped-item.component.html  |  6 +--
 .../untyped-item.component.spec.ts            |  5 --
 .../versioned-item.component.ts               |  2 +-
 .../item-back-button.component.html           |  4 ++
 .../item-back-button.component.scss           |  4 ++
 .../item-back-button.component.spec.ts        | 48 +++++++++++++++++++
 .../item-back-button.component.ts             | 32 +++++++++++++
 .../themed-item-back-button.component.ts      | 23 +++++++++
 src/app/shared/shared.module.ts               |  4 ++
 .../item-back-button.component.html           |  0
 .../item-back-button.component.scss           |  0
 .../item-back-button.component.ts             | 13 +++++
 src/themes/custom/eager-theme.module.ts       |  2 +
 22 files changed, 148 insertions(+), 71 deletions(-)
 create mode 100644 src/app/shared/item-back-button/item-back-button.component.html
 create mode 100644 src/app/shared/item-back-button/item-back-button.component.scss
 create mode 100644 src/app/shared/item-back-button/item-back-button.component.spec.ts
 create mode 100644 src/app/shared/item-back-button/item-back-button.component.ts
 create mode 100644 src/app/shared/item-back-button/themed-item-back-button.component.ts
 create mode 100644 src/themes/custom/app/shared/item-back-button/item-back-button.component.html
 create mode 100644 src/themes/custom/app/shared/item-back-button/item-back-button.component.scss
 create mode 100644 src/themes/custom/app/shared/item-back-button/item-back-button.component.ts

diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
index 22002d4af6..0507153ab7 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
@@ -1,8 +1,6 @@
-<div class="row" *ngIf="showBackButton | async" (click)="back()">
+<div class="row" *ngIf="showBackButton | async">
   <div class="col-12">
-    <button class="btn btn-secondary back-btn ng-tns-c242-28" >
-      <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
-      {{"search-browse-item-return" | translate}}</button>
+    <ds-themed-item-back-button></ds-themed-item-back-button>
   </div>
 </div>
 
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
index 23b600691c..6265b515a8 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -1,8 +1,6 @@
-<div class="row" *ngIf="showBackButton | async" (click)="back()">
+<div class="row" *ngIf="showBackButton | async">
   <div class="col-12">
-    <button class="btn btn-secondary back-btn ng-tns-c242-28" >
-      <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
-      {{"search-browse-item-return" | translate}}</button>
+    <ds-themed-item-back-button></ds-themed-item-back-button>
   </div>
 </div>
 
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index f52990f539..ddd4b53a30 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -1,8 +1,6 @@
-<div class="row" *ngIf="showBackButton | async" (click)="back()">
+<div class="row" *ngIf="showBackButton | async">
   <div class="col-12">
-    <button class="btn btn-secondary back-btn ng-tns-c242-28" >
-      <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
-      {{"search-browse-item-return" | translate}}</button>
+    <ds-themed-item-back-button></ds-themed-item-back-button>
   </div>
 </div>
 
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
index bd75e0bcde..89a3417d62 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -1,8 +1,6 @@
-<div class="row" *ngIf="showBackButton | async" (click)="back()">
+<div class="row" *ngIf="showBackButton | async">
   <div class="col-12">
-    <button class="btn btn-secondary back-btn ng-tns-c242-28" >
-      <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
-      {{"search-browse-item-return" | translate}}</button>
+    <ds-themed-item-back-button></ds-themed-item-back-button>
   </div>
 </div>
 
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
index a1486fde0e..f805b6568c 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -1,8 +1,6 @@
-<div class="row" *ngIf="showBackButton | async" (click)="back()">
+<div class="row" *ngIf="showBackButton | async">
   <div class="col-12">
-    <button class="btn btn-secondary back-btn ng-tns-c242-28" >
-      <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
-      {{"search-browse-item-return" | translate}}</button>
+    <ds-themed-item-back-button></ds-themed-item-back-button>
   </div>
 </div>
 
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
index 991cbf864d..6ccfdbf5e0 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
@@ -1,8 +1,6 @@
-<div class="row" *ngIf="showBackButton | async" (click)="back()">
+<div class="row" *ngIf="showBackButton | async">
   <div class="col-12">
-    <button class="btn btn-secondary back-btn ng-tns-c242-28" >
-      <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
-      {{"search-browse-item-return" | translate}}</button>
+    <ds-themed-item-back-button></ds-themed-item-back-button>
   </div>
 </div>
 
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html
index 9c02fc8fd8..2741d90500 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/item-page/simple/item-types/publication/publication.component.html
@@ -1,8 +1,6 @@
-<div class="row" *ngIf="showBackButton | async" (click)="back()">
+<div class="row" *ngIf="showBackButton | async">
   <div class="col-12">
-    <button class="btn btn-secondary back-btn ng-tns-c242-28" >
-      <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
-      {{"search-browse-item-return" | translate}}</button>
+    <ds-themed-item-back-button></ds-themed-item-back-button>
   </div>
 </div>
 
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 914483bbfd..7544a857b3 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
@@ -478,24 +478,6 @@ describe('ItemComponent', () => {
         expect(val).toBeTrue();
       });
     });
-    it('should navigate back to the search list', () => {
-      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(searchUrl));
-      comp.back();
-      expect(mockRouteService.getPreviousUrl).toHaveBeenCalled();
-      expect(router.navigateByUrl).toHaveBeenCalledWith(searchUrl);
-    });
-    it('should navigate back to the browse list', () => {
-      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(browseUrl));
-      comp.back();
-      expect(mockRouteService.getPreviousUrl).toHaveBeenCalled();
-      expect(router.navigateByUrl).toHaveBeenCalledWith(browseUrl);
-    });
-    it('should navigate back to the recent submissions list', () => {
-      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(recentSubmissionsUrl));
-      comp.back();
-      expect(mockRouteService.getPreviousUrl).toHaveBeenCalled();
-      expect(router.navigateByUrl).toHaveBeenCalledWith(recentSubmissionsUrl);
-    });
   });
 
 });
diff --git a/src/app/item-page/simple/item-types/shared/item.component.ts b/src/app/item-page/simple/item-types/shared/item.component.ts
index b5037924f3..297886dfaa 100644
--- a/src/app/item-page/simple/item-types/shared/item.component.ts
+++ b/src/app/item-page/simple/item-types/shared/item.component.ts
@@ -6,7 +6,6 @@ import { RouteService } from '../../../../core/services/route.service';
 import { Observable } from 'rxjs';
 import { getDSpaceQuery, isIiifEnabled, isIiifSearchEnabled } from './item-iiif-utils';
 import { filter, map, take } from 'rxjs/operators';
-import { Router } from '@angular/router';
 
 @Component({
   selector: 'ds-item',
@@ -45,22 +44,9 @@ export class ItemComponent implements OnInit {
 
   mediaViewer;
 
-  constructor(protected routeService: RouteService,
-              protected router: Router) {
+  constructor(protected routeService: RouteService) {
     this.mediaViewer = environment.mediaViewer;
   }
-
-  /**
-   * Navigate back from the item to the previous pagination url.
-   */
-  public back() {
-    this.routeService.getPreviousUrl().pipe(
-      take(1)
-    ).subscribe(
-      (url => this.router.navigateByUrl(url))
-    );
-  }
-
   ngOnInit(): void {
     this.itemPageRoute = getItemPageRoute(this.object);
     // check to see if iiif viewer is required.
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
index ebc4aaa38a..b6c54138ce 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -1,8 +1,6 @@
-<div class="row" *ngIf="showBackButton | async" (click)="back()">
+<div class="row" *ngIf="showBackButton | async">
   <div class="col-12">
-    <button class="btn btn-secondary back-btn ng-tns-c242-28" >
-      <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
-      {{"search-browse-item-return" | translate}}</button>
+    <ds-themed-item-back-button></ds-themed-item-back-button>
   </div>
 </div>
 
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 135810d543..85d6d4728e 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
@@ -196,11 +196,6 @@ describe('UntypedItemComponent', () => {
     it('should retrieve the query term for previous route', (): void => {
       expect(comp.iiifQuery$.subscribe(result => expect(result).toEqual('test query')));
     });
-    it('should navigate back to the browse list', () => {
-      comp.back();
-      expect(localMockRouteService.getPreviousUrl).toHaveBeenCalled();
-      //expect(routerSpy.navigateByUrl).toHaveBeenCalledWith(url);
-    });
   });
 
   describe('with IIIF viewer and search but no previous search query', () => {
diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
index 2dbbd494d6..0308a85ade 100644
--- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
+++ b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
@@ -37,7 +37,7 @@ export class VersionedItemComponent extends ItemComponent {
     private itemService: ItemDataService,
     protected routeService: RouteService,
   ) {
-    super(routeService, router);
+    super(routeService);
   }
 
   /**
diff --git a/src/app/shared/item-back-button/item-back-button.component.html b/src/app/shared/item-back-button/item-back-button.component.html
new file mode 100644
index 0000000000..acd49bda3a
--- /dev/null
+++ b/src/app/shared/item-back-button/item-back-button.component.html
@@ -0,0 +1,4 @@
+<button class="btn btn-secondary btn-sm back-btn ng-tns-c242-28" (click)="back()">
+  <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
+  {{"search-browse-item-return" | translate}}
+</button>
diff --git a/src/app/shared/item-back-button/item-back-button.component.scss b/src/app/shared/item-back-button/item-back-button.component.scss
new file mode 100644
index 0000000000..57d3445d89
--- /dev/null
+++ b/src/app/shared/item-back-button/item-back-button.component.scss
@@ -0,0 +1,4 @@
+
+button.back-btn {
+  margin-bottom: 10px;
+}
diff --git a/src/app/shared/item-back-button/item-back-button.component.spec.ts b/src/app/shared/item-back-button/item-back-button.component.spec.ts
new file mode 100644
index 0000000000..5d1b2c96f3
--- /dev/null
+++ b/src/app/shared/item-back-button/item-back-button.component.spec.ts
@@ -0,0 +1,48 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ItemBackButtonComponent } from './item-back-button.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { RouteService } from '../../core/services/route.service';
+import { RouterTestingModule } from '@angular/router/testing';
+import { Observable, of } from 'rxjs';
+import { Router } from '@angular/router';
+
+describe('ItemBackButtonComponent', () => {
+  let component: ItemBackButtonComponent;
+  let fixture: ComponentFixture<ItemBackButtonComponent>;
+  let router;
+  const searchUrl = '/search?query=test&spc.page=2';
+
+  const mockRouteService = {
+    getPreviousUrl(): Observable<string> {
+      return of(searchUrl);
+    }
+  };
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ItemBackButtonComponent],
+      imports: [TranslateModule.forRoot(),
+        RouterTestingModule],
+      providers: [
+      { provide: RouteService, useValue: {} },
+    ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+
+
+  beforeEach(waitForAsync(() => {
+    router = TestBed.inject(Router);
+    spyOn(router, 'navigateByUrl');
+    spyOn(mockRouteService, 'getPreviousUrl');
+    fixture = TestBed.createComponent(ItemBackButtonComponent);
+    component = fixture.componentInstance;
+  }));
+
+  describe('back button click', () => {
+    component.back();
+    expect(mockRouteService.getPreviousUrl).toHaveBeenCalled();
+    expect(router.navigateByUrl).toHaveBeenCalledWith(searchUrl);
+  });
+  }));
+});
diff --git a/src/app/shared/item-back-button/item-back-button.component.ts b/src/app/shared/item-back-button/item-back-button.component.ts
new file mode 100644
index 0000000000..6e0d96520d
--- /dev/null
+++ b/src/app/shared/item-back-button/item-back-button.component.ts
@@ -0,0 +1,32 @@
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { take } from 'rxjs/operators';
+import { RouteService } from '../../core/services/route.service';
+import { Router } from '@angular/router';
+
+@Component({
+  selector: 'ds-item-back-button',
+  styleUrls: ['./item-back-button.component.scss'],
+  templateUrl: './item-back-button.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+/**
+ * Component to add back to result list button to item.
+ */
+export class ItemBackButtonComponent {
+
+  constructor(protected routeService: RouteService,
+              protected router: Router) {
+  }
+
+  /**
+   * Navigate back from the item to the previous pagination url.
+   */
+  public back() {
+    this.routeService.getPreviousUrl().pipe(
+      take(1)
+    ).subscribe(
+      (url => this.router.navigateByUrl(url))
+    );
+  }
+
+}
diff --git a/src/app/shared/item-back-button/themed-item-back-button.component.ts b/src/app/shared/item-back-button/themed-item-back-button.component.ts
new file mode 100644
index 0000000000..f24556ad22
--- /dev/null
+++ b/src/app/shared/item-back-button/themed-item-back-button.component.ts
@@ -0,0 +1,23 @@
+import { Component } from '@angular/core';
+import { ThemedComponent } from '../theme-support/themed.component';
+import { ItemBackButtonComponent } from './item-back-button.component';
+
+@Component({
+  selector: 'ds-themed-item-back-button',
+  styleUrls: [],
+  templateUrl: '../theme-support/themed.component.html',
+})
+export class ThemedItemBackButtonComponent extends ThemedComponent<ItemBackButtonComponent> {
+  protected getComponentName(): string {
+    return 'ItemBackButtonComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/shared/item-back-button/item-back-button.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./item-back-button.component`);
+  }
+
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 0eb5284112..0c849a36ba 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -326,6 +326,8 @@ import { GoogleRecaptchaModule } from '../core/google-recaptcha/google-recaptcha
 import {
   ListableNotificationObjectComponent
 } from './object-list/listable-notification-object/listable-notification-object.component';
+import { ItemBackButtonComponent } from './item-back-button/item-back-button.component';
+import { ThemedItemBackButtonComponent } from './item-back-button/themed-item-back-button.component';
 
 const MODULES = [
   CommonModule,
@@ -410,6 +412,8 @@ const COMPONENTS = [
   ItemSubmitterComponent,
   ItemDetailPreviewComponent,
   ItemDetailPreviewFieldComponent,
+  ItemBackButtonComponent,
+  ThemedItemBackButtonComponent,
   ClaimedTaskActionsComponent,
   ClaimedTaskActionsApproveComponent,
   ClaimedTaskActionsRejectComponent,
diff --git a/src/themes/custom/app/shared/item-back-button/item-back-button.component.html b/src/themes/custom/app/shared/item-back-button/item-back-button.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/item-back-button/item-back-button.component.scss b/src/themes/custom/app/shared/item-back-button/item-back-button.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/item-back-button/item-back-button.component.ts b/src/themes/custom/app/shared/item-back-button/item-back-button.component.ts
new file mode 100644
index 0000000000..4277a26219
--- /dev/null
+++ b/src/themes/custom/app/shared/item-back-button/item-back-button.component.ts
@@ -0,0 +1,13 @@
+import {
+  ItemBackButtonComponent as BaseComponent
+} from '../../../../../app/shared/item-back-button/item-back-button.component';
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-item-back-button',
+  // styleUrls: ['./item-back-button.component.scss'],
+  styleUrls: ['../../../../../app/shared/item-back-button/item-back-button.component.scss'],
+  //templateUrl: './item-back-button.component.html',
+  templateUrl: '../../../../../app/shared/item-back-button/item-back-button.component.html'
+})
+export class ItemBackButtonComponent extends BaseComponent {}
diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts
index 4e3c6f8b46..d384d7f78e 100644
--- a/src/themes/custom/eager-theme.module.ts
+++ b/src/themes/custom/eager-theme.module.ts
@@ -43,6 +43,7 @@ import {
 
 import { CommunityListElementComponent } from './app/shared/object-list/community-list-element/community-list-element.component';
 import { CollectionListElementComponent} from './app/shared/object-list/collection-list-element/collection-list-element.component';
+import { ItemBackButtonComponent } from './app/shared/item-back-button/item-back-button.component';
 
 
 /**
@@ -74,6 +75,7 @@ const DECLARATIONS = [
   EditCollectionSelectorComponent,
   EditCommunitySelectorComponent,
   EditItemSelectorComponent,
+  ItemBackButtonComponent
 ];
 
 @NgModule({

From d34cea1215891d741796d165c6e93766f6461814 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Mon, 19 Dec 2022 13:01:53 -0800
Subject: [PATCH 062/160] Fixed module.

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

diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 6228fef3a3..235c16d213 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -317,6 +317,7 @@ import {
 } from './object-list/listable-notification-object/listable-notification-object.component';
 import { ThemedItemBackButtonComponent } from './item-back-button/themed-item-back-button.component';
 import { ThemedCollectionDropdownComponent } from './collection-dropdown/themed-collection-dropdown.component';
+import { ItemBackButtonComponent } from './item-back-button/item-back-button.component';
 
 
 const MODULES = [
@@ -397,6 +398,7 @@ const COMPONENTS = [
   ItemSubmitterComponent,
   ItemDetailPreviewComponent,
   ItemDetailPreviewFieldComponent,
+  ItemBackButtonComponent,
   ThemedItemBackButtonComponent,
   ClaimedTaskActionsComponent,
   ClaimedTaskActionsLoaderComponent,

From c28f1659236ff070cc2728e024171b07b251cbb4 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Mon, 19 Dec 2022 15:21:29 -0800
Subject: [PATCH 063/160] Node 18 spec fix

---
 .../item-page/simple/item-types/shared/item.component.spec.ts    | 1 -
 1 file changed, 1 deletion(-)

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 7544a857b3..e08c651f7c 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
@@ -457,7 +457,6 @@ describe('ItemComponent', () => {
     beforeEach(waitForAsync(() => {
       router = TestBed.inject(Router);
       spyOn(router, 'navigateByUrl');
-      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(''));
       TestBed.compileComponents();
       fixture = TestBed.createComponent(ItemComponent);
       comp = fixture.componentInstance;

From 73a9e0b0bb53d5dd27b6b1196525781a82e6ebaf Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Tue, 20 Dec 2022 13:46:59 -0800
Subject: [PATCH 064/160] Apply shared button component to browse-by.

---
 .../journal-issue.component.html              |   2 +-
 .../journal-volume.component.html             |   2 +-
 .../item-pages/journal/journal.component.html |   2 +-
 .../org-unit/org-unit.component.html          |   2 +-
 .../item-pages/person/person.component.html   |   2 +-
 .../item-pages/project/project.component.html |   2 +-
 .../publication/publication.component.html    |   2 +-
 .../untyped-item/untyped-item.component.html  |   2 +-
 .../shared/browse-by/browse-by.component.html |   4 +-
 .../item-back-button.component.spec.ts        |  48 --------
 .../item-back-button.component.ts             |  32 ------
 .../themed-item-back-button.component.ts      |  23 ----
 .../results-back-button.component.html}       |   2 +-
 .../results-back-button.component.scss}       |   0
 .../results-back-button.component.spec.ts     | 103 ++++++++++++++++++
 .../results-back-button.component.ts          |  70 ++++++++++++
 .../themed-results-back-button.component.ts   |  23 ++++
 src/app/shared/shared.module.ts               |   8 +-
 src/assets/i18n/en.json5                      |   2 +-
 .../item-back-button.component.ts             |  13 ---
 .../results-back-button.component.html}       |   0
 .../results-back-button.component.scss}       |   0
 .../results-back-button.component.ts          |  13 +++
 src/themes/custom/eager-theme.module.ts       |  35 +++---
 24 files changed, 244 insertions(+), 148 deletions(-)
 delete mode 100644 src/app/shared/item-back-button/item-back-button.component.spec.ts
 delete mode 100644 src/app/shared/item-back-button/item-back-button.component.ts
 delete mode 100644 src/app/shared/item-back-button/themed-item-back-button.component.ts
 rename src/app/shared/{item-back-button/item-back-button.component.html => results-back-button/results-back-button.component.html} (79%)
 rename src/app/shared/{item-back-button/item-back-button.component.scss => results-back-button/results-back-button.component.scss} (100%)
 create mode 100644 src/app/shared/results-back-button/results-back-button.component.spec.ts
 create mode 100644 src/app/shared/results-back-button/results-back-button.component.ts
 create mode 100644 src/app/shared/results-back-button/themed-results-back-button.component.ts
 delete mode 100644 src/themes/custom/app/shared/item-back-button/item-back-button.component.ts
 rename src/themes/custom/app/shared/{item-back-button/item-back-button.component.html => results-back-button/results-back-button.component.html} (100%)
 rename src/themes/custom/app/shared/{item-back-button/item-back-button.component.scss => results-back-button/results-back-button.component.scss} (100%)
 create mode 100644 src/themes/custom/app/shared/results-back-button/results-back-button.component.ts

diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
index 0507153ab7..db3d3f8bd1 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
@@ -1,6 +1,6 @@
 <div class="row" *ngIf="showBackButton | async">
   <div class="col-12">
-    <ds-themed-item-back-button></ds-themed-item-back-button>
+    <ds-themed-results-back-button></ds-themed-results-back-button>
   </div>
 </div>
 
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
index 6265b515a8..957d409ed0 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -1,6 +1,6 @@
 <div class="row" *ngIf="showBackButton | async">
   <div class="col-12">
-    <ds-themed-item-back-button></ds-themed-item-back-button>
+    <ds-themed-results-back-button></ds-themed-results-back-button>
   </div>
 </div>
 
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index ddd4b53a30..c6ad79628d 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -1,6 +1,6 @@
 <div class="row" *ngIf="showBackButton | async">
   <div class="col-12">
-    <ds-themed-item-back-button></ds-themed-item-back-button>
+    <ds-themed-results-back-button></ds-themed-results-back-button>
   </div>
 </div>
 
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
index 89a3417d62..06d6ba5b1d 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -1,6 +1,6 @@
 <div class="row" *ngIf="showBackButton | async">
   <div class="col-12">
-    <ds-themed-item-back-button></ds-themed-item-back-button>
+    <ds-themed-results-back-button></ds-themed-results-back-button>
   </div>
 </div>
 
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
index f805b6568c..d02ffeaf55 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -1,6 +1,6 @@
 <div class="row" *ngIf="showBackButton | async">
   <div class="col-12">
-    <ds-themed-item-back-button></ds-themed-item-back-button>
+    <ds-themed-results-back-button></ds-themed-results-back-button>
   </div>
 </div>
 
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
index 6ccfdbf5e0..f1fea10e33 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
@@ -1,6 +1,6 @@
 <div class="row" *ngIf="showBackButton | async">
   <div class="col-12">
-    <ds-themed-item-back-button></ds-themed-item-back-button>
+    <ds-themed-results-back-button></ds-themed-results-back-button>
   </div>
 </div>
 
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html
index 2741d90500..92da2f14ca 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/item-page/simple/item-types/publication/publication.component.html
@@ -1,6 +1,6 @@
 <div class="row" *ngIf="showBackButton | async">
   <div class="col-12">
-    <ds-themed-item-back-button></ds-themed-item-back-button>
+    <ds-themed-results-back-button></ds-themed-results-back-button>
   </div>
 </div>
 
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
index b6c54138ce..9ca50cc2ee 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -1,6 +1,6 @@
 <div class="row" *ngIf="showBackButton | async">
   <div class="col-12">
-    <ds-themed-item-back-button></ds-themed-item-back-button>
+    <ds-themed-results-back-button></ds-themed-results-back-button>
   </div>
 </div>
 
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index 7d9153b9f8..a4f473f583 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -3,7 +3,7 @@
   <ng-container *ngComponentOutlet="getStartsWithComponent(); injector: objectInjector;"></ng-container>
   <div *ngIf="objects?.hasSucceeded && !objects?.isLoading && objects?.payload?.page.length > 0" @fadeIn>
       <div *ngIf="shouldDisplayResetButton$ |async" class="mb-2 reset">
-          <button class="btn btn-secondary" (click)="back()"><i class="fas fa-arrow-left"></i> {{'browse.back.all-results' | translate}}</button>
+        <ds-results-back-button [paginationConfig]="paginationConfig" [previousPage$]="previousPage$"></ds-results-back-button>
       </div>
     <ds-viewable-collection
       [config]="paginationConfig"
@@ -18,7 +18,7 @@
   <ds-error *ngIf="objects?.hasFailed" message="{{'error.browse-by' | translate}}"></ds-error>
   <div *ngIf="!objects?.isLoading && objects?.payload?.page.length === 0">
     <div *ngIf="shouldDisplayResetButton$ |async" class="d-inline-block mb-4 reset">
-      <button class="btn btn-secondary" (click)="back()"><i class="fas fa-arrow-left"></i> {{'browse.back.all-results' | translate}}</button>
+      <ds-results-back-button [paginationConfig]="paginationConfig" [previousPage$]="previousPage$" ></ds-results-back-button>
     </div>
     <div class="alert alert-info w-100" role="alert">
       {{'browse.empty' | translate}}
diff --git a/src/app/shared/item-back-button/item-back-button.component.spec.ts b/src/app/shared/item-back-button/item-back-button.component.spec.ts
deleted file mode 100644
index 5d1b2c96f3..0000000000
--- a/src/app/shared/item-back-button/item-back-button.component.spec.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ItemBackButtonComponent } from './item-back-button.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouteService } from '../../core/services/route.service';
-import { RouterTestingModule } from '@angular/router/testing';
-import { Observable, of } from 'rxjs';
-import { Router } from '@angular/router';
-
-describe('ItemBackButtonComponent', () => {
-  let component: ItemBackButtonComponent;
-  let fixture: ComponentFixture<ItemBackButtonComponent>;
-  let router;
-  const searchUrl = '/search?query=test&spc.page=2';
-
-  const mockRouteService = {
-    getPreviousUrl(): Observable<string> {
-      return of(searchUrl);
-    }
-  };
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [ItemBackButtonComponent],
-      imports: [TranslateModule.forRoot(),
-        RouterTestingModule],
-      providers: [
-      { provide: RouteService, useValue: {} },
-    ],
-      schemas: [NO_ERRORS_SCHEMA]
-    }).compileComponents();
-
-
-  beforeEach(waitForAsync(() => {
-    router = TestBed.inject(Router);
-    spyOn(router, 'navigateByUrl');
-    spyOn(mockRouteService, 'getPreviousUrl');
-    fixture = TestBed.createComponent(ItemBackButtonComponent);
-    component = fixture.componentInstance;
-  }));
-
-  describe('back button click', () => {
-    component.back();
-    expect(mockRouteService.getPreviousUrl).toHaveBeenCalled();
-    expect(router.navigateByUrl).toHaveBeenCalledWith(searchUrl);
-  });
-  }));
-});
diff --git a/src/app/shared/item-back-button/item-back-button.component.ts b/src/app/shared/item-back-button/item-back-button.component.ts
deleted file mode 100644
index 6e0d96520d..0000000000
--- a/src/app/shared/item-back-button/item-back-button.component.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { take } from 'rxjs/operators';
-import { RouteService } from '../../core/services/route.service';
-import { Router } from '@angular/router';
-
-@Component({
-  selector: 'ds-item-back-button',
-  styleUrls: ['./item-back-button.component.scss'],
-  templateUrl: './item-back-button.component.html',
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-/**
- * Component to add back to result list button to item.
- */
-export class ItemBackButtonComponent {
-
-  constructor(protected routeService: RouteService,
-              protected router: Router) {
-  }
-
-  /**
-   * Navigate back from the item to the previous pagination url.
-   */
-  public back() {
-    this.routeService.getPreviousUrl().pipe(
-      take(1)
-    ).subscribe(
-      (url => this.router.navigateByUrl(url))
-    );
-  }
-
-}
diff --git a/src/app/shared/item-back-button/themed-item-back-button.component.ts b/src/app/shared/item-back-button/themed-item-back-button.component.ts
deleted file mode 100644
index f24556ad22..0000000000
--- a/src/app/shared/item-back-button/themed-item-back-button.component.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Component } from '@angular/core';
-import { ThemedComponent } from '../theme-support/themed.component';
-import { ItemBackButtonComponent } from './item-back-button.component';
-
-@Component({
-  selector: 'ds-themed-item-back-button',
-  styleUrls: [],
-  templateUrl: '../theme-support/themed.component.html',
-})
-export class ThemedItemBackButtonComponent extends ThemedComponent<ItemBackButtonComponent> {
-  protected getComponentName(): string {
-    return 'ItemBackButtonComponent';
-  }
-
-  protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/shared/item-back-button/item-back-button.component`);
-  }
-
-  protected importUnthemedComponent(): Promise<any> {
-    return import(`./item-back-button.component`);
-  }
-
-}
diff --git a/src/app/shared/item-back-button/item-back-button.component.html b/src/app/shared/results-back-button/results-back-button.component.html
similarity index 79%
rename from src/app/shared/item-back-button/item-back-button.component.html
rename to src/app/shared/results-back-button/results-back-button.component.html
index acd49bda3a..0205d9e80f 100644
--- a/src/app/shared/item-back-button/item-back-button.component.html
+++ b/src/app/shared/results-back-button/results-back-button.component.html
@@ -1,4 +1,4 @@
 <button class="btn btn-secondary btn-sm back-btn ng-tns-c242-28" (click)="back()">
   <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
-  {{"search-browse-item-return" | translate}}
+  {{this.buttonLabel | async}}
 </button>
diff --git a/src/app/shared/item-back-button/item-back-button.component.scss b/src/app/shared/results-back-button/results-back-button.component.scss
similarity index 100%
rename from src/app/shared/item-back-button/item-back-button.component.scss
rename to src/app/shared/results-back-button/results-back-button.component.scss
diff --git a/src/app/shared/results-back-button/results-back-button.component.spec.ts b/src/app/shared/results-back-button/results-back-button.component.spec.ts
new file mode 100644
index 0000000000..8906712b4e
--- /dev/null
+++ b/src/app/shared/results-back-button/results-back-button.component.spec.ts
@@ -0,0 +1,103 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ResultsBackButtonComponent } from './results-back-button.component';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { RouteService } from '../../core/services/route.service';
+import { RouterTestingModule } from '@angular/router/testing';
+import { BehaviorSubject, Observable, of } from 'rxjs';
+import { Router } from '@angular/router';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { PaginationServiceStub } from '../testing/pagination-service.stub';
+
+describe('ResultsBackButtonComponent', () => {
+
+  let component: ResultsBackButtonComponent;
+  let fixture: ComponentFixture<ResultsBackButtonComponent>;
+  let router;
+  const paginationConfig = Object.assign(new PaginationComponentOptions(), {
+    id: 'test-pagination',
+    currentPage: 1,
+    pageSizeOptions: [5, 10, 15, 20],
+    pageSize: 15
+  });
+
+  const searchUrl = '/search?query=test&spc.page=2';
+
+  const mockRouteService = {
+    getPreviousUrl(): Observable<string> {
+      return of(searchUrl);
+    }
+  };
+
+  router = jasmine.createSpyObj('router', {
+    navigateByUrl: jasmine.createSpy('navigateByUrl')
+  });
+
+  const translate = jasmine.createSpyObj('TranslateService', ['get']);
+
+  const paginationService = new PaginationServiceStub();
+
+  describe('back to results', () => {
+
+    beforeEach(waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [ResultsBackButtonComponent],
+        imports: [TranslateModule.forRoot(),
+          RouterTestingModule.withRoutes([])
+        ],
+        providers: [
+          { provide: RouteService, useValue: mockRouteService },
+          { provide: PaginationService, useValue: paginationService},
+          { provide: Router, useValue: router },
+          { provide: TranslateService, useValue: translate }
+        ],
+        schemas: [NO_ERRORS_SCHEMA]
+      }).compileComponents();
+      spyOn(mockRouteService, 'getPreviousUrl').and.callThrough();
+    }));
+
+    describe('from a metadata browse list', () => {
+
+      beforeEach(waitForAsync(() => {
+        fixture = TestBed.createComponent(ResultsBackButtonComponent);
+        component = fixture.componentInstance;
+        component.paginationConfig = paginationConfig;
+        component.previousPage$ = new BehaviorSubject<string>('1');
+        fixture.detectChanges();
+      }));
+
+      it('should have back from browse label', () => {
+        expect(translate.get).toHaveBeenCalledWith('browse.back.all-results');
+      });
+
+      it('should navigate to previous pagination', () => {
+        component.back();
+        expect(mockRouteService.getPreviousUrl).not.toHaveBeenCalled();
+        expect(paginationService.updateRoute).toHaveBeenCalled();
+      });
+
+    });
+
+    describe('from an item', () => {
+
+      beforeEach(waitForAsync(() => {
+        fixture = TestBed.createComponent(ResultsBackButtonComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+      }));
+
+      it('should have item label', () => {
+        expect(translate.get).toHaveBeenCalledWith('search.browse.item-back');
+      });
+
+      it('should navigate to previous url', () => {
+        component.back();
+        expect(mockRouteService.getPreviousUrl).toHaveBeenCalled();
+        expect(router.navigateByUrl).toHaveBeenCalledWith(searchUrl);
+      });
+    });
+  });
+
+});
+
diff --git a/src/app/shared/results-back-button/results-back-button.component.ts b/src/app/shared/results-back-button/results-back-button.component.ts
new file mode 100644
index 0000000000..c7f1bb3244
--- /dev/null
+++ b/src/app/shared/results-back-button/results-back-button.component.ts
@@ -0,0 +1,70 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { take } from 'rxjs/operators';
+import { RouteService } from '../../core/services/route.service';
+import { Router } from '@angular/router';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { TranslateService } from '@ngx-translate/core';
+import { isNotEmpty } from '../empty.util';
+
+@Component({
+  selector: 'ds-results-back-button',
+  styleUrls: ['./results-back-button.component.scss'],
+  templateUrl: './results-back-button.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+/**
+ * Component to add back to result list button to item.
+ */
+export class ResultsBackButtonComponent {
+
+  /**
+   * Page number of the previous page
+   */
+  @Input() previousPage$?: BehaviorSubject<string>;
+
+  /**
+   * The pagination configuration used for the list
+   */
+  @Input() paginationConfig?: PaginationComponentOptions;
+
+  /**
+   * The button text
+   */
+  buttonLabel: Observable<string>;
+
+  constructor(protected routeService: RouteService,
+              protected paginationService: PaginationService,
+              protected router: Router,
+              private translateService: TranslateService) {
+
+  }
+
+  ngOnInit(): void {
+    if (this.paginationConfig) {
+      this.buttonLabel = this.translateService.get('browse.back.all-results');
+    } else {
+      this.buttonLabel = this.translateService.get('search.browse.item-back');
+    }
+  }
+
+  /**
+   * Navigate back from the item to the previous pagination list.
+   */
+  public back() {
+
+    if (isNotEmpty(this.paginationConfig) && isNotEmpty(this.previousPage$)) {
+      // if pagination configuration is provided use it to update the route to the previous browse page.
+      const page = +this.previousPage$.value > 1 ? +this.previousPage$.value : 1;
+      this.paginationService.updateRoute(this.paginationConfig.id, {page: page}, {[this.paginationConfig.id + '.return']: null, value: null, startsWith: null});
+    } else {
+      this.routeService.getPreviousUrl().pipe(
+        take(1)
+      ).subscribe(
+        (url => this.router.navigateByUrl(url))
+      );
+    }
+  }
+
+}
diff --git a/src/app/shared/results-back-button/themed-results-back-button.component.ts b/src/app/shared/results-back-button/themed-results-back-button.component.ts
new file mode 100644
index 0000000000..fcbb5471fd
--- /dev/null
+++ b/src/app/shared/results-back-button/themed-results-back-button.component.ts
@@ -0,0 +1,23 @@
+import { Component } from '@angular/core';
+import { ThemedComponent } from '../theme-support/themed.component';
+import { ResultsBackButtonComponent } from './results-back-button.component';
+
+@Component({
+  selector: 'ds-themed-results-back-button',
+  styleUrls: [],
+  templateUrl: '../theme-support/themed.component.html',
+})
+export class ThemedResultsBackButtonComponent extends ThemedComponent<ResultsBackButtonComponent> {
+  protected getComponentName(): string {
+    return 'ResultsBackButtonComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/shared/results-back-button/results-back-button.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./results-back-button.component`);
+  }
+
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 235c16d213..26c4de8dc2 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -315,9 +315,9 @@ import { MenuModule } from './menu/menu.module';
 import {
   ListableNotificationObjectComponent
 } from './object-list/listable-notification-object/listable-notification-object.component';
-import { ThemedItemBackButtonComponent } from './item-back-button/themed-item-back-button.component';
+import { ThemedResultsBackButtonComponent } from './results-back-button/themed-results-back-button.component';
 import { ThemedCollectionDropdownComponent } from './collection-dropdown/themed-collection-dropdown.component';
-import { ItemBackButtonComponent } from './item-back-button/item-back-button.component';
+import { ResultsBackButtonComponent } from './results-back-button/results-back-button.component';
 
 
 const MODULES = [
@@ -398,8 +398,8 @@ const COMPONENTS = [
   ItemSubmitterComponent,
   ItemDetailPreviewComponent,
   ItemDetailPreviewFieldComponent,
-  ItemBackButtonComponent,
-  ThemedItemBackButtonComponent,
+  ResultsBackButtonComponent,
+  ThemedResultsBackButtonComponent,
   ClaimedTaskActionsComponent,
   ClaimedTaskActionsLoaderComponent,
   ItemActionsComponent,
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index dcadb18c25..b834d3bf89 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -780,7 +780,7 @@
   "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
 
 
-  "search-browse-item-return": "Back to Results",
+  "search.browse.item-back": "Back to Results",
 
 
   "chips.remove": "Remove chip",
diff --git a/src/themes/custom/app/shared/item-back-button/item-back-button.component.ts b/src/themes/custom/app/shared/item-back-button/item-back-button.component.ts
deleted file mode 100644
index 4277a26219..0000000000
--- a/src/themes/custom/app/shared/item-back-button/item-back-button.component.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import {
-  ItemBackButtonComponent as BaseComponent
-} from '../../../../../app/shared/item-back-button/item-back-button.component';
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ds-item-back-button',
-  // styleUrls: ['./item-back-button.component.scss'],
-  styleUrls: ['../../../../../app/shared/item-back-button/item-back-button.component.scss'],
-  //templateUrl: './item-back-button.component.html',
-  templateUrl: '../../../../../app/shared/item-back-button/item-back-button.component.html'
-})
-export class ItemBackButtonComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/shared/item-back-button/item-back-button.component.html b/src/themes/custom/app/shared/results-back-button/results-back-button.component.html
similarity index 100%
rename from src/themes/custom/app/shared/item-back-button/item-back-button.component.html
rename to src/themes/custom/app/shared/results-back-button/results-back-button.component.html
diff --git a/src/themes/custom/app/shared/item-back-button/item-back-button.component.scss b/src/themes/custom/app/shared/results-back-button/results-back-button.component.scss
similarity index 100%
rename from src/themes/custom/app/shared/item-back-button/item-back-button.component.scss
rename to src/themes/custom/app/shared/results-back-button/results-back-button.component.scss
diff --git a/src/themes/custom/app/shared/results-back-button/results-back-button.component.ts b/src/themes/custom/app/shared/results-back-button/results-back-button.component.ts
new file mode 100644
index 0000000000..01826ec5d6
--- /dev/null
+++ b/src/themes/custom/app/shared/results-back-button/results-back-button.component.ts
@@ -0,0 +1,13 @@
+import {
+  ResultsBackButtonComponent as BaseComponent
+} from '../../../../../app/shared/results-back-button/results-back-button.component';
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-results-back-button',
+  // styleUrls: ['./results-back-button.component.scss'],
+  styleUrls: ['../../../../../app/shared/results-back-button/results-back-button.component.scss'],
+  //templateUrl: './results-back-button.component.html',
+  templateUrl: '../../../../../app/shared/results-back-button/results-back-button.component.html'
+})
+export class ResultsBackButtonComponent extends BaseComponent {}
diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts
index efc0dc49d1..93480cae57 100644
--- a/src/themes/custom/eager-theme.module.ts
+++ b/src/themes/custom/eager-theme.module.ts
@@ -43,7 +43,7 @@ import {
 
 import { CommunityListElementComponent } from './app/shared/object-list/community-list-element/community-list-element.component';
 import { CollectionListElementComponent} from './app/shared/object-list/collection-list-element/collection-list-element.component';
-import { ItemBackButtonComponent } from './app/shared/item-back-button/item-back-button.component';
+import { ResultsBackButtonComponent } from './app/shared/results-back-button/results-back-button.component';
 import { CollectionDropdownComponent } from './app/shared/collection-dropdown/collection-dropdown.component';
 
 
@@ -77,24 +77,27 @@ const DECLARATIONS = [
   EditCollectionSelectorComponent,
   EditCommunitySelectorComponent,
   EditItemSelectorComponent,
-  ItemBackButtonComponent
+  ResultsBackButtonComponent
 ];
 
 @NgModule({
-  imports: [
-    CommonModule,
-    SharedModule,
-    SearchModule,
-    FormsModule,
-    RootModule,
-    NavbarModule,
-    ItemPageModule,
-    ItemSharedModule,
-  ],
-  declarations: DECLARATIONS,
-  providers: [
-    ...ENTRY_COMPONENTS.map((component) => ({ provide: component }))
-  ],
+    imports: [
+        CommonModule,
+        SharedModule,
+        SearchModule,
+        FormsModule,
+        RootModule,
+        NavbarModule,
+        ItemPageModule,
+        ItemSharedModule,
+    ],
+    declarations: DECLARATIONS,
+    providers: [
+        ...ENTRY_COMPONENTS.map((component) => ({provide: component}))
+    ],
+    exports: [
+        ResultsBackButtonComponent
+    ]
 })
 /**
  * This module is included in the main bundle that gets downloaded at first page load. So it should

From 35bb0fb8029eaec2a66f366b3fea51ba8a69840e Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Tue, 20 Dec 2022 14:34:07 -0800
Subject: [PATCH 065/160] Removed back() function

---
 src/app/shared/browse-by/browse-by.component.spec.ts | 11 -----------
 src/app/shared/browse-by/browse-by.component.ts      |  8 --------
 2 files changed, 19 deletions(-)

diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts
index 43a3910216..95c0a8fb32 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -242,16 +242,5 @@ describe('BrowseByComponent', () => {
       expect(button).toBeDefined();
     });
   });
-  describe('back', () => {
-    it('should navigate back to the main browse page', () => {
-      const id = 'test-pagination';
-      comp.back();
-      expect(paginationService.updateRoute).toHaveBeenCalledWith(id, {page: 1}, {
-        value: null,
-        startsWith: null,
-        [id + '.return']: null
-      });
-    });
-  });
 
 });
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 79edf39096..2e8d2447b1 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -184,14 +184,6 @@ export class BrowseByComponent implements OnInit, OnDestroy {
     this.sub = this.routeService.getQueryParameterValue(this.paginationConfig.id + '.return').subscribe(this.previousPage$);
   }
 
-  /**
-   * Navigate back to the previous browse by page
-   */
-  back() {
-    const page = +this.previousPage$.value > 1 ? +this.previousPage$.value : 1;
-    this.paginationService.updateRoute(this.paginationConfig.id, {page: page}, {[this.paginationConfig.id + '.return']: null, value: null, startsWith: null});
-  }
-
   ngOnDestroy(): void {
     if (this.sub) {
       this.sub.unsubscribe();

From 09e31e758d6111852933a43e998e134638051206 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Wed, 21 Dec 2022 12:02:56 -0800
Subject: [PATCH 066/160] New modules for back button and browse-by

---
 src/app/browse-by/browse-by-page.module.ts    |  9 +++++--
 src/app/browse-by/browse-by.module.ts         |  6 ++---
 src/app/item-page/item-page.module.ts         |  2 +-
 src/app/item-page/item-shared.module.ts       |  4 ++-
 .../item-types/shared/item.component.ts       |  2 +-
 .../results-back-button.module.ts             | 21 +++++++++++++++
 .../browse-by.component.html                  |  0
 .../browse-by.component.scss                  |  0
 .../browse-by.component.spec.ts               | 10 ++++++-
 .../browse-by.component.ts                    |  0
 .../shared-browse-by.module.ts                | 26 +++++++++++++++++++
 src/app/shared/shared.module.ts               |  7 ++---
 src/themes/custom/eager-theme.module.ts       |  4 +++
 src/themes/custom/lazy-theme.module.ts        |  4 +++
 src/themes/dspace/eager-theme.module.ts       |  4 +++
 src/themes/dspace/lazy-theme.module.ts        |  6 +++++
 16 files changed, 91 insertions(+), 14 deletions(-)
 create mode 100644 src/app/shared/results-back-button/results-back-button.module.ts
 rename src/app/shared/{browse-by => shared-browse-by}/browse-by.component.html (100%)
 rename src/app/shared/{browse-by => shared-browse-by}/browse-by.component.scss (100%)
 rename src/app/shared/{browse-by => shared-browse-by}/browse-by.component.spec.ts (95%)
 rename src/app/shared/{browse-by => shared-browse-by}/browse-by.component.ts (100%)
 create mode 100644 src/app/shared/shared-browse-by/shared-browse-by.module.ts

diff --git a/src/app/browse-by/browse-by-page.module.ts b/src/app/browse-by/browse-by-page.module.ts
index fea6668b3c..d91be38726 100644
--- a/src/app/browse-by/browse-by-page.module.ts
+++ b/src/app/browse-by/browse-by-page.module.ts
@@ -4,16 +4,21 @@ import { BrowseByModule } from './browse-by.module';
 import { ItemDataService } from '../core/data/item-data.service';
 import { BrowseService } from '../core/browse/browse.service';
 import { BrowseByGuard } from './browse-by-guard';
+import { SharedBrowseByModule } from '../shared/shared-browse-by/shared-browse-by.module';
 
 @NgModule({
   imports: [
+    SharedBrowseByModule,
     BrowseByRoutingModule,
-    BrowseByModule.withEntryComponents()
+    BrowseByModule.withEntryComponents(),
   ],
   providers: [
     ItemDataService,
     BrowseService,
-    BrowseByGuard
+    BrowseByGuard,
+  ],
+  declarations: [
+
   ]
 })
 export class BrowseByPageModule {
diff --git a/src/app/browse-by/browse-by.module.ts b/src/app/browse-by/browse-by.module.ts
index 14e21f8b4c..0a7f45c1e2 100644
--- a/src/app/browse-by/browse-by.module.ts
+++ b/src/app/browse-by/browse-by.module.ts
@@ -1,7 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { BrowseByTitlePageComponent } from './browse-by-title-page/browse-by-title-page.component';
-import { SharedModule } from '../shared/shared.module';
 import { BrowseByMetadataPageComponent } from './browse-by-metadata-page/browse-by-metadata-page.component';
 import { BrowseByDatePageComponent } from './browse-by-date-page/browse-by-date-page.component';
 import { BrowseBySwitcherComponent } from './browse-by-switcher/browse-by-switcher.component';
@@ -10,6 +9,7 @@ import { ComcolModule } from '../shared/comcol/comcol.module';
 import { ThemedBrowseByMetadataPageComponent } from './browse-by-metadata-page/themed-browse-by-metadata-page.component';
 import { ThemedBrowseByDatePageComponent } from './browse-by-date-page/themed-browse-by-date-page.component';
 import { ThemedBrowseByTitlePageComponent } from './browse-by-title-page/themed-browse-by-title-page.component';
+import { SharedBrowseByModule } from '../shared/shared-browse-by/shared-browse-by.module';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -25,9 +25,9 @@ const ENTRY_COMPONENTS = [
 
 @NgModule({
   imports: [
+    SharedBrowseByModule,
     CommonModule,
     ComcolModule,
-    SharedModule
   ],
   declarations: [
     BrowseBySwitcherComponent,
@@ -45,7 +45,7 @@ export class BrowseByModule {
    */
   static withEntryComponents() {
     return {
-      ngModule: SharedModule,
+      ngModule: SharedBrowseByModule,
       providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
     };
   }
diff --git a/src/app/item-page/item-page.module.ts b/src/app/item-page/item-page.module.ts
index de9f2f60c5..c306935a05 100644
--- a/src/app/item-page/item-page.module.ts
+++ b/src/app/item-page/item-page.module.ts
@@ -96,7 +96,7 @@ const DECLARATIONS = [
     ResearchEntitiesModule.withEntryComponents(),
     NgxGalleryModule,
     NgbAccordionModule,
-    UploadModule,
+    UploadModule
   ],
   declarations: [
     ...DECLARATIONS,
diff --git a/src/app/item-page/item-shared.module.ts b/src/app/item-page/item-shared.module.ts
index b191b6c4b3..4bf271fc72 100644
--- a/src/app/item-page/item-shared.module.ts
+++ b/src/app/item-page/item-shared.module.ts
@@ -7,6 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core';
 import { dsDynamicFormControlMapFn } from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
 import { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
+import { ResultsBackButtonModule } from '../shared/results-back-button/results-back-button.module';
 
 const COMPONENTS = [
   RelatedEntitiesSearchComponent,
@@ -21,7 +22,8 @@ const COMPONENTS = [
     CommonModule,
     SearchModule,
     SharedModule,
-    TranslateModule
+    TranslateModule,
+    ResultsBackButtonModule
   ],
   exports: [
     ...COMPONENTS
diff --git a/src/app/item-page/simple/item-types/shared/item.component.ts b/src/app/item-page/simple/item-types/shared/item.component.ts
index 297886dfaa..8479bd541a 100644
--- a/src/app/item-page/simple/item-types/shared/item.component.ts
+++ b/src/app/item-page/simple/item-types/shared/item.component.ts
@@ -58,7 +58,7 @@ export class ItemComponent implements OnInit {
     // Show the back to results button when the previous context was search, browse,
     // or recent submissions pagination.
     this.showBackButton = this.routeService.getPreviousUrl().pipe(
-      filter(url => /^(\/search|\/browse|\/collections)/.test(url)),
+      filter(url => /^(\/search|\/browse|\/collections|\/admin\/search|\/mydspace)/.test(url)),
       take(1),
       map(() => true)
     );
diff --git a/src/app/shared/results-back-button/results-back-button.module.ts b/src/app/shared/results-back-button/results-back-button.module.ts
new file mode 100644
index 0000000000..64275ac7c0
--- /dev/null
+++ b/src/app/shared/results-back-button/results-back-button.module.ts
@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { TranslateModule } from '@ngx-translate/core';
+import { ResultsBackButtonComponent } from './results-back-button.component';
+
+
+@NgModule({
+  declarations: [
+    ResultsBackButtonComponent
+  ],
+  imports: [
+    CommonModule,
+    TranslateModule
+  ],
+  exports: [
+    ResultsBackButtonComponent
+  ]
+})
+export class ResultsBackButtonModule {
+
+}
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/shared-browse-by/browse-by.component.html
similarity index 100%
rename from src/app/shared/browse-by/browse-by.component.html
rename to src/app/shared/shared-browse-by/browse-by.component.html
diff --git a/src/app/shared/browse-by/browse-by.component.scss b/src/app/shared/shared-browse-by/browse-by.component.scss
similarity index 100%
rename from src/app/shared/browse-by/browse-by.component.scss
rename to src/app/shared/shared-browse-by/browse-by.component.scss
diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/shared-browse-by/browse-by.component.spec.ts
similarity index 95%
rename from src/app/shared/browse-by/browse-by.component.spec.ts
rename to src/app/shared/shared-browse-by/browse-by.component.spec.ts
index 95c0a8fb32..425488c3ca 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/shared-browse-by/browse-by.component.spec.ts
@@ -44,6 +44,10 @@ import { ConfigurationProperty } from '../../core/shared/configuration-property.
 import { SearchConfigurationServiceStub } from '../testing/search-configuration-service.stub';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 import { getMockThemeService } from '../mocks/theme-service.mock';
+import { ResultsBackButtonModule } from '../results-back-button/results-back-button.module';
+import { SharedModule } from '../shared.module';
+import { BrowseByRoutingModule } from '../../browse-by/browse-by-routing.module';
+import { AccessControlRoutingModule } from '../../access-control/access-control-routing.module';
 
 @listableObjectComponent(BrowseEntry, ViewMode.ListElement, DEFAULT_CONTEXT, 'custom')
 @Component({
@@ -112,7 +116,11 @@ describe('BrowseByComponent', () => {
     themeService = getMockThemeService('dspace');
     TestBed.configureTestingModule({
       imports: [
+        ResultsBackButtonModule,
+        BrowseByRoutingModule,
+        AccessControlRoutingModule,
         CommonModule,
+        SharedModule,
         NgbModule,
         TranslateModule.forRoot({
           loader: {
@@ -123,7 +131,7 @@ describe('BrowseByComponent', () => {
         RouterTestingModule,
         NoopAnimationsModule
       ],
-      declarations: [],
+      declarations: [BrowseByComponent],
       providers: [
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
         { provide: ConfigurationDataService, useValue: configurationDataService },
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/shared-browse-by/browse-by.component.ts
similarity index 100%
rename from src/app/shared/browse-by/browse-by.component.ts
rename to src/app/shared/shared-browse-by/browse-by.component.ts
diff --git a/src/app/shared/shared-browse-by/shared-browse-by.module.ts b/src/app/shared/shared-browse-by/shared-browse-by.module.ts
new file mode 100644
index 0000000000..2036bbe02c
--- /dev/null
+++ b/src/app/shared/shared-browse-by/shared-browse-by.module.ts
@@ -0,0 +1,26 @@
+import { NgModule } from '@angular/core';
+import { BrowseByComponent } from './browse-by.component';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '../shared.module';
+import { ResultsBackButtonModule } from '../results-back-button/results-back-button.module';
+import { BrowseByRoutingModule } from '../../browse-by/browse-by-routing.module';
+import { AccessControlRoutingModule } from '../../access-control/access-control-routing.module';
+
+@NgModule({
+  declarations: [
+    BrowseByComponent,
+],
+  imports: [
+    ResultsBackButtonModule,
+    BrowseByRoutingModule,
+    AccessControlRoutingModule,
+    CommonModule,
+    SharedModule,
+
+  ],
+  exports: [
+    BrowseByComponent,
+    SharedModule,
+  ]
+})
+export class SharedBrowseByModule { }
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 26c4de8dc2..3947b22083 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -95,7 +95,6 @@ import {
   ClaimedTaskActionsRejectComponent
 } from './mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component';
 import { ObjNgFor } from './utils/object-ngfor.pipe';
-import { BrowseByComponent } from './browse-by/browse-by.component';
 import {
   BrowseEntryListElementComponent
 } from './object-list/browse-entry-list-element/browse-entry-list-element.component';
@@ -317,7 +316,6 @@ import {
 } from './object-list/listable-notification-object/listable-notification-object.component';
 import { ThemedResultsBackButtonComponent } from './results-back-button/themed-results-back-button.component';
 import { ThemedCollectionDropdownComponent } from './collection-dropdown/themed-collection-dropdown.component';
-import { ResultsBackButtonComponent } from './results-back-button/results-back-button.component';
 
 
 const MODULES = [
@@ -338,7 +336,7 @@ const MODULES = [
   DragDropModule,
   CdkTreeModule,
   GoogleRecaptchaModule,
-  MenuModule,
+  MenuModule
 ];
 
 const ROOT_MODULES = [
@@ -398,7 +396,6 @@ const COMPONENTS = [
   ItemSubmitterComponent,
   ItemDetailPreviewComponent,
   ItemDetailPreviewFieldComponent,
-  ResultsBackButtonComponent,
   ThemedResultsBackButtonComponent,
   ClaimedTaskActionsComponent,
   ClaimedTaskActionsLoaderComponent,
@@ -409,7 +406,7 @@ const COMPONENTS = [
   ViewModeSwitchComponent,
   TruncatableComponent,
   TruncatablePartComponent,
-  BrowseByComponent,
+  // BrowseByComponent,
   InputSuggestionsComponent,
   FilterInputSuggestionsComponent,
   ValidationSuggestionsComponent,
diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts
index 93480cae57..7e30ca734e 100644
--- a/src/themes/custom/eager-theme.module.ts
+++ b/src/themes/custom/eager-theme.module.ts
@@ -45,6 +45,8 @@ import { CommunityListElementComponent } from './app/shared/object-list/communit
 import { CollectionListElementComponent} from './app/shared/object-list/collection-list-element/collection-list-element.component';
 import { ResultsBackButtonComponent } from './app/shared/results-back-button/results-back-button.component';
 import { CollectionDropdownComponent } from './app/shared/collection-dropdown/collection-dropdown.component';
+import { SharedBrowseByModule } from '../../app/shared/shared-browse-by/shared-browse-by.module';
+import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
 
 
 /**
@@ -84,6 +86,8 @@ const DECLARATIONS = [
     imports: [
         CommonModule,
         SharedModule,
+        SharedBrowseByModule,
+        ResultsBackButtonModule,
         SearchModule,
         FormsModule,
         RootModule,
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index 2ff4af7946..868a2c59a2 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -117,6 +117,8 @@ import { BrowseByTitlePageComponent } from './app/browse-by/browse-by-title-page
 import {
   ExternalSourceEntryImportModalComponent
 } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
+import { SharedBrowseByModule } from '../../app/shared/shared-browse-by/shared-browse-by.module';
+import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -212,6 +214,8 @@ const DECLARATIONS = [
     ScrollToModule,
     SearchPageModule,
     SharedModule,
+    SharedBrowseByModule,
+    ResultsBackButtonModule,
     StatisticsModule,
     StatisticsPageModule,
     StoreModule,
diff --git a/src/themes/dspace/eager-theme.module.ts b/src/themes/dspace/eager-theme.module.ts
index 5dd114cd72..d9cb24c808 100644
--- a/src/themes/dspace/eager-theme.module.ts
+++ b/src/themes/dspace/eager-theme.module.ts
@@ -9,6 +9,8 @@ import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-na
 import { SearchModule } from '../../app/shared/search/search.module';
 import { RootModule } from '../../app/root.module';
 import { NavbarModule } from '../../app/navbar/navbar.module';
+import { SharedBrowseByModule } from '../../app/shared/shared-browse-by/shared-browse-by.module';
+import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
 
 /**
  * Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS.
@@ -30,6 +32,8 @@ const DECLARATIONS = [
     CommonModule,
     SharedModule,
     SearchModule,
+    SharedBrowseByModule,
+    ResultsBackButtonModule,
     FormsModule,
     RootModule,
     NavbarModule,
diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts
index a4e8027a15..9aa24377a2 100644
--- a/src/themes/dspace/lazy-theme.module.ts
+++ b/src/themes/dspace/lazy-theme.module.ts
@@ -55,6 +55,9 @@ import {
 } from '../../app/shared/resource-policies/resource-policies.module';
 import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 import { RootModule } from '../../app/root.module';
+import { BrowseByPageModule } from '../../app/browse-by/browse-by-page.module';
+import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
+import { SharedBrowseByModule } from '../../app/shared/shared-browse-by/shared-browse-by.module';
 
 const DECLARATIONS = [
 ];
@@ -68,6 +71,8 @@ const DECLARATIONS = [
     RootModule,
     BitstreamFormatsModule,
     BrowseByModule,
+    BrowseByPageModule,
+    ResultsBackButtonModule,
     CollectionFormModule,
     CollectionPageModule,
     CommonModule,
@@ -95,6 +100,7 @@ const DECLARATIONS = [
     ScrollToModule,
     SearchPageModule,
     SharedModule,
+    SharedBrowseByModule,
     StatisticsModule,
     StatisticsPageModule,
     StoreModule,

From e963629d539ed3f13e4d20e1cb679a08f379ed65 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Wed, 21 Dec 2022 12:29:09 -0800
Subject: [PATCH 067/160] Renamed directory.

---
 src/app/browse-by/browse-by-page.module.ts                      | 2 +-
 src/app/browse-by/browse-by.module.ts                           | 2 +-
 .../{shared-browse-by => browse-by}/browse-by.component.html    | 0
 .../{shared-browse-by => browse-by}/browse-by.component.scss    | 0
 .../{shared-browse-by => browse-by}/browse-by.component.spec.ts | 0
 .../{shared-browse-by => browse-by}/browse-by.component.ts      | 0
 .../{shared-browse-by => browse-by}/shared-browse-by.module.ts  | 0
 src/themes/custom/eager-theme.module.ts                         | 2 +-
 src/themes/custom/lazy-theme.module.ts                          | 2 +-
 src/themes/dspace/eager-theme.module.ts                         | 2 +-
 src/themes/dspace/lazy-theme.module.ts                          | 2 +-
 11 files changed, 6 insertions(+), 6 deletions(-)
 rename src/app/shared/{shared-browse-by => browse-by}/browse-by.component.html (100%)
 rename src/app/shared/{shared-browse-by => browse-by}/browse-by.component.scss (100%)
 rename src/app/shared/{shared-browse-by => browse-by}/browse-by.component.spec.ts (100%)
 rename src/app/shared/{shared-browse-by => browse-by}/browse-by.component.ts (100%)
 rename src/app/shared/{shared-browse-by => browse-by}/shared-browse-by.module.ts (100%)

diff --git a/src/app/browse-by/browse-by-page.module.ts b/src/app/browse-by/browse-by-page.module.ts
index d91be38726..554a6c4f46 100644
--- a/src/app/browse-by/browse-by-page.module.ts
+++ b/src/app/browse-by/browse-by-page.module.ts
@@ -4,7 +4,7 @@ import { BrowseByModule } from './browse-by.module';
 import { ItemDataService } from '../core/data/item-data.service';
 import { BrowseService } from '../core/browse/browse.service';
 import { BrowseByGuard } from './browse-by-guard';
-import { SharedBrowseByModule } from '../shared/shared-browse-by/shared-browse-by.module';
+import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.module';
 
 @NgModule({
   imports: [
diff --git a/src/app/browse-by/browse-by.module.ts b/src/app/browse-by/browse-by.module.ts
index 0a7f45c1e2..a7643464dc 100644
--- a/src/app/browse-by/browse-by.module.ts
+++ b/src/app/browse-by/browse-by.module.ts
@@ -9,7 +9,7 @@ import { ComcolModule } from '../shared/comcol/comcol.module';
 import { ThemedBrowseByMetadataPageComponent } from './browse-by-metadata-page/themed-browse-by-metadata-page.component';
 import { ThemedBrowseByDatePageComponent } from './browse-by-date-page/themed-browse-by-date-page.component';
 import { ThemedBrowseByTitlePageComponent } from './browse-by-title-page/themed-browse-by-title-page.component';
-import { SharedBrowseByModule } from '../shared/shared-browse-by/shared-browse-by.module';
+import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.module';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
diff --git a/src/app/shared/shared-browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
similarity index 100%
rename from src/app/shared/shared-browse-by/browse-by.component.html
rename to src/app/shared/browse-by/browse-by.component.html
diff --git a/src/app/shared/shared-browse-by/browse-by.component.scss b/src/app/shared/browse-by/browse-by.component.scss
similarity index 100%
rename from src/app/shared/shared-browse-by/browse-by.component.scss
rename to src/app/shared/browse-by/browse-by.component.scss
diff --git a/src/app/shared/shared-browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts
similarity index 100%
rename from src/app/shared/shared-browse-by/browse-by.component.spec.ts
rename to src/app/shared/browse-by/browse-by.component.spec.ts
diff --git a/src/app/shared/shared-browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
similarity index 100%
rename from src/app/shared/shared-browse-by/browse-by.component.ts
rename to src/app/shared/browse-by/browse-by.component.ts
diff --git a/src/app/shared/shared-browse-by/shared-browse-by.module.ts b/src/app/shared/browse-by/shared-browse-by.module.ts
similarity index 100%
rename from src/app/shared/shared-browse-by/shared-browse-by.module.ts
rename to src/app/shared/browse-by/shared-browse-by.module.ts
diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts
index 7e30ca734e..55067403ed 100644
--- a/src/themes/custom/eager-theme.module.ts
+++ b/src/themes/custom/eager-theme.module.ts
@@ -45,7 +45,7 @@ import { CommunityListElementComponent } from './app/shared/object-list/communit
 import { CollectionListElementComponent} from './app/shared/object-list/collection-list-element/collection-list-element.component';
 import { ResultsBackButtonComponent } from './app/shared/results-back-button/results-back-button.component';
 import { CollectionDropdownComponent } from './app/shared/collection-dropdown/collection-dropdown.component';
-import { SharedBrowseByModule } from '../../app/shared/shared-browse-by/shared-browse-by.module';
+import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
 import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
 
 
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index 868a2c59a2..b42164d77d 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -117,7 +117,7 @@ import { BrowseByTitlePageComponent } from './app/browse-by/browse-by-title-page
 import {
   ExternalSourceEntryImportModalComponent
 } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
-import { SharedBrowseByModule } from '../../app/shared/shared-browse-by/shared-browse-by.module';
+import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
 import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
 
 const DECLARATIONS = [
diff --git a/src/themes/dspace/eager-theme.module.ts b/src/themes/dspace/eager-theme.module.ts
index d9cb24c808..6cb4de83e5 100644
--- a/src/themes/dspace/eager-theme.module.ts
+++ b/src/themes/dspace/eager-theme.module.ts
@@ -9,7 +9,7 @@ import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-na
 import { SearchModule } from '../../app/shared/search/search.module';
 import { RootModule } from '../../app/root.module';
 import { NavbarModule } from '../../app/navbar/navbar.module';
-import { SharedBrowseByModule } from '../../app/shared/shared-browse-by/shared-browse-by.module';
+import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
 import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
 
 /**
diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts
index 9aa24377a2..7ebf04ef59 100644
--- a/src/themes/dspace/lazy-theme.module.ts
+++ b/src/themes/dspace/lazy-theme.module.ts
@@ -57,7 +57,7 @@ import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 import { RootModule } from '../../app/root.module';
 import { BrowseByPageModule } from '../../app/browse-by/browse-by-page.module';
 import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
-import { SharedBrowseByModule } from '../../app/shared/shared-browse-by/shared-browse-by.module';
+import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
 
 const DECLARATIONS = [
 ];

From 6a1f81280b14924b3dd9e0bdfe2a2885baaeff12 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Wed, 21 Dec 2022 12:54:31 -0800
Subject: [PATCH 068/160] Finished removing results button from shared.module

---
 .../journal-entities/journal-entities.module.ts           | 4 +++-
 .../research-entities/research-entities.module.ts         | 4 +++-
 src/app/item-page/item-page.module.ts                     | 2 ++
 src/app/item-page/item-shared.module.ts                   | 4 +---
 .../results-back-button/results-back-button.module.ts     | 8 +++++---
 src/app/shared/shared.module.ts                           | 3 ---
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/journal-entities.module.ts b/src/app/entity-groups/journal-entities/journal-entities.module.ts
index 3bf861e10d..07585d4d16 100644
--- a/src/app/entity-groups/journal-entities/journal-entities.module.ts
+++ b/src/app/entity-groups/journal-entities/journal-entities.module.ts
@@ -20,6 +20,7 @@ import { JournalVolumeSidebarSearchListElementComponent } from './item-list-elem
 import { JournalIssueSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component';
 import { JournalSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component';
 import { ItemSharedModule } from '../../item-page/item-shared.module';
+import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -47,7 +48,8 @@ const ENTRY_COMPONENTS = [
   imports: [
     CommonModule,
     ItemSharedModule,
-    SharedModule
+    SharedModule,
+    ResultsBackButtonModule
   ],
   declarations: [
     ...ENTRY_COMPONENTS
diff --git a/src/app/entity-groups/research-entities/research-entities.module.ts b/src/app/entity-groups/research-entities/research-entities.module.ts
index 721a22be08..e3525cc881 100644
--- a/src/app/entity-groups/research-entities/research-entities.module.ts
+++ b/src/app/entity-groups/research-entities/research-entities.module.ts
@@ -29,6 +29,7 @@ import { OrgUnitSidebarSearchListElementComponent } from './item-list-elements/s
 import { PersonSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component';
 import { ProjectSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component';
 import { ItemSharedModule } from '../../item-page/item-shared.module';
+import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
 
 const ENTRY_COMPONENTS = [
 // put only entry components that use custom decorator
@@ -69,7 +70,8 @@ const COMPONENTS = [
     CommonModule,
     ItemSharedModule,
     SharedModule,
-    NgbTooltipModule
+    NgbTooltipModule,
+    ResultsBackButtonModule
   ],
   declarations: [
     ...COMPONENTS,
diff --git a/src/app/item-page/item-page.module.ts b/src/app/item-page/item-page.module.ts
index c306935a05..c49d7af677 100644
--- a/src/app/item-page/item-page.module.ts
+++ b/src/app/item-page/item-page.module.ts
@@ -47,6 +47,7 @@ import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
 import { OrcidSyncSettingsComponent } from './orcid-page/orcid-sync-settings/orcid-sync-settings.component';
 import { OrcidQueueComponent } from './orcid-page/orcid-queue/orcid-queue.component';
 import { UploadModule } from '../shared/upload/upload.module';
+import { ResultsBackButtonModule } from '../shared/results-back-button/results-back-button.module';
 
 
 const ENTRY_COMPONENTS = [
@@ -96,6 +97,7 @@ const DECLARATIONS = [
     ResearchEntitiesModule.withEntryComponents(),
     NgxGalleryModule,
     NgbAccordionModule,
+    ResultsBackButtonModule,
     UploadModule
   ],
   declarations: [
diff --git a/src/app/item-page/item-shared.module.ts b/src/app/item-page/item-shared.module.ts
index 4bf271fc72..b191b6c4b3 100644
--- a/src/app/item-page/item-shared.module.ts
+++ b/src/app/item-page/item-shared.module.ts
@@ -7,7 +7,6 @@ import { TranslateModule } from '@ngx-translate/core';
 import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core';
 import { dsDynamicFormControlMapFn } from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
 import { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
-import { ResultsBackButtonModule } from '../shared/results-back-button/results-back-button.module';
 
 const COMPONENTS = [
   RelatedEntitiesSearchComponent,
@@ -22,8 +21,7 @@ const COMPONENTS = [
     CommonModule,
     SearchModule,
     SharedModule,
-    TranslateModule,
-    ResultsBackButtonModule
+    TranslateModule
   ],
   exports: [
     ...COMPONENTS
diff --git a/src/app/shared/results-back-button/results-back-button.module.ts b/src/app/shared/results-back-button/results-back-button.module.ts
index 64275ac7c0..b812ca17b0 100644
--- a/src/app/shared/results-back-button/results-back-button.module.ts
+++ b/src/app/shared/results-back-button/results-back-button.module.ts
@@ -2,18 +2,20 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
 import { ResultsBackButtonComponent } from './results-back-button.component';
-
+import { ThemedResultsBackButtonComponent } from './themed-results-back-button.component';
 
 @NgModule({
   declarations: [
-    ResultsBackButtonComponent
+    ResultsBackButtonComponent,
+    ThemedResultsBackButtonComponent
   ],
   imports: [
     CommonModule,
     TranslateModule
   ],
   exports: [
-    ResultsBackButtonComponent
+    ResultsBackButtonComponent,
+    ThemedResultsBackButtonComponent
   ]
 })
 export class ResultsBackButtonModule {
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 3947b22083..827bc40d14 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -314,7 +314,6 @@ import { MenuModule } from './menu/menu.module';
 import {
   ListableNotificationObjectComponent
 } from './object-list/listable-notification-object/listable-notification-object.component';
-import { ThemedResultsBackButtonComponent } from './results-back-button/themed-results-back-button.component';
 import { ThemedCollectionDropdownComponent } from './collection-dropdown/themed-collection-dropdown.component';
 
 
@@ -396,7 +395,6 @@ const COMPONENTS = [
   ItemSubmitterComponent,
   ItemDetailPreviewComponent,
   ItemDetailPreviewFieldComponent,
-  ThemedResultsBackButtonComponent,
   ClaimedTaskActionsComponent,
   ClaimedTaskActionsLoaderComponent,
   ItemActionsComponent,
@@ -406,7 +404,6 @@ const COMPONENTS = [
   ViewModeSwitchComponent,
   TruncatableComponent,
   TruncatablePartComponent,
-  // BrowseByComponent,
   InputSuggestionsComponent,
   FilterInputSuggestionsComponent,
   ValidationSuggestionsComponent,

From d4c30044f71652e1067dc897346007e31653a6b5 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 2 Jan 2023 11:29:44 +0100
Subject: [PATCH 069/160] 93747: DsoEditMetadataForm test cases

---
 .../dso-edit-metadata-form.spec.ts            | 275 ++++++++++++++++++
 1 file changed, 275 insertions(+)
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.spec.ts

diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.spec.ts
new file mode 100644
index 0000000000..5f8680088a
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.spec.ts
@@ -0,0 +1,275 @@
+import { DsoEditMetadataChangeType, DsoEditMetadataForm } from './dso-edit-metadata-form';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { MetadataValue } from '../../core/shared/metadata.models';
+
+describe('DsoEditMetadataForm', () => {
+  let form: DsoEditMetadataForm;
+  let dso: DSpaceObject;
+
+  beforeEach(() => {
+    dso = Object.assign(new DSpaceObject(), {
+      metadata: {
+        'dc.title': [
+          Object.assign(new MetadataValue(), {
+            value: 'Test Title',
+            language: 'en',
+            place: 0,
+          }),
+        ],
+        'dc.subject': [
+          Object.assign(new MetadataValue(), {
+            value: 'Subject One',
+            language: 'en',
+            place: 0,
+          }),
+          Object.assign(new MetadataValue(), {
+            value: 'Subject Two',
+            language: 'en',
+            place: 1,
+          }),
+          Object.assign(new MetadataValue(), {
+            value: 'Subject Three',
+            language: 'en',
+            place: 2,
+          }),
+        ],
+      },
+    });
+    form = new DsoEditMetadataForm(dso.metadata);
+  });
+
+
+  describe('adding a new value', () => {
+    beforeEach(() => {
+      form.add();
+    });
+
+    it('should add an empty value to \"newValue\" with no place yet and editing set to true', () => {
+      expect(form.newValue).toBeDefined();
+      expect(form.newValue.originalValue.place).toBeUndefined();
+      expect(form.newValue.newValue.place).toBeUndefined();
+      expect(form.newValue.editing).toBeTrue();
+    });
+
+    it('should not mark the form as changed yet', () => {
+      expect(form.hasChanges()).toEqual(false);
+    });
+
+    describe('and assigning a value and metadata field to it', () => {
+      let mdField: string;
+      let value: string;
+      let expectedPlace: number;
+
+      beforeEach(() => {
+        mdField = 'dc.subject';
+        value = 'Subject Four';
+        form.newValue.newValue.value = value;
+        form.setMetadataField(mdField);
+        expectedPlace = form.fields[mdField].length - 1;
+      });
+
+      it('should add the new value to the values of the relevant field', () => {
+        expect(form.fields[mdField][expectedPlace].newValue.value).toEqual(value);
+      });
+
+      it('should set its editing flag to false', () => {
+        expect(form.fields[mdField][expectedPlace].editing).toBeFalse();
+      });
+
+      it('should set both its original and new place to match its position in the value array', () => {
+        expect(form.fields[mdField][expectedPlace].newValue.place).toEqual(expectedPlace);
+        expect(form.fields[mdField][expectedPlace].originalValue.place).toEqual(expectedPlace);
+      });
+
+      it('should clear \"newValue\"', () => {
+        expect(form.newValue).toBeUndefined();
+      });
+
+      it('should mark the form as changed', () => {
+        expect(form.hasChanges()).toEqual(true);
+      });
+
+      describe('discard', () => {
+        beforeEach(() => {
+          form.discard();
+        });
+
+        it('should remove the new value', () => {
+          expect(form.fields[mdField][expectedPlace]).toBeUndefined();
+        });
+
+        it('should mark the form as unchanged again', () => {
+          expect(form.hasChanges()).toEqual(false);
+        });
+
+        describe('reinstate', () => {
+          beforeEach(() => {
+            form.reinstate();
+          });
+
+          it('should re-add the new value', () => {
+            expect(form.fields[mdField][expectedPlace].newValue.value).toEqual(value);
+          });
+
+          it('should mark the form as changed once again', () => {
+            expect(form.hasChanges()).toEqual(true);
+          });
+        });
+      });
+    });
+  });
+
+  describe('removing a value entirely (not just marking deleted)', () => {
+    it('should remove the value on the correct index', () => {
+      form.remove('dc.subject', 1);
+      expect(form.fields['dc.subject'].length).toEqual(2);
+      expect(form.fields['dc.subject'][0].newValue.value).toEqual('Subject One');
+      expect(form.fields['dc.subject'][1].newValue.value).toEqual('Subject Three');
+    });
+  });
+
+  describe('moving a value', () => {
+    beforeEach(() => {
+      form.fields['dc.subject'][0].newValue.place = form.fields['dc.subject'][1].originalValue.place;
+      form.fields['dc.subject'][1].newValue.place = form.fields['dc.subject'][0].originalValue.place;
+      form.fields['dc.subject'][0].confirmChanges();
+      form.fields['dc.subject'][1].confirmChanges();
+    });
+
+    it('should mark the value as changed', () => {
+      expect(form.fields['dc.subject'][0].hasChanges()).toEqual(true);
+      expect(form.fields['dc.subject'][1].hasChanges()).toEqual(true);
+    });
+
+    it('should mark the form as changed', () => {
+      expect(form.hasChanges()).toEqual(true);
+    });
+
+    describe('discard', () => {
+      beforeEach(() => {
+        form.discard();
+      });
+
+      it('should reset the moved values their places to their original values', () => {
+        expect(form.fields['dc.subject'][0].newValue.place).toEqual(form.fields['dc.subject'][0].originalValue.place);
+        expect(form.fields['dc.subject'][1].newValue.place).toEqual(form.fields['dc.subject'][1].originalValue.place);
+      });
+
+      it('should mark the form as unchanged again', () => {
+        expect(form.hasChanges()).toEqual(false);
+      });
+
+      describe('reinstate', () => {
+        beforeEach(() => {
+          form.reinstate();
+        });
+
+        it('should move the values to their new places again', () => {
+          expect(form.fields['dc.subject'][0].newValue.place).toEqual(form.fields['dc.subject'][1].originalValue.place);
+          expect(form.fields['dc.subject'][1].newValue.place).toEqual(form.fields['dc.subject'][0].originalValue.place);
+        });
+
+        it('should mark the form as changed once again', () => {
+          expect(form.hasChanges()).toEqual(true);
+        });
+      });
+    });
+  });
+
+  describe('marking a value deleted', () => {
+    beforeEach(() => {
+      form.fields['dc.title'][0].change = DsoEditMetadataChangeType.REMOVE;
+    });
+
+    it('should mark the value as changed', () => {
+      expect(form.fields['dc.title'][0].hasChanges()).toEqual(true);
+    });
+
+    it('should mark the form as changed', () => {
+      expect(form.hasChanges()).toEqual(true);
+    });
+
+    describe('discard', () => {
+      beforeEach(() => {
+        form.discard();
+      });
+
+      it('should remove the deleted mark from the value', () => {
+        expect(form.fields['dc.title'][0].change).toBeUndefined();
+      });
+
+      it('should mark the form as unchanged again', () => {
+        expect(form.hasChanges()).toEqual(false);
+      });
+
+      describe('reinstate', () => {
+        beforeEach(() => {
+          form.reinstate();
+        });
+
+        it('should re-mark the value as deleted', () => {
+          expect(form.fields['dc.title'][0].change).toEqual(DsoEditMetadataChangeType.REMOVE);
+        });
+
+        it('should mark the form as changed once again', () => {
+          expect(form.hasChanges()).toEqual(true);
+        });
+      });
+    });
+  });
+
+  describe('editing a value', () => {
+    const value = 'New title';
+
+    beforeEach(() => {
+      form.fields['dc.title'][0].editing = true;
+      form.fields['dc.title'][0].newValue.value = value;
+    });
+
+    it('should not mark the form as changed yet', () => {
+      expect(form.hasChanges()).toEqual(false);
+    });
+
+    describe('and confirming the changes', () => {
+      beforeEach(() => {
+        form.fields['dc.title'][0].confirmChanges(true);
+      });
+
+      it('should mark the value as changed', () => {
+        expect(form.fields['dc.title'][0].hasChanges()).toEqual(true);
+      });
+
+      it('should mark the form as changed', () => {
+        expect(form.hasChanges()).toEqual(true);
+      });
+
+      describe('discard', () => {
+        beforeEach(() => {
+          form.discard();
+        });
+
+        it('should reset the changed value to its original value', () => {
+          expect(form.fields['dc.title'][0].newValue.value).toEqual(form.fields['dc.title'][0].originalValue.value);
+        });
+
+        it('should mark the form as unchanged again', () => {
+          expect(form.hasChanges()).toEqual(false);
+        });
+
+        describe('reinstate', () => {
+          beforeEach(() => {
+            form.reinstate();
+          });
+
+          it('should put the changed value back in place', () => {
+            expect(form.fields['dc.title'][0].newValue.value).toEqual(value);
+          });
+
+          it('should mark the form as changed once again', () => {
+            expect(form.hasChanges()).toEqual(true);
+          });
+        });
+      });
+    });
+  });
+});

From ec89addf17ebbd0af9d99205f979a9343ee8dcdf Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 2 Jan 2023 12:14:33 +0100
Subject: [PATCH 070/160] 97049: Missing provided service after merge

---
 src/modules/app/browser-app.module.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts
index 6baf339003..4cdf7fbe2f 100644
--- a/src/modules/app/browser-app.module.ts
+++ b/src/modules/app/browser-app.module.ts
@@ -31,6 +31,7 @@ import { GoogleAnalyticsService } from '../../app/statistics/google-analytics.se
 import { AuthRequestService } from '../../app/core/auth/auth-request.service';
 import { BrowserAuthRequestService } from '../../app/core/auth/browser-auth-request.service';
 import { BrowserInitService } from './browser-init.service';
+import { VocabularyTreeviewService } from 'src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service';
 
 export const REQ_KEY = makeStateKey<string>('req');
 
@@ -111,6 +112,10 @@ export function getRequest(transferState: TransferState): any {
       provide: LocationToken,
       useFactory: locationProvider,
     },
+    {
+      provide: VocabularyTreeviewService,
+      useClass: VocabularyTreeviewService,
+    }
   ]
 })
 export class BrowserAppModule {

From 6773ad967b68e98759e3a88441413ed27590aba3 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 2 Jan 2023 13:17:41 +0100
Subject: [PATCH 071/160] 93747: Feedback 2022-12-21 - fixing move patch

---
 .../dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts | 7 ++++---
 src/assets/i18n/en.json5                                   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
index b97c838ffb..2c584fb534 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
@@ -440,11 +440,12 @@ export class DsoEditMetadataForm {
       const valuesWithoutRemoved = values.filter((value: DsoEditMetadataValue) => value.change !== DsoEditMetadataChangeType.REMOVE);
       const moveOperations = moveAnalyser
         .diff(
-          valuesWithoutRemoved
-            .map((value: DsoEditMetadataValue) => value.newValue.place),
           [...valuesWithoutRemoved]
             .sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.originalValue.place - b.originalValue.place)
-            .map((value: DsoEditMetadataValue) => value.newValue.place))
+            .map((value: DsoEditMetadataValue) => value.originalValue.place),
+          [...valuesWithoutRemoved]
+            .sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.newValue.place - b.newValue.place)
+            .map((value: DsoEditMetadataValue) => value.originalValue.place))
         .map((operation: MoveOperation) => new MetadataPatchMoveOperation(field, +operation.from.substr(1), +operation.path.substr(1)).toOperation());
       operations.push(...moveOperations);
     });
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index f8afd69efe..0140bad6dd 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1837,7 +1837,7 @@
 
   "item.edit.metadata.reinstate-button": "Undo",
 
-  "item.edit.metadata.reset-order-button": "Reset value order",
+  "item.edit.metadata.reset-order-button": "Undo reorder",
 
   "item.edit.metadata.save-button": "Save",
 

From 6012c66d1cf0f05b88b76cf1f1983d5798c25cfb Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 2 Jan 2023 13:48:50 +0100
Subject: [PATCH 072/160] 97049: fix tests

---
 .../search-hierarchy-filter.component.spec.ts                | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
index 7fc21a3c31..7ae4545da9 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -87,6 +87,10 @@ describe('SearchHierarchyFilterComponent', () => {
     showVocabularyTreeLink = fixture.debugElement.query(By.css('a#show-test-search-filter-tree'));
   }
 
+  afterEach(() => {
+    fixture.destroy();
+  });
+
   describe('if the vocabulary doesn\'t exist', () => {
 
     beforeEach(() => {
@@ -154,7 +158,6 @@ describe('SearchHierarchyFilterComponent', () => {
             },
             queryParamsHandling: 'merge',
           }));
-          fixture.destroy();
         });
       });
     });

From 9b6ba906d68c90ea699f5191a85ee2e30c10fec9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 12:50:21 +0000
Subject: [PATCH 073/160] Bump json5 from 2.2.1 to 2.2.2

Bumps [json5](https://github.com/json5/json5) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v2.2.1...v2.2.2)

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

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

diff --git a/package.json b/package.json
index 52b089be37..387e094a67 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "http-proxy-middleware": "^1.0.5",
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.0",
-    "json5": "^2.1.3",
+    "json5": "^2.2.2",
     "jsonschema": "1.4.0",
     "jwt-decode": "^3.1.2",
     "klaro": "^0.7.18",
diff --git a/yarn.lock b/yarn.lock
index e92c5bf954..22eeefb309 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7005,10 +7005,10 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2, json5@^2.1.3, json5@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
-  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+json5@^2.1.2, json5@^2.2.1, json5@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab"
+  integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ==
 
 jsonc-parser@3.0.0:
   version "3.0.0"

From 3e09653f0b4078eaffd5e01e8a80136469b559f0 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 2 Jan 2023 14:38:20 +0100
Subject: [PATCH 074/160] 97049: Nest before each statements

---
 .../search-hierarchy-filter.component.spec.ts | 40 +++++++------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
index 7ae4545da9..e6c74d8047 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -87,10 +87,6 @@ describe('SearchHierarchyFilterComponent', () => {
     showVocabularyTreeLink = fixture.debugElement.query(By.css('a#show-test-search-filter-tree'));
   }
 
-  afterEach(() => {
-    fixture.destroy();
-  });
-
   describe('if the vocabulary doesn\'t exist', () => {
 
     beforeEach(() => {
@@ -100,9 +96,8 @@ describe('SearchHierarchyFilterComponent', () => {
       init();
     });
 
-    it('should not show the vocabulary tree link', (done) => {
+    it('should not show the vocabulary tree link', () => {
       expect(showVocabularyTreeLink).toBeNull();
-      done();
     });
   });
 
@@ -115,39 +110,34 @@ describe('SearchHierarchyFilterComponent', () => {
       init();
     });
 
-    it('should show the vocabulary tree link', (done) => {
+    it('should show the vocabulary tree link', () => {
       expect(showVocabularyTreeLink).toBeTruthy();
-      done();
     });
 
     describe('when clicking the vocabulary tree link', () => {
 
+      const alreadySelectedValues = [
+        'already-selected-value-1',
+        'already-selected-value-2',
+      ];
+      const newSelectedValue = 'new-selected-value';
+
       beforeEach(async () => {
         showVocabularyTreeLink.nativeElement.click();
+        fixture.componentInstance.selectedValues$ = observableOf(
+          alreadySelectedValues.map(value => Object.assign(new FacetValue(), { value }))
+        );
+        VocabularyTreeViewComponent.select.emit(Object.assign(new VocabularyEntryDetail(), {
+          value: newSelectedValue,
+        }));
       });
 
-      it('should open the vocabulary tree modal', (done) => {
+      it('should open the vocabulary tree modal', () => {
         expect(ngbModal.open).toHaveBeenCalled();
-        done();
       });
 
       describe('when selecting a value from the vocabulary tree', () => {
 
-        const alreadySelectedValues = [
-          'already-selected-value-1',
-          'already-selected-value-2',
-        ];
-        const newSelectedValue = 'new-selected-value';
-
-        beforeEach(() => {
-          fixture.componentInstance.selectedValues$ = observableOf(
-            alreadySelectedValues.map(value => Object.assign(new FacetValue(), { value }))
-          );
-          VocabularyTreeViewComponent.select.emit(Object.assign(new VocabularyEntryDetail(), {
-            value: newSelectedValue,
-          }));
-        });
-
         it('should add a new search filter to the existing search filters', () => {
           waitForAsync(() => expect(router.navigate).toHaveBeenCalledWith([testSearchLink], {
             queryParams: {

From 9d3769103dd7d35cc93deda6ea0f354515e8ce6a Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 2 Jan 2023 17:44:58 +0100
Subject: [PATCH 075/160] 93747: Test cases

---
 ...it-metadata-field-values.component.spec.ts | 135 ++++++++++++++
 ...so-edit-metadata-headers.component.spec.ts |  32 ++++
 .../dso-edit-metadata-value.component.html    |  10 +-
 .../dso-edit-metadata-value.component.spec.ts | 170 ++++++++++++++++++
 .../metadata-field-selector.component.spec.ts | 103 +++++++++++
 .../metadata-field-selector.component.ts      |   2 +-
 6 files changed, 446 insertions(+), 6 deletions(-)
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.spec.ts
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
 create mode 100644 src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts

diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts
new file mode 100644
index 0000000000..3ca0dba3b6
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts
@@ -0,0 +1,135 @@
+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';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { DsoEditMetadataFieldValuesComponent } from './dso-edit-metadata-field-values.component';
+import { DsoEditMetadataForm } from '../dso-edit-metadata-form';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { MetadataValue } from '../../../core/shared/metadata.models';
+import { of } from 'rxjs/internal/observable/of';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { By } from '@angular/platform-browser';
+
+describe('DsoEditMetadataFieldValuesComponent', () => {
+  let component: DsoEditMetadataFieldValuesComponent;
+  let fixture: ComponentFixture<DsoEditMetadataFieldValuesComponent>;
+
+  let form: DsoEditMetadataForm;
+  let dso: DSpaceObject;
+  let mdField: string;
+  let draggingMdField$: BehaviorSubject<string>;
+
+  beforeEach(waitForAsync(() => {
+    dso = Object.assign(new DSpaceObject(), {
+      metadata: {
+        'dc.title': [
+          Object.assign(new MetadataValue(), {
+            value: 'Test Title',
+            language: 'en',
+            place: 0,
+          }),
+        ],
+        'dc.subject': [
+          Object.assign(new MetadataValue(), {
+            value: 'Subject One',
+            language: 'en',
+            place: 0,
+          }),
+          Object.assign(new MetadataValue(), {
+            value: 'Subject Two',
+            language: 'en',
+            place: 1,
+          }),
+          Object.assign(new MetadataValue(), {
+            value: 'Subject Three',
+            language: 'en',
+            place: 2,
+          }),
+        ],
+      },
+    });
+    form = new DsoEditMetadataForm(dso.metadata);
+    mdField = 'dc.subject';
+    draggingMdField$ = new BehaviorSubject<string>(null);
+
+    TestBed.configureTestingModule({
+      declarations: [DsoEditMetadataFieldValuesComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DsoEditMetadataFieldValuesComponent);
+    component = fixture.componentInstance;
+    component.dso = dso;
+    component.form = form;
+    component.mdField = mdField;
+    component.saving$ = of(false);
+    component.draggingMdField$ = draggingMdField$;
+    fixture.detectChanges();
+  });
+
+  describe('when draggingMdField$ emits a value equal to mdField', () => {
+    beforeEach(() => {
+      draggingMdField$.next(mdField);
+      fixture.detectChanges();
+    });
+
+    it('should not disable the list', () => {
+      expect(fixture.debugElement.query(By.css('.ds-drop-list.disabled'))).toBeNull();
+    });
+  });
+
+  describe('when draggingMdField$ emits a value different to mdField', () => {
+    beforeEach(() => {
+      draggingMdField$.next(`${mdField}.fake`);
+      fixture.detectChanges();
+    });
+
+    it('should disable the list', () => {
+      expect(fixture.debugElement.query(By.css('.ds-drop-list.disabled'))).toBeTruthy();
+    });
+  });
+
+  describe('when draggingMdField$ emits null', () => {
+    beforeEach(() => {
+      draggingMdField$.next(null);
+      fixture.detectChanges();
+    });
+
+    it('should not disable the list', () => {
+      expect(fixture.debugElement.query(By.css('.ds-drop-list.disabled'))).toBeNull();
+    });
+  });
+
+  describe('dropping a value on a different index', () => {
+    beforeEach(() => {
+      component.drop(Object.assign({
+        previousIndex: 0,
+        currentIndex: 2,
+      }));
+    });
+
+    it('should physically move the relevant metadata value within the form', () => {
+      expect(form.fields[mdField][0].newValue.value).toEqual('Subject Two');
+      expect(form.fields[mdField][1].newValue.value).toEqual('Subject Three');
+      expect(form.fields[mdField][2].newValue.value).toEqual('Subject One');
+    });
+
+    it('should update the metadata values their new place to match the new physical order', () => {
+      expect(form.fields[mdField][0].newValue.place).toEqual(0);
+      expect(form.fields[mdField][1].newValue.place).toEqual(1);
+      expect(form.fields[mdField][2].newValue.place).toEqual(2);
+    });
+
+    it('should maintain the metadata values their original place in their original value so it can be used later to determine the patch operations', () => {
+      expect(form.fields[mdField][0].originalValue.place).toEqual(1);
+      expect(form.fields[mdField][1].originalValue.place).toEqual(2);
+      expect(form.fields[mdField][2].originalValue.place).toEqual(0);
+    });
+  });
+});
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.spec.ts
new file mode 100644
index 0000000000..a0a1da1f1e
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.spec.ts
@@ -0,0 +1,32 @@
+import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata-headers.component';
+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';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { By } from '@angular/platform-browser';
+
+describe('DsoEditMetadataHeadersComponent', () => {
+  let component: DsoEditMetadataHeadersComponent;
+  let fixture: ComponentFixture<DsoEditMetadataHeadersComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [DsoEditMetadataHeadersComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DsoEditMetadataHeadersComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should display three headers', () => {
+    expect(fixture.debugElement.queryAll(By.css('.ds-flex-cell')).length).toEqual(3);
+  });
+});
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
index 4e5890ae7d..ce08eed473 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
@@ -18,24 +18,24 @@
   <div class="text-center ds-flex-cell ds-edit-cell">
     <div class="btn-group edit-field">
       <div class="btn-group" [ngbTooltip]="isVirtual ? (dsoType + '.edit.metadata.edit.buttons.virtual' | translate) : null">
-        <button class="btn btn-outline-primary btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}" *ngIf="!mdValue.editing"
+        <button class="btn btn-outline-primary btn-sm ng-star-inserted" id="metadata-edit-btn" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}" *ngIf="!mdValue.editing"
                 [disabled]="isVirtual || mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="edit.emit()">
           <i class="fas fa-edit fa-fw"></i>
         </button>
-        <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}" *ngIf="mdValue.editing"
+        <button class="btn btn-outline-success btn-sm ng-star-inserted" id="metadata-confirm-btn" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}" *ngIf="mdValue.editing"
                 [disabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
           <i class="fas fa-check fa-fw"></i>
         </button>
-        <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
+        <button class="btn btn-outline-danger btn-sm" id="metadata-remove-btn" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
                 [disabled]="isVirtual || (mdValue.change && mdValue.change !== DsoEditMetadataChangeTypeEnum.ADD) || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
           <i class="fas fa-trash-alt fa-fw"></i>
         </button>
-        <button class="btn btn-outline-warning btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
+        <button class="btn btn-outline-warning btn-sm" id="metadata-undo-btn" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
                 [disabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
           <i class="fas fa-undo-alt fa-fw"></i>
         </button>
       </div>
-      <button class="btn btn-outline-secondary ds-drag-handle btn-sm" cdkDragHandle
+      <button class="btn btn-outline-secondary ds-drag-handle btn-sm" id="metadata-drag-btn" cdkDragHandle
               [ngClass]="{'disabled': isOnlyValue || (saving$ | async)}" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}" [disabled]="isOnlyValue || (saving$ | async)">
         <i class="fas fa-grip-vertical fa-fw"></i>
       </button>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
new file mode 100644
index 0000000000..08f041c4cd
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
@@ -0,0 +1,170 @@
+import { DsoEditMetadataValueComponent } from './dso-edit-metadata-value.component';
+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';
+import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import { RelationshipService } from '../../../core/data/relationship.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { of } from 'rxjs/internal/observable/of';
+import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import { MetadataValue, VIRTUAL_METADATA_PREFIX } from '../../../core/shared/metadata.models';
+import { DsoEditMetadataChangeType, DsoEditMetadataValue } from '../dso-edit-metadata-form';
+import { By } from '@angular/platform-browser';
+
+const EDIT_BTN = 'edit';
+const CONFIRM_BTN = 'confirm';
+const REMOVE_BTN = 'remove';
+const UNDO_BTN = 'undo';
+const DRAG_BTN = 'drag';
+
+describe('DsoEditMetadataValueComponent', () => {
+  let component: DsoEditMetadataValueComponent;
+  let fixture: ComponentFixture<DsoEditMetadataValueComponent>;
+
+  let relationshipService: RelationshipService;
+  let dsoNameService: DSONameService;
+
+  let editMetadataValue: DsoEditMetadataValue;
+  let metadataValue: MetadataValue;
+
+  function initServices(): void {
+    relationshipService = jasmine.createSpyObj('relationshipService', {
+      resolveMetadataRepresentation: of(new ItemMetadataRepresentation(metadataValue)),
+    });
+    dsoNameService = jasmine.createSpyObj('dsoNameService', {
+      getName: 'Related Name',
+    });
+  }
+
+  beforeEach(waitForAsync(() => {
+    metadataValue = Object.assign(new MetadataValue(), {
+      value: 'Regular Name',
+      language: 'en',
+      place: 0,
+      authority: undefined,
+    });
+    editMetadataValue = new DsoEditMetadataValue(metadataValue);
+
+    initServices();
+
+    TestBed.configureTestingModule({
+      declarations: [DsoEditMetadataValueComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+        { provide: RelationshipService, useValue: relationshipService },
+        { provide: DSONameService, useValue: dsoNameService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DsoEditMetadataValueComponent);
+    component = fixture.componentInstance;
+    component.mdValue = editMetadataValue;
+    component.saving$ = of(false);
+    fixture.detectChanges();
+  });
+
+  it('should not show a badge', () => {
+    expect(fixture.debugElement.query(By.css('ds-type-badge'))).toBeNull();
+  });
+
+  describe('when no changes have been made', () => {
+    assertButton(EDIT_BTN, true, false);
+    assertButton(CONFIRM_BTN, false);
+    assertButton(REMOVE_BTN, true, false);
+    assertButton(UNDO_BTN, true, true);
+    assertButton(DRAG_BTN, true, false);
+  });
+
+  describe('when this is the only metadata value within its field', () => {
+    beforeEach(() => {
+      component.isOnlyValue = true;
+      fixture.detectChanges();
+    });
+
+    assertButton(DRAG_BTN, true, true);
+  });
+
+  describe('when the value is marked for removal', () => {
+    beforeEach(() => {
+      editMetadataValue.change = DsoEditMetadataChangeType.REMOVE;
+      fixture.detectChanges();
+    });
+
+    assertButton(REMOVE_BTN, true, true);
+    assertButton(UNDO_BTN, true, false);
+  });
+
+  describe('when the value is being edited', () => {
+    beforeEach(() => {
+      editMetadataValue.editing = true;
+      fixture.detectChanges();
+    });
+
+    assertButton(EDIT_BTN, false);
+    assertButton(CONFIRM_BTN, true, false);
+    assertButton(UNDO_BTN, true, false);
+  });
+
+  describe('when the value is new', () => {
+    beforeEach(() => {
+      editMetadataValue.change = DsoEditMetadataChangeType.ADD;
+      fixture.detectChanges();
+    });
+
+    assertButton(REMOVE_BTN, true, false);
+    assertButton(UNDO_BTN, true, false);
+  });
+
+  describe('when the metadata value is virtual', () => {
+    beforeEach(() => {
+      metadataValue = Object.assign(new MetadataValue(), {
+        value: 'Virtual Name',
+        language: 'en',
+        place: 0,
+        authority: `${VIRTUAL_METADATA_PREFIX}authority-key`,
+      });
+      editMetadataValue = new DsoEditMetadataValue(metadataValue);
+      component.mdValue = editMetadataValue;
+      component.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it('should show a badge', () => {
+      expect(fixture.debugElement.query(By.css('ds-type-badge'))).toBeTruthy();
+    });
+
+    assertButton(EDIT_BTN, true, true);
+    assertButton(CONFIRM_BTN, false);
+    assertButton(REMOVE_BTN, true, true);
+    assertButton(UNDO_BTN, true, true);
+    assertButton(DRAG_BTN, true, false);
+  });
+
+  function assertButton(name: string, exists: boolean, disabled: boolean = false): void {
+    describe(`${name} button`, () => {
+      let btn: DebugElement;
+
+      beforeEach(() => {
+        btn = fixture.debugElement.query(By.css(`#metadata-${name}-btn`));
+      });
+
+      if (exists) {
+        it('should exist', () => {
+          expect(btn).toBeTruthy();
+        });
+
+        it(`should${disabled ? ' ' : ' not '}be disabled`, () => {
+          expect(btn.nativeElement.disabled).toBe(disabled);
+        });
+      } else {
+        it('should not exist', () => {
+          expect(btn).toBeNull();
+        });
+      }
+    });
+  }
+});
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts
new file mode 100644
index 0000000000..ee4738a322
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts
@@ -0,0 +1,103 @@
+import { MetadataFieldSelectorComponent } from './metadata-field-selector.component';
+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';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { RegistryService } from '../../../core/registry/registry.service';
+import { MetadataField } from '../../../core/metadata/metadata-field.model';
+import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { By } from '@angular/platform-browser';
+
+describe('MetadataFieldSelectorComponent', () => {
+  let component: MetadataFieldSelectorComponent;
+  let fixture: ComponentFixture<MetadataFieldSelectorComponent>;
+
+  let registryService: RegistryService;
+
+  let metadataSchema: MetadataSchema;
+  let metadataFields: MetadataField[];
+
+  beforeEach(waitForAsync(() => {
+    metadataSchema = Object.assign(new MetadataSchema(), {
+      id: 0,
+      prefix: 'dc',
+      namespace: 'http://dublincore.org/documents/dcmi-terms/',
+    });
+    metadataFields = [
+      Object.assign(new MetadataField(), {
+        id: 0,
+        element: 'description',
+        qualifier: undefined,
+        schema: createSuccessfulRemoteDataObject$(metadataSchema),
+      }),
+      Object.assign(new MetadataField(), {
+        id: 1,
+        element: 'description',
+        qualifier: 'abstract',
+        schema: createSuccessfulRemoteDataObject$(metadataSchema),
+      }),
+    ];
+
+    registryService = jasmine.createSpyObj('registryService', {
+      queryMetadataFields: createSuccessfulRemoteDataObject$(createPaginatedList(metadataFields)),
+    });
+
+    TestBed.configureTestingModule({
+      declarations: [MetadataFieldSelectorComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+        { provide: RegistryService, useValue: registryService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MetadataFieldSelectorComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  describe('when a query is entered', () => {
+    const query = 'test query';
+
+    beforeEach(() => {
+      component.showInvalid = true;
+      component.query$.next(query);
+    });
+
+    it('should reset showInvalid', () => {
+      expect(component.showInvalid).toBeFalse();
+    });
+
+    it('should query the registry service for metadata fields and include the schema', () => {
+      expect(registryService.queryMetadataFields).toHaveBeenCalledWith(query, null, true, false, followLink('schema'));
+    });
+  });
+
+  describe('validate', () => {
+    it('should return an observable true and show no feedback if the current mdField exists in registry', (done) => {
+      component.mdField = 'dc.description.abstract';
+      component.validate().subscribe((result) => {
+        expect(result).toBeTrue();
+        fixture.detectChanges();
+        expect(fixture.debugElement.query(By.css('.invalid-feedback'))).toBeNull();
+        done();
+      });
+    });
+
+    it('should return an observable false and show invalid feedback if the current mdField is missing in registry', (done) => {
+      component.mdField = 'dc.fake.field';
+      component.validate().subscribe((result) => {
+        expect(result).toBeFalse();
+        fixture.detectChanges();
+        expect(fixture.debugElement.query(By.css('.invalid-feedback'))).toBeTruthy();
+        done();
+      });
+    });
+  });
+});
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
index f3f6f15914..2bbe64b3df 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
@@ -157,7 +157,7 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
   }
 
   /**
-   * Select a metadata field from the dropdown optipons
+   * Select a metadata field from the dropdown options
    * @param mdFieldOption
    */
   select(mdFieldOption: string): void {

From 533d833225cccada0eda1f9d4b0e55ed67f4e1e5 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 3 Jan 2023 16:16:11 +0100
Subject: [PATCH 076/160] 93747: Test cases

---
 .../core/data/relationship.service.spec.ts    | 156 ++++++++++++++-
 src/app/core/data/relationship.service.ts     |  10 +-
 .../dso-edit-metadata.component.html          |   8 +-
 .../dso-edit-metadata.component.spec.ts       | 189 ++++++++++++++++++
 ...data-representation-list.component.spec.ts |  48 ++---
 5 files changed, 378 insertions(+), 33 deletions(-)
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts

diff --git a/src/app/core/data/relationship.service.spec.ts b/src/app/core/data/relationship.service.spec.ts
index 0f7dd319c3..ac8a4c994e 100644
--- a/src/app/core/data/relationship.service.spec.ts
+++ b/src/app/core/data/relationship.service.spec.ts
@@ -11,10 +11,16 @@ import { RelationshipService } from './relationship.service';
 import { RequestService } from './request.service';
 import { RequestEntry } from './request.reducer';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../shared/remote-data.utils';
 import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/remote-data-build.service.mock';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { createPaginatedList } from '../../shared/testing/utils.test';
+import { MetadataValue } from '../shared/metadata.models';
+import { MetadataRepresentationType } from '../shared/metadata-representation/metadata-representation.model';
 
 describe('RelationshipService', () => {
   let service: RelationshipService;
@@ -228,4 +234,152 @@ describe('RelationshipService', () => {
       });
     });
   });
+
+  describe('resolveMetadataRepresentation', () => {
+    const parentItem: Item = Object.assign(new Item(), {
+      id: 'parent-item',
+      metadata: {
+        'dc.contributor.author': [
+          Object.assign(new MetadataValue(), {
+            language: null,
+            value: 'Related Author with authority',
+            authority: 'virtual::related-author',
+            place: 2
+          }),
+          Object.assign(new MetadataValue(), {
+            language: null,
+            value: 'Author without authority',
+            place: 1
+          }),
+        ],
+        'dc.creator': [
+          Object.assign(new MetadataValue(), {
+            language: null,
+            value: 'Related Creator with authority',
+            authority: 'virtual::related-creator',
+            place: 3,
+          }),
+            Object.assign(new MetadataValue(), {
+            language: null,
+            value: 'Related Creator with authority - unauthorized',
+            authority: 'virtual::related-creator-unauthorized',
+            place: 4,
+          }),
+        ],
+        'dc.title': [
+          Object.assign(new MetadataValue(), {
+            language: null,
+            value: 'Parent Item'
+          }),
+        ]
+      }
+    });
+    const relatedAuthor: Item = Object.assign(new Item(), {
+      id: 'related-author',
+      metadata: {
+        'dc.title': [
+          Object.assign(new MetadataValue(), {
+            language: null,
+            value: 'Related Author'
+          }),
+        ]
+      }
+    });
+    const relatedCreator: Item = Object.assign(new Item(), {
+      id: 'related-creator',
+      metadata: {
+        'dc.title': [
+          Object.assign(new MetadataValue(), {
+            language: null,
+            value: 'Related Creator'
+          }),
+        ],
+        'dspace.entity.type': 'Person',
+      }
+    });
+    const authorRelation: Relationship = Object.assign(new Relationship(), {
+      leftItem: createSuccessfulRemoteDataObject$(parentItem),
+      rightItem: createSuccessfulRemoteDataObject$(relatedAuthor)
+    });
+    const creatorRelation: Relationship = Object.assign(new Relationship(), {
+      leftItem: createSuccessfulRemoteDataObject$(parentItem),
+      rightItem: createSuccessfulRemoteDataObject$(relatedCreator),
+    });
+    const creatorRelationUnauthorized: Relationship = Object.assign(new Relationship(), {
+      leftItem: createSuccessfulRemoteDataObject$(parentItem),
+      rightItem: createFailedRemoteDataObject$('Unauthorized', 401),
+    });
+
+    let metadatum: MetadataValue;
+
+    beforeEach(() => {
+      service.findById = (id: string) => {
+        if (id === 'related-author') {
+          return createSuccessfulRemoteDataObject$(authorRelation);
+        }
+        if (id === 'related-creator') {
+          return createSuccessfulRemoteDataObject$(creatorRelation);
+        }
+        if (id === 'related-creator-unauthorized') {
+          return createSuccessfulRemoteDataObject$(creatorRelationUnauthorized);
+        }
+      };
+    });
+
+    describe('when the metadata isn\'t virtual', () => {
+      beforeEach(() => {
+        metadatum = parentItem.metadata['dc.contributor.author'][1];
+      });
+
+      it('should return a plain text MetadatumRepresentation', (done) => {
+        service.resolveMetadataRepresentation(metadatum, parentItem, 'Person').subscribe((result) => {
+          expect(result.representationType).toEqual(MetadataRepresentationType.PlainText);
+          done();
+        });
+      });
+    });
+
+    describe('when the metadata is a virtual author', () => {
+      beforeEach(() => {
+        metadatum = parentItem.metadata['dc.contributor.author'][0];
+      });
+
+      it('should return a ItemMetadataRepresentation with the correct value', (done) => {
+        service.resolveMetadataRepresentation(metadatum, parentItem, 'Person').subscribe((result) => {
+          expect(result.representationType).toEqual(MetadataRepresentationType.Item);
+          expect(result.getValue()).toEqual(metadatum.value);
+          expect((result as any).id).toEqual(relatedAuthor.id);
+          done();
+        });
+      });
+    });
+
+    describe('when the metadata is a virtual creator', () => {
+      beforeEach(() => {
+        metadatum = parentItem.metadata['dc.creator'][0];
+      });
+
+      it('should return a ItemMetadataRepresentation with the correct value', (done) => {
+        service.resolveMetadataRepresentation(metadatum, parentItem, 'Person').subscribe((result) => {
+          expect(result.representationType).toEqual(MetadataRepresentationType.Item);
+          expect(result.getValue()).toEqual(metadatum.value);
+          expect((result as any).id).toEqual(relatedCreator.id);
+          done();
+        });
+      });
+    });
+
+    describe('when the metadata refers to a relationship leading to an error response', () => {
+      beforeEach(() => {
+        metadatum = parentItem.metadata['dc.creator'][1];
+      });
+
+      it('should return an authority controlled MetadatumRepresentation', (done) => {
+        service.resolveMetadataRepresentation(metadatum, parentItem, 'Person').subscribe((result) => {
+          expect(result.representationType).toEqual(MetadataRepresentationType.AuthorityControlled);
+          done();
+        });
+      });
+    });
+  });
 });
diff --git a/src/app/core/data/relationship.service.ts b/src/app/core/data/relationship.service.ts
index 50a4888343..2b86c8ad84 100644
--- a/src/app/core/data/relationship.service.ts
+++ b/src/app/core/data/relationship.service.ts
@@ -544,14 +544,20 @@ export class RelationshipService extends DataService<Relationship> {
             filter(([leftItem, rightItem]) => leftItem.hasCompleted && rightItem.hasCompleted),
             map(([leftItem, rightItem]) => {
               if (!leftItem.hasSucceeded || !rightItem.hasSucceeded) {
-                return observableOf(Object.assign(new MetadatumRepresentation(itemType), metadatum));
+                return null;
               } else if (rightItem.hasSucceeded && leftItem.payload.id === parentItem.id) {
                 return rightItem.payload;
               } else if (rightItem.payload.id === parentItem.id) {
                 return leftItem.payload;
               }
             }),
-            map((item: Item) => Object.assign(new ItemMetadataRepresentation(metadatum), item))
+            map((item: Item) => {
+              if (hasValue(item)) {
+                return Object.assign(new ItemMetadataRepresentation(metadatum), item);
+              } else {
+                return Object.assign(new MetadatumRepresentation(itemType), metadatum);
+              }
+            })
           )
         ));
     } else {
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index 8e0f889bbb..71d3b34e42 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -1,18 +1,18 @@
 <div class="item-metadata" *ngIf="form">
   <div class="button-row top d-flex my-2 space-children-mr ml-gap">
-    <button class="mr-auto btn btn-success" [disabled]="form.newValue || (saving$ | async)"
+    <button class="mr-auto btn btn-success" id="dso-add-btn" [disabled]="form.newValue || (saving$ | async)"
             (click)="add()"><i class="fas fa-plus"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.add-button' | translate }}</span>
     </button>
-    <button class="btn btn-warning ml-1" *ngIf="isReinstatable" [disabled]="(saving$ | async)"
+    <button class="btn btn-warning ml-1" id="dso-reinstate-btn" *ngIf="isReinstatable" [disabled]="(saving$ | async)"
             (click)="reinstate()"><i class="fas fa-undo-alt"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.reinstate-button' | translate }}</span>
     </button>
-    <button class="btn btn-primary ml-1" [disabled]="!hasChanges || (saving$ | async)"
+    <button class="btn btn-primary ml-1" id="dso-save-btn" [disabled]="!hasChanges || (saving$ | async)"
             (click)="submit()"><i class="fas fa-save"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.save-button' | translate }}</span>
     </button>
-    <button class="btn btn-danger ml-1" *ngIf="!isReinstatable"
+    <button class="btn btn-danger ml-1" id="dso-discard-btn" *ngIf="!isReinstatable"
             [disabled]="!hasChanges || (saving$ | async)"
             (click)="discard()"><i class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.discard-button' | translate }}</span>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts
new file mode 100644
index 0000000000..b3650114c9
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts
@@ -0,0 +1,189 @@
+import { DsoEditMetadataComponent } from './dso-edit-metadata.component';
+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';
+import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { MetadataValue } from '../../core/shared/metadata.models';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { By } from '@angular/platform-browser';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service';
+import { ITEM } from '../../core/shared/item.resource-type';
+
+const ADD_BTN = 'add';
+const REINSTATE_BTN = 'reinstate';
+const SAVE_BTN = 'save';
+const DISCARD_BTN = 'discard';
+
+describe('DsoEditMetadataComponent', () => {
+  let component: DsoEditMetadataComponent;
+  let fixture: ComponentFixture<DsoEditMetadataComponent>;
+
+  let notificationsService: NotificationsService;
+
+  let dso: DSpaceObject;
+  let updatedDso: DSpaceObject;
+  let dataService: ItemDataService;
+
+  beforeEach(waitForAsync(() => {
+    dso = Object.assign(new Item(), {
+      type: ITEM,
+      metadata: {
+        'dc.title': [
+          Object.assign(new MetadataValue(), {
+            value: 'Test Title',
+            language: 'en',
+            place: 0,
+          }),
+        ],
+        'dc.subject': [
+          Object.assign(new MetadataValue(), {
+            value: 'Subject One',
+            language: 'en',
+            place: 0,
+          }),
+          Object.assign(new MetadataValue(), {
+            value: 'Subject Two',
+            language: 'en',
+            place: 1,
+          }),
+          Object.assign(new MetadataValue(), {
+            value: 'Subject Three',
+            language: 'en',
+            place: 2,
+          }),
+        ],
+      },
+    });
+    updatedDso = Object.assign(new Item(), dso);
+    updatedDso.metadata['dc.title'][0].value = 'Updated Title';
+    dataService = jasmine.createSpyObj('itemDataService', {
+      patch: createSuccessfulRemoteDataObject$(updatedDso),
+    });
+
+    notificationsService = jasmine.createSpyObj('notificationsService', ['error', 'success']);
+
+    TestBed.configureTestingModule({
+      declarations: [DsoEditMetadataComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+        { provide: ItemDataService, useValue: dataService },
+        { provide: NotificationsService, useValue: notificationsService },
+        ArrayMoveChangeAnalyzer,
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DsoEditMetadataComponent);
+    component = fixture.componentInstance;
+    component.dso = dso;
+    fixture.detectChanges();
+  });
+
+  describe('when no changes have been made', () => {
+    assertButton(ADD_BTN, true, false);
+    assertButton(REINSTATE_BTN, false);
+    assertButton(SAVE_BTN, true, true);
+    assertButton(DISCARD_BTN, true, true);
+  });
+
+  describe('when the form contains changes', () => {
+    beforeEach(() => {
+      component.form.fields['dc.title'][0].newValue.value = 'Updated Title Once';
+      component.form.fields['dc.title'][0].confirmChanges();
+      component.form.resetReinstatable();
+      component.onValueSaved();
+      fixture.detectChanges();
+    });
+
+    assertButton(SAVE_BTN, true, false);
+    assertButton(DISCARD_BTN, true, false);
+
+    describe('and they were discarded', () => {
+      beforeEach(() => {
+        component.discard();
+        fixture.detectChanges();
+      });
+
+      assertButton(REINSTATE_BTN, true, false);
+      assertButton(SAVE_BTN, true, true);
+      assertButton(DISCARD_BTN, false);
+
+      describe('and a new change is made', () => {
+        beforeEach(() => {
+          component.form.fields['dc.title'][0].newValue.value = 'Updated Title Twice';
+          component.form.fields['dc.title'][0].confirmChanges();
+          component.form.resetReinstatable();
+          component.onValueSaved();
+          fixture.detectChanges();
+        });
+
+        assertButton(REINSTATE_BTN, false);
+        assertButton(SAVE_BTN, true, false);
+        assertButton(DISCARD_BTN, true, false);
+      });
+    });
+  });
+
+  describe('when a new value is present', () => {
+    beforeEach(() => {
+      component.add();
+      fixture.detectChanges();
+    });
+
+    assertButton(ADD_BTN, true, true);
+
+    it('should display a row with a field selector and metadata value', () => {
+      expect(fixture.debugElement.query(By.css('ds-metadata-field-selector'))).toBeTruthy();
+      expect(fixture.debugElement.query(By.css('ds-dso-edit-metadata-value'))).toBeTruthy();
+    });
+
+    describe('and gets assigned to a metadata field', () => {
+      beforeEach(() => {
+        component.form.newValue.newValue.value = 'New Subject';
+        component.form.setMetadataField('dc.subject');
+        component.form.resetReinstatable();
+        component.onValueSaved();
+        fixture.detectChanges();
+      });
+
+      assertButton(ADD_BTN, true, false);
+
+      it('should not display the separate row with field selector and metadata value anymore', () => {
+        expect(fixture.debugElement.query(By.css('ds-metadata-field-selector'))).toBeNull();
+        expect(fixture.debugElement.query(By.css('ds-dso-edit-metadata-value'))).toBeNull();
+      });
+    });
+  });
+
+  function assertButton(name: string, exists: boolean, disabled: boolean = false): void {
+    describe(`${name} button`, () => {
+      let btn: DebugElement;
+
+      beforeEach(() => {
+        btn = fixture.debugElement.query(By.css(`#dso-${name}-btn`));
+      });
+
+      if (exists) {
+        it('should exist', () => {
+          expect(btn).toBeTruthy();
+        });
+
+        it(`should${disabled ? ' ' : ' not '}be disabled`, () => {
+          expect(btn.nativeElement.disabled).toBe(disabled);
+        });
+      } else {
+        it('should not exist', () => {
+          expect(btn).toBeNull();
+        });
+      }
+    });
+  }
+
+});
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..dea7ec935e 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
@@ -9,6 +9,10 @@ import { createSuccessfulRemoteDataObject$, createFailedRemoteDataObject$ } from
 import { TranslateModule } from '@ngx-translate/core';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { of as observableOf } from 'rxjs';
+import { MetadataValue } from '../../../core/shared/metadata.models';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
 
 const itemType = 'Person';
 const metadataFields = ['dc.contributor.author', 'dc.creator'];
@@ -73,39 +77,31 @@ const relatedCreator: Item = Object.assign(new Item(), {
     'dspace.entity.type': 'Person',
   }
 });
-const authorRelation: Relationship = Object.assign(new Relationship(), {
-  leftItem: createSuccessfulRemoteDataObject$(parentItem),
-  rightItem: createSuccessfulRemoteDataObject$(relatedAuthor)
-});
-const creatorRelation: Relationship = Object.assign(new Relationship(), {
-  leftItem: createSuccessfulRemoteDataObject$(parentItem),
-  rightItem: createSuccessfulRemoteDataObject$(relatedCreator),
-});
-const creatorRelationUnauthorized: Relationship = Object.assign(new Relationship(), {
-  leftItem: createSuccessfulRemoteDataObject$(parentItem),
-  rightItem: createFailedRemoteDataObject$('Unauthorized', 401),
-});
-let relationshipService;
 
 describe('MetadataRepresentationListComponent', () => {
   let comp: MetadataRepresentationListComponent;
   let fixture: ComponentFixture<MetadataRepresentationListComponent>;
 
-  relationshipService = {
-    findById: (id: string) => {
-      if (id === 'related-author') {
-        return createSuccessfulRemoteDataObject$(authorRelation);
-      }
-      if (id === 'related-creator') {
-        return createSuccessfulRemoteDataObject$(creatorRelation);
-      }
-      if (id === 'related-creator-unauthorized') {
-        return createSuccessfulRemoteDataObject$(creatorRelationUnauthorized);
-      }
-    },
-  };
+  let relationshipService;
 
   beforeEach(waitForAsync(() => {
+    relationshipService = {
+      resolveMetadataRepresentation: (metadatum: MetadataValue, parent: DSpaceObject, type: string) => {
+        if (metadatum.value === 'Related Author with authority') {
+          return observableOf(Object.assign(new ItemMetadataRepresentation(metadatum), relatedAuthor));
+        }
+        if (metadatum.value === 'Author without authority') {
+          return observableOf(Object.assign(new MetadatumRepresentation(type), metadatum));
+        }
+        if (metadatum.value === 'Related Creator with authority') {
+          return observableOf(Object.assign(new ItemMetadataRepresentation(metadatum), relatedCreator));
+        }
+        if (metadatum.value === 'Related Creator with authority - unauthorized') {
+          return observableOf(Object.assign(new MetadatumRepresentation(type), metadatum));
+        }
+      },
+    };
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [MetadataRepresentationListComponent, VarDirective],

From 661ed72c1188d24d4cff0157c2204580577385f5 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Tue, 3 Jan 2023 17:02:05 +0100
Subject: [PATCH 077/160] 96252: Move Item page components out of SharedModule

---
 .../alerts}/item-alerts.component.html        |  0
 .../alerts}/item-alerts.component.scss        |  0
 .../alerts}/item-alerts.component.spec.ts     |  2 +-
 .../alerts}/item-alerts.component.ts          |  4 +-
 ...tstream-request-a-copy-page.component.html |  0
 ...ream-request-a-copy-page.component.spec.ts | 28 +++++------
 ...bitstream-request-a-copy-page.component.ts | 30 ++++++------
 .../edit-item-page/edit-item-page.module.ts   |  4 +-
 .../full-file-section.component.spec.ts       |  2 +-
 src/app/item-page/item-page-routing.module.ts |  4 +-
 src/app/item-page/item-page.module.ts         | 17 +++++--
 src/app/item-page/item-shared.module.ts       | 27 ++++++++++-
 .../media-viewer-video.component.spec.ts      |  2 +-
 .../media-viewer.component.spec.ts            |  2 +-
 .../file-section.component.spec.ts            |  2 +-
 .../untyped-item.component.spec.ts            |  2 +-
 .../versioned-item.component.spec.ts          |  4 +-
 .../versioned-item.component.ts               |  4 +-
 .../item-versions-delete-modal.component.html |  0
 .../item-versions-delete-modal.component.scss |  0
 ...em-versions-delete-modal.component.spec.ts |  0
 .../item-versions-delete-modal.component.ts   |  0
 .../item-versions-shared.service.spec.ts      | 16 +++----
 .../versions}/item-versions-shared.service.ts |  6 +--
 ...item-versions-summary-modal.component.html |  0
 ...item-versions-summary-modal.component.scss |  0
 ...m-versions-summary-modal.component.spec.ts |  0
 .../item-versions-summary-modal.component.ts  |  2 +-
 .../versions}/item-versions.component.html    |  0
 .../versions}/item-versions.component.scss    |  0
 .../versions}/item-versions.component.spec.ts | 42 ++++++++--------
 .../versions}/item-versions.component.ts      | 46 +++++++++---------
 .../versions/item-versions.module.ts          | 32 +++++++++++++
 .../item-versions-notice.component.html       |  0
 .../item-versions-notice.component.spec.ts    | 12 ++---
 .../notice/item-versions-notice.component.ts  | 18 +++----
 .../metadata-field-wrapper.component.html     |  0
 .../metadata-field-wrapper.component.scss     |  0
 .../metadata-field-wrapper.component.spec.ts  |  0
 .../metadata-field-wrapper.component.ts       |  0
 src/app/shared/shared.module.ts               | 48 +------------------
 src/themes/custom/lazy-theme.module.ts        |  4 ++
 src/themes/dspace/lazy-theme.module.ts        |  4 ++
 43 files changed, 198 insertions(+), 166 deletions(-)
 rename src/app/{shared/item/item-alerts => item-page/alerts}/item-alerts.component.html (100%)
 rename src/app/{shared/item/item-alerts => item-page/alerts}/item-alerts.component.scss (100%)
 rename src/app/{shared/item/item-alerts => item-page/alerts}/item-alerts.component.spec.ts (97%)
 rename src/app/{shared/item/item-alerts => item-page/alerts}/item-alerts.component.ts (80%)
 rename src/app/{shared/bitstream-request-a-copy-page => item-page/bitstreams/request-a-copy}/bitstream-request-a-copy-page.component.html (100%)
 rename src/app/{shared/bitstream-request-a-copy-page => item-page/bitstreams/request-a-copy}/bitstream-request-a-copy-page.component.spec.ts (90%)
 rename src/app/{shared/bitstream-request-a-copy-page => item-page/bitstreams/request-a-copy}/bitstream-request-a-copy-page.component.ts (85%)
 rename src/app/{shared/item/item-versions => item-page/versions}/item-versions-delete-modal/item-versions-delete-modal.component.html (100%)
 rename src/app/{shared/item/item-versions => item-page/versions}/item-versions-delete-modal/item-versions-delete-modal.component.scss (100%)
 rename src/app/{shared/item/item-versions => item-page/versions}/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts (100%)
 rename src/app/{shared/item/item-versions => item-page/versions}/item-versions-delete-modal/item-versions-delete-modal.component.ts (100%)
 rename src/app/{shared/item/item-versions => item-page/versions}/item-versions-shared.service.spec.ts (75%)
 rename src/app/{shared/item/item-versions => item-page/versions}/item-versions-shared.service.ts (84%)
 rename src/app/{shared/item/item-versions => item-page/versions}/item-versions-summary-modal/item-versions-summary-modal.component.html (100%)
 rename src/app/{shared/item/item-versions => item-page/versions}/item-versions-summary-modal/item-versions-summary-modal.component.scss (100%)
 rename src/app/{shared/item/item-versions => item-page/versions}/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts (100%)
 rename src/app/{shared/item/item-versions => item-page/versions}/item-versions-summary-modal/item-versions-summary-modal.component.ts (93%)
 rename src/app/{shared/item/item-versions => item-page/versions}/item-versions.component.html (100%)
 rename src/app/{shared/item/item-versions => item-page/versions}/item-versions.component.scss (100%)
 rename src/app/{shared/item/item-versions => item-page/versions}/item-versions.component.spec.ts (87%)
 rename src/app/{shared/item/item-versions => item-page/versions}/item-versions.component.ts (91%)
 create mode 100644 src/app/item-page/versions/item-versions.module.ts
 rename src/app/{shared/item/item-versions => item-page/versions}/notice/item-versions-notice.component.html (100%)
 rename src/app/{shared/item/item-versions => item-page/versions}/notice/item-versions-notice.component.spec.ts (90%)
 rename src/app/{shared/item/item-versions => item-page/versions}/notice/item-versions-notice.component.ts (81%)
 rename src/app/{item-page/field-components => shared}/metadata-field-wrapper/metadata-field-wrapper.component.html (100%)
 rename src/app/{item-page/field-components => shared}/metadata-field-wrapper/metadata-field-wrapper.component.scss (100%)
 rename src/app/{item-page/field-components => shared}/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts (100%)
 rename src/app/{item-page/field-components => shared}/metadata-field-wrapper/metadata-field-wrapper.component.ts (100%)

diff --git a/src/app/shared/item/item-alerts/item-alerts.component.html b/src/app/item-page/alerts/item-alerts.component.html
similarity index 100%
rename from src/app/shared/item/item-alerts/item-alerts.component.html
rename to src/app/item-page/alerts/item-alerts.component.html
diff --git a/src/app/shared/item/item-alerts/item-alerts.component.scss b/src/app/item-page/alerts/item-alerts.component.scss
similarity index 100%
rename from src/app/shared/item/item-alerts/item-alerts.component.scss
rename to src/app/item-page/alerts/item-alerts.component.scss
diff --git a/src/app/shared/item/item-alerts/item-alerts.component.spec.ts b/src/app/item-page/alerts/item-alerts.component.spec.ts
similarity index 97%
rename from src/app/shared/item/item-alerts/item-alerts.component.spec.ts
rename to src/app/item-page/alerts/item-alerts.component.spec.ts
index fed81199fd..a933eb6a58 100644
--- a/src/app/shared/item/item-alerts/item-alerts.component.spec.ts
+++ b/src/app/item-page/alerts/item-alerts.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { ItemAlertsComponent } from './item-alerts.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
+import { Item } from '../../core/shared/item.model';
 import { By } from '@angular/platform-browser';
 
 describe('ItemAlertsComponent', () => {
diff --git a/src/app/shared/item/item-alerts/item-alerts.component.ts b/src/app/item-page/alerts/item-alerts.component.ts
similarity index 80%
rename from src/app/shared/item/item-alerts/item-alerts.component.ts
rename to src/app/item-page/alerts/item-alerts.component.ts
index 4c2d60d24c..d7a84db015 100644
--- a/src/app/shared/item/item-alerts/item-alerts.component.ts
+++ b/src/app/item-page/alerts/item-alerts.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
-import { AlertType } from '../../alert/aletr-type';
+import { Item } from '../../core/shared/item.model';
+import { AlertType } from '../../shared/alert/aletr-type';
 
 @Component({
   selector: 'ds-item-alerts',
diff --git a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.html b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
similarity index 100%
rename from src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.html
rename to src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
diff --git a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.spec.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.spec.ts
similarity index 90%
rename from src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.spec.ts
rename to src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.spec.ts
index cc44ef8587..cbfbdf361f 100644
--- a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.spec.ts
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.spec.ts
@@ -1,30 +1,30 @@
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { AuthService } from '../../core/auth/auth.service';
+import { AuthService } from '../../../core/auth/auth.service';
 import { of as observableOf } from 'rxjs';
-import { Bitstream } from '../../core/shared/bitstream.model';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
   createSuccessfulRemoteDataObject$
-} from '../remote-data.utils';
+} from '../../../shared/remote-data.utils';
 import { ActivatedRoute, Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
 import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-page.component';
 import { By } from '@angular/platform-browser';
-import { RouterStub } from '../testing/router.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { NotificationsServiceStub } from '../testing/notifications-service.stub';
-import { ItemRequestDataService } from '../../core/data/item-request-data.service';
-import { NotificationsService } from '../notifications/notifications.service';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../mocks/dso-name.service.mock';
-import { Item } from '../../core/shared/item.model';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { ItemRequest } from '../../core/shared/item-request.model';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { ItemRequestDataService } from '../../../core/data/item-request-data.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
+import { Item } from '../../../core/shared/item.model';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { ItemRequest } from '../../../core/shared/item-request.model';
 import { Location } from '@angular/common';
-import { BitstreamDataService } from '../../core/data/bitstream-data.service';
+import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
 
 
 describe('BitstreamRequestACopyPageComponent', () => {
diff --git a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
similarity index 85%
rename from src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts
rename to src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
index 511079a701..59819a4a66 100644
--- a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
@@ -1,25 +1,25 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { filter, map, switchMap, take } from 'rxjs/operators';
 import { ActivatedRoute, Router } from '@angular/router';
-import { hasValue, isNotEmpty } from '../empty.util';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { Bitstream } from '../../core/shared/bitstream.model';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { AuthService } from '../../core/auth/auth.service';
+import { hasValue, isNotEmpty } from '../../../shared/empty.util';
+import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { AuthService } from '../../../core/auth/auth.service';
 import { combineLatest as observableCombineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
-import { getBitstreamDownloadRoute, getForbiddenRoute } from '../../app-routing-paths';
+import { getBitstreamDownloadRoute, getForbiddenRoute } from '../../../app-routing-paths';
 import { TranslateService } from '@ngx-translate/core';
-import { EPerson } from '../../core/eperson/models/eperson.model';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
 import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
-import { ItemRequestDataService } from '../../core/data/item-request-data.service';
-import { ItemRequest } from '../../core/shared/item-request.model';
-import { Item } from '../../core/shared/item.model';
-import { NotificationsService } from '../notifications/notifications.service';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { ItemRequestDataService } from '../../../core/data/item-request-data.service';
+import { ItemRequest } from '../../../core/shared/item-request.model';
+import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { Location } from '@angular/common';
-import { BitstreamDataService } from '../../core/data/bitstream-data.service';
-import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
+import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
+import { getItemPageRoute } from '../../item-page-routing-paths';
 
 @Component({
   selector: 'ds-bitstream-request-a-copy-page',
diff --git a/src/app/item-page/edit-item-page/edit-item-page.module.ts b/src/app/item-page/edit-item-page/edit-item-page.module.ts
index 3ed741bc1a..fafbae0bd4 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.module.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.module.ts
@@ -36,6 +36,7 @@ import { ItemVersionHistoryComponent } from './item-version-history/item-version
 import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component';
 import { ObjectValuesPipe } from '../../shared/utils/object-values-pipe';
 import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
+import { ItemVersionsModule } from '../versions/item-versions.module';
 
 
 /**
@@ -50,7 +51,8 @@ import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-
     SearchPageModule,
     DragDropModule,
     ResourcePoliciesModule,
-    NgbModule
+    NgbModule,
+    ItemVersionsModule,
   ],
   declarations: [
     EditItemPageComponent,
diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts
index 396e6c3216..9a4bd05587 100644
--- a/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts
+++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts
@@ -7,7 +7,7 @@ import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.m
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { VarDirective } from '../../../../shared/utils/var.directive';
 import { FileSizePipe } from '../../../../shared/utils/file-size-pipe';
-import { MetadataFieldWrapperComponent } from '../../../field-components/metadata-field-wrapper/metadata-field-wrapper.component';
+import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
diff --git a/src/app/item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts
index add2c3d768..bda09be458 100644
--- a/src/app/item-page/item-page-routing.module.ts
+++ b/src/app/item-page/item-page-routing.module.ts
@@ -14,9 +14,7 @@ import { ThemedItemPageComponent } from './simple/themed-item-page.component';
 import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component';
 import { MenuItemType } from '../shared/menu/menu-item-type.model';
 import { VersionPageComponent } from './version-page/version-page/version-page.component';
-import {
-  BitstreamRequestACopyPageComponent
-} from '../shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component';
+import { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component';
 import { REQUEST_COPY_MODULE_PATH } from '../app-routing-paths';
 import { OrcidPageComponent } from './orcid-page/orcid-page.component';
 import { OrcidPageGuard } from './orcid-page/orcid-page.guard';
diff --git a/src/app/item-page/item-page.module.ts b/src/app/item-page/item-page.module.ts
index de9f2f60c5..39c2580921 100644
--- a/src/app/item-page/item-page.module.ts
+++ b/src/app/item-page/item-page.module.ts
@@ -47,6 +47,11 @@ import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
 import { OrcidSyncSettingsComponent } from './orcid-page/orcid-sync-settings/orcid-sync-settings.component';
 import { OrcidQueueComponent } from './orcid-page/orcid-queue/orcid-queue.component';
 import { UploadModule } from '../shared/upload/upload.module';
+import { ItemAlertsComponent } from './alerts/item-alerts.component';
+import { ItemVersionsModule } from './versions/item-versions.module';
+import { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component';
+import { FileSectionComponent } from './simple/field-components/file-section/file-section.component';
+import { ItemSharedModule } from './item-shared.module';
 
 
 const ENTRY_COMPONENTS = [
@@ -56,6 +61,7 @@ const ENTRY_COMPONENTS = [
 ];
 
 const DECLARATIONS = [
+  FileSectionComponent,
   ThemedFileSectionComponent,
   ItemPageComponent,
   ThemedItemPageComponent,
@@ -82,7 +88,10 @@ const DECLARATIONS = [
   OrcidPageComponent,
   OrcidAuthComponent,
   OrcidSyncSettingsComponent,
-  OrcidQueueComponent
+  OrcidQueueComponent,
+  ItemAlertsComponent,
+  VersionedItemComponent,
+  BitstreamRequestACopyPageComponent,
 ];
 
 @NgModule({
@@ -91,6 +100,8 @@ const DECLARATIONS = [
     SharedModule.withEntryComponents(),
     ItemPageRoutingModule,
     EditItemPageModule,
+    ItemVersionsModule,
+    ItemSharedModule,
     StatisticsModule.forRoot(),
     JournalEntitiesModule.withEntryComponents(),
     ResearchEntitiesModule.withEntryComponents(),
@@ -100,10 +111,10 @@ const DECLARATIONS = [
   ],
   declarations: [
     ...DECLARATIONS,
-    VersionedItemComponent
+
   ],
   exports: [
-    ...DECLARATIONS
+    ...DECLARATIONS,
   ]
 })
 export class ItemPageModule {
diff --git a/src/app/item-page/item-shared.module.ts b/src/app/item-page/item-shared.module.ts
index b191b6c4b3..c558b11692 100644
--- a/src/app/item-page/item-shared.module.ts
+++ b/src/app/item-page/item-shared.module.ts
@@ -7,10 +7,32 @@ import { TranslateModule } from '@ngx-translate/core';
 import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core';
 import { dsDynamicFormControlMapFn } from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
 import { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
+import { ItemVersionsDeleteModalComponent } from './versions/item-versions-delete-modal/item-versions-delete-modal.component';
+import { ItemVersionsSummaryModalComponent } from './versions/item-versions-summary-modal/item-versions-summary-modal.component';
+import { MetadataValuesComponent } from './field-components/metadata-values/metadata-values.component';
+import { DsoPageVersionButtonComponent } from '../shared/dso-page/dso-page-version-button/dso-page-version-button.component';
+import { PersonPageClaimButtonComponent } from '../shared/dso-page/person-page-claim-button/person-page-claim-button.component';
+import { GenericItemPageFieldComponent } from './simple/field-components/specific-field/generic/generic-item-page-field.component';
+import { MetadataRepresentationListComponent } from './simple/metadata-representation-list/metadata-representation-list.component';
+import { RelatedItemsComponent } from './simple/related-items/related-items-component';
+import { DsoPageOrcidButtonComponent } from '../shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component';
+
+const ENTRY_COMPONENTS = [
+  ItemVersionsDeleteModalComponent,
+  ItemVersionsSummaryModalComponent,
+];
 
 const COMPONENTS = [
+  ...ENTRY_COMPONENTS,
   RelatedEntitiesSearchComponent,
-  TabbedRelatedEntitiesSearchComponent
+  TabbedRelatedEntitiesSearchComponent,
+  MetadataValuesComponent,
+  DsoPageVersionButtonComponent,
+  PersonPageClaimButtonComponent,
+  GenericItemPageFieldComponent,
+  MetadataRepresentationListComponent,
+  RelatedItemsComponent,
+  DsoPageOrcidButtonComponent
 ];
 
 @NgModule({
@@ -30,7 +52,8 @@ const COMPONENTS = [
     {
       provide: DYNAMIC_FORM_CONTROL_MAP_FN,
       useValue: dsDynamicFormControlMapFn
-    }
+    },
+    ...ENTRY_COMPONENTS,
   ]
 })
 export class ItemSharedModule { }
diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts
index 354ba57727..846b5878f4 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts
+++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts
@@ -8,7 +8,7 @@ import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
 import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
 import { FileSizePipe } from '../../../shared/utils/file-size-pipe';
 import { VarDirective } from '../../../shared/utils/var.directive';
-import { MetadataFieldWrapperComponent } from '../../field-components/metadata-field-wrapper/metadata-field-wrapper.component';
+import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
 import { MockBitstreamFormat1 } from '../../../shared/mocks/item.mock';
 import { MediaViewerVideoComponent } from './media-viewer-video.component';
 import { By } from '@angular/platform-browser';
diff --git a/src/app/item-page/media-viewer/media-viewer.component.spec.ts b/src/app/item-page/media-viewer/media-viewer.component.spec.ts
index 39a35ebe61..3369574f20 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.spec.ts
+++ b/src/app/item-page/media-viewer/media-viewer.component.spec.ts
@@ -13,7 +13,7 @@ import { BitstreamDataService } from '../../core/data/bitstream-data.service';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { MediaViewerItem } from '../../core/shared/media-viewer-item.model';
 import { VarDirective } from '../../shared/utils/var.directive';
-import { MetadataFieldWrapperComponent } from '../field-components/metadata-field-wrapper/metadata-field-wrapper.component';
+import { MetadataFieldWrapperComponent } from '../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
 import { FileSizePipe } from '../../shared/utils/file-size-pipe';
 
 describe('MediaViewerComponent', () => {
diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts b/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts
index 2d185aef9c..dfeb253ec4 100644
--- a/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts
+++ b/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts
@@ -13,7 +13,7 @@ import { of as observableOf } from 'rxjs';
 import { MockBitstreamFormat1 } from '../../../../shared/mocks/item.mock';
 import { FileSizePipe } from '../../../../shared/utils/file-size-pipe';
 import { PageInfo } from '../../../../core/shared/page-info.model';
-import { MetadataFieldWrapperComponent } from '../../../field-components/metadata-field-wrapper/metadata-field-wrapper.component';
+import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
 import { createPaginatedList } from '../../../../shared/testing/utils.test';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
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 57f546fbec..176a692f4b 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
@@ -36,7 +36,7 @@ import { VersionDataService } from '../../../../core/data/version-data.service';
 import { RouterTestingModule } from '@angular/router/testing';
 import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
 import { SearchService } from '../../../../core/shared/search/search.service';
-import { ItemVersionsSharedService } from '../../../../shared/item/item-versions/item-versions-shared.service';
+import { ItemVersionsSharedService } from '../../../versions/item-versions-shared.service';
 
 const noMetadata = new MetadataMap();
 
diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts
index 9aeea8b11e..fcd82ce678 100644
--- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts
+++ b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts
@@ -5,7 +5,7 @@ import { VersionHistoryDataService } from '../../../../core/data/version-history
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { VersionDataService } from '../../../../core/data/version-data.service';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { ItemVersionsSharedService } from '../../../../shared/item/item-versions/item-versions-shared.service';
+import { ItemVersionsSharedService } from '../../../versions/item-versions-shared.service';
 import { Item } from '../../../../core/shared/item.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
@@ -20,6 +20,7 @@ import { ItemDataService } from '../../../../core/data/item-data.service';
 import { Version } from '../../../../core/shared/version.model';
 import { RouteService } from '../../../../core/services/route.service';
 import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
+import { ItemSharedModule } from '../../../item-shared.module';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -66,6 +67,7 @@ describe('VersionedItemComponent', () => {
             useClass: TranslateLoaderMock,
           }
         }),
+        ItemSharedModule,
       ],
       providers: [
         { provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy },
diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
index 7f61cee10b..0cedc3bb10 100644
--- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
+++ b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { ItemComponent } from '../shared/item.component';
-import { ItemVersionsSummaryModalComponent } from '../../../../shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component';
+import { ItemVersionsSummaryModalComponent } from '../../../versions/item-versions-summary-modal/item-versions-summary-modal.component';
 import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Version } from '../../../../core/shared/version.model';
@@ -9,7 +9,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
 import { TranslateService } from '@ngx-translate/core';
 import { VersionDataService } from '../../../../core/data/version-data.service';
-import { ItemVersionsSharedService } from '../../../../shared/item/item-versions/item-versions-shared.service';
+import { ItemVersionsSharedService } from '../../../versions/item-versions-shared.service';
 import { Router } from '@angular/router';
 import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
 import { SearchService } from '../../../../core/shared/search/search.service';
diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html b/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.html
similarity index 100%
rename from src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html
rename to src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.html
diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.scss b/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.scss
similarity index 100%
rename from src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.scss
rename to src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.scss
diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts b/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts
similarity index 100%
rename from src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts
rename to src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts
diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts b/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.ts
similarity index 100%
rename from src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts
rename to src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.ts
diff --git a/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts b/src/app/item-page/versions/item-versions-shared.service.spec.ts
similarity index 75%
rename from src/app/shared/item/item-versions/item-versions-shared.service.spec.ts
rename to src/app/item-page/versions/item-versions-shared.service.spec.ts
index a9f9596548..d4adbf681f 100644
--- a/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts
+++ b/src/app/item-page/versions/item-versions-shared.service.spec.ts
@@ -2,15 +2,15 @@ import { TestBed } from '@angular/core/testing';
 
 import { ItemVersionsSharedService } from './item-versions-shared.service';
 import { ActivatedRoute } from '@angular/router';
-import { VersionDataService } from '../../../core/data/version-data.service';
-import { AuthService } from '../../../core/auth/auth.service';
-import { NotificationsService } from '../../notifications/notifications.service';
+import { VersionDataService } from '../../core/data/version-data.service';
+import { AuthService } from '../../core/auth/auth.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
-import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
-import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
-import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from '../../remote-data.utils';
-import { Version } from '../../../core/shared/version.model';
+import { VersionHistoryDataService } from '../../core/data/version-history-data.service';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
+import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { Version } from '../../core/shared/version.model';
 
 describe('ItemVersionsSharedService', () => {
   let service: ItemVersionsSharedService;
diff --git a/src/app/shared/item/item-versions/item-versions-shared.service.ts b/src/app/item-page/versions/item-versions-shared.service.ts
similarity index 84%
rename from src/app/shared/item/item-versions/item-versions-shared.service.ts
rename to src/app/item-page/versions/item-versions-shared.service.ts
index 996623509c..09104f5ddc 100644
--- a/src/app/shared/item/item-versions/item-versions-shared.service.ts
+++ b/src/app/item-page/versions/item-versions-shared.service.ts
@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
-import { NotificationsService } from '../../notifications/notifications.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Version } from '../../../core/shared/version.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { Version } from '../../core/shared/version.model';
 
 @Injectable({
   providedIn: 'root'
diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html
similarity index 100%
rename from src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html
rename to src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html
diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.scss b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.scss
similarity index 100%
rename from src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.scss
rename to src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.scss
diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts
similarity index 100%
rename from src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts
rename to src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts
diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
similarity index 93%
rename from src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
rename to src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
index 23ee62e628..8f2c7bd62e 100644
--- a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
+++ b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, OnInit, Output } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { BehaviorSubject } from 'rxjs';
-import { ModalBeforeDismiss } from '../../../interfaces/modal-before-dismiss.interface';
+import { ModalBeforeDismiss } from '../../../shared/interfaces/modal-before-dismiss.interface';
 
 @Component({
   selector: 'ds-item-versions-summary-modal',
diff --git a/src/app/shared/item/item-versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
similarity index 100%
rename from src/app/shared/item/item-versions/item-versions.component.html
rename to src/app/item-page/versions/item-versions.component.html
diff --git a/src/app/shared/item/item-versions/item-versions.component.scss b/src/app/item-page/versions/item-versions.component.scss
similarity index 100%
rename from src/app/shared/item/item-versions/item-versions.component.scss
rename to src/app/item-page/versions/item-versions.component.scss
diff --git a/src/app/shared/item/item-versions/item-versions.component.spec.ts b/src/app/item-page/versions/item-versions.component.spec.ts
similarity index 87%
rename from src/app/shared/item/item-versions/item-versions.component.spec.ts
rename to src/app/item-page/versions/item-versions.component.spec.ts
index d4dbc336ab..999176d996 100644
--- a/src/app/shared/item/item-versions/item-versions.component.spec.ts
+++ b/src/app/item-page/versions/item-versions.component.spec.ts
@@ -2,33 +2,33 @@ import { ItemVersionsComponent } from './item-versions.component';
 import {
   ComponentFixture, TestBed, waitForAsync
 } from '@angular/core/testing';
-import { VarDirective } from '../../utils/var.directive';
+import { VarDirective } from '../../shared/utils/var.directive';
 import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
-import { Version } from '../../../core/shared/version.model';
-import { VersionHistory } from '../../../core/shared/version-history.model';
-import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
+import { Item } from '../../core/shared/item.model';
+import { Version } from '../../core/shared/version.model';
+import { VersionHistory } from '../../core/shared/version-history.model';
+import { VersionHistoryDataService } from '../../core/data/version-history-data.service';
 import { BrowserModule, By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { createPaginatedList } from '../../testing/utils.test';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
 import { EMPTY, of, of as observableOf } from 'rxjs';
-import { PaginationService } from '../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../testing/pagination-service.stub';
-import { AuthService } from '../../../core/auth/auth.service';
-import { VersionDataService } from '../../../core/data/version-data.service';
-import { ItemDataService } from '../../../core/data/item-data.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import { AuthService } from '../../core/auth/auth.service';
+import { VersionDataService } from '../../core/data/version-data.service';
+import { ItemDataService } from '../../core/data/item-data.service';
 import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
-import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
-import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 import { Router } from '@angular/router';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { CommonModule } from '@angular/common';
+import { ItemSharedModule } from '../item-shared.module';
 
 describe('ItemVersionsComponent', () => {
   let component: ItemVersionsComponent;
@@ -137,7 +137,7 @@ describe('ItemVersionsComponent', () => {
 
     TestBed.configureTestingModule({
       declarations: [ItemVersionsComponent, VarDirective],
-      imports: [TranslateModule.forRoot(), CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule],
+      imports: [TranslateModule.forRoot(), CommonModule, FormsModule, ReactiveFormsModule, BrowserModule, ItemSharedModule],
       providers: [
         {provide: PaginationService, useValue: new PaginationServiceStub()},
         {provide: FormBuilder, useValue: new FormBuilder()},
diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/item-page/versions/item-versions.component.ts
similarity index 91%
rename from src/app/shared/item/item-versions/item-versions.component.ts
rename to src/app/item-page/versions/item-versions.component.ts
index b7b8182658..e0fc623f49 100644
--- a/src/app/shared/item/item-versions/item-versions.component.ts
+++ b/src/app/item-page/versions/item-versions.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
-import { Version } from '../../../core/shared/version.model';
-import { RemoteData } from '../../../core/data/remote-data';
+import { Item } from '../../core/shared/item.model';
+import { Version } from '../../core/shared/version.model';
+import { RemoteData } from '../../core/data/remote-data';
 import {
   BehaviorSubject,
   combineLatest,
@@ -9,7 +9,7 @@ import {
   of,
   Subscription,
 } from 'rxjs';
-import { VersionHistory } from '../../../core/shared/version-history.model';
+import { VersionHistory } from '../../core/shared/version-history.model';
 import {
   getAllSucceededRemoteData,
   getAllSucceededRemoteDataPayload,
@@ -17,37 +17,37 @@ import {
   getFirstSucceededRemoteData,
   getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload
-} from '../../../core/shared/operators';
+} from '../../core/shared/operators';
 import { map, mergeMap, startWith, switchMap, take, tap } from 'rxjs/operators';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
-import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
-import { PaginatedSearchOptions } from '../../search/models/paginated-search-options.model';
-import { AlertType } from '../../alert/aletr-type';
-import { followLink } from '../../utils/follow-link-config.model';
-import { hasValue, hasValueOperator } from '../../empty.util';
-import { PaginationService } from '../../../core/pagination/pagination.service';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { VersionHistoryDataService } from '../../core/data/version-history-data.service';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { AlertType } from '../../shared/alert/aletr-type';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import { hasValue, hasValueOperator } from '../../shared/empty.util';
+import { PaginationService } from '../../core/pagination/pagination.service';
 import {
   getItemEditVersionhistoryRoute,
   getItemPageRoute,
   getItemVersionRoute
-} from '../../../item-page/item-page-routing-paths';
+} from '../item-page-routing-paths';
 import { FormBuilder } from '@angular/forms';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal/item-versions-summary-modal.component';
-import { NotificationsService } from '../../notifications/notifications.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { ItemVersionsDeleteModalComponent } from './item-versions-delete-modal/item-versions-delete-modal.component';
-import { VersionDataService } from '../../../core/data/version-data.service';
-import { ItemDataService } from '../../../core/data/item-data.service';
+import { VersionDataService } from '../../core/data/version-data.service';
+import { ItemDataService } from '../../core/data/item-data.service';
 import { Router } from '@angular/router';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { ItemVersionsSharedService } from './item-versions-shared.service';
-import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
-import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
-import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
-import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 
 @Component({
   selector: 'ds-item-versions',
diff --git a/src/app/item-page/versions/item-versions.module.ts b/src/app/item-page/versions/item-versions.module.ts
new file mode 100644
index 0000000000..577844488d
--- /dev/null
+++ b/src/app/item-page/versions/item-versions.module.ts
@@ -0,0 +1,32 @@
+/**
+ * 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 { NgModule } from '@angular/core';
+import { SharedModule } from '../../shared/shared.module';
+import { ItemVersionsComponent } from './item-versions.component';
+import { ItemVersionsNoticeComponent } from './notice/item-versions-notice.component';
+
+const DECLARATIONS = [
+  ItemVersionsComponent,
+  ItemVersionsNoticeComponent,
+];
+
+@NgModule({
+  imports: [
+    SharedModule,
+  ],
+  declarations: [
+    ...DECLARATIONS,
+  ],
+  exports: [
+    ...DECLARATIONS,
+  ],
+})
+export class ItemVersionsModule {
+
+}
diff --git a/src/app/shared/item/item-versions/notice/item-versions-notice.component.html b/src/app/item-page/versions/notice/item-versions-notice.component.html
similarity index 100%
rename from src/app/shared/item/item-versions/notice/item-versions-notice.component.html
rename to src/app/item-page/versions/notice/item-versions-notice.component.html
diff --git a/src/app/shared/item/item-versions/notice/item-versions-notice.component.spec.ts b/src/app/item-page/versions/notice/item-versions-notice.component.spec.ts
similarity index 90%
rename from src/app/shared/item/item-versions/notice/item-versions-notice.component.spec.ts
rename to src/app/item-page/versions/notice/item-versions-notice.component.spec.ts
index 2849ba4909..fb29e54a21 100644
--- a/src/app/shared/item/item-versions/notice/item-versions-notice.component.spec.ts
+++ b/src/app/item-page/versions/notice/item-versions-notice.component.spec.ts
@@ -3,13 +3,13 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { VersionHistory } from '../../../../core/shared/version-history.model';
-import { Version } from '../../../../core/shared/version.model';
-import { Item } from '../../../../core/shared/item.model';
-import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
+import { VersionHistory } from '../../../core/shared/version-history.model';
+import { Version } from '../../../core/shared/version.model';
+import { Item } from '../../../core/shared/item.model';
+import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
 import { By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
-import { createPaginatedList } from '../../../testing/utils.test';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { of } from 'rxjs';
 import { take } from 'rxjs/operators';
 
diff --git a/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts b/src/app/item-page/versions/notice/item-versions-notice.component.ts
similarity index 81%
rename from src/app/shared/item/item-versions/notice/item-versions-notice.component.ts
rename to src/app/item-page/versions/notice/item-versions-notice.component.ts
index a292ea65c6..8a8f5ff76f 100644
--- a/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts
+++ b/src/app/item-page/versions/notice/item-versions-notice.component.ts
@@ -1,19 +1,19 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Item } from '../../../../core/shared/item.model';
+import { Item } from '../../../core/shared/item.model';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { VersionHistory } from '../../../../core/shared/version-history.model';
-import { Version } from '../../../../core/shared/version.model';
-import { hasValue, hasValueOperator } from '../../../empty.util';
+import { RemoteData } from '../../../core/data/remote-data';
+import { VersionHistory } from '../../../core/shared/version-history.model';
+import { Version } from '../../../core/shared/version.model';
+import { hasValue, hasValueOperator } from '../../../shared/empty.util';
 import {
   getAllSucceededRemoteData,
   getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload
-} from '../../../../core/shared/operators';
+} from '../../../core/shared/operators';
 import { map, startWith, switchMap } from 'rxjs/operators';
-import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
-import { AlertType } from '../../../alert/aletr-type';
-import { getItemPageRoute } from '../../../../item-page/item-page-routing-paths';
+import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
+import { AlertType } from '../../../shared/alert/aletr-type';
+import { getItemPageRoute } from '../../item-page-routing-paths';
 
 @Component({
   selector: 'ds-item-versions-notice',
diff --git a/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
similarity index 100%
rename from src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html
rename to src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
diff --git a/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.scss b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss
similarity index 100%
rename from src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.scss
rename to src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss
diff --git a/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
similarity index 100%
rename from src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
rename to src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
diff --git a/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.ts
similarity index 100%
rename from src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts
rename to src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.ts
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 5e3742e5b9..d50cfd95bf 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -225,17 +225,14 @@ import {
 import {
   ImportableListItemControlComponent
 } from './object-collection/shared/importable-list-item-control/importable-list-item-control.component';
-import { ItemVersionsComponent } from './item/item-versions/item-versions.component';
 import { LogInContainerComponent } from './log-in/container/log-in-container.component';
 import { LogInShibbolethComponent } from './log-in/methods/shibboleth/log-in-shibboleth.component';
 import { LogInPasswordComponent } from './log-in/methods/password/log-in-password.component';
 import { LogInComponent } from './log-in/log-in.component';
 import { BundleListElementComponent } from './object-list/bundle-list-element/bundle-list-element.component';
 import { MissingTranslationHelper } from './translate/missing-translation.helper';
-import { ItemVersionsNoticeComponent } from './item/item-versions/notice/item-versions-notice.component';
 import { FileValidator } from './utils/require-file.validator';
 import { FileValueAccessorDirective } from './utils/file-value-accessor.directive';
-import { FileSectionComponent } from '../item-page/simple/field-components/file-section/file-section.component';
 import {
   ModifyItemOverviewComponent
 } from '../item-page/edit-item-page/modify-item-overview/modify-item-overview.component';
@@ -268,44 +265,23 @@ import {
   AuthorizedCollectionSelectorComponent
 } from './dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component';
 import { DsoPageEditButtonComponent } from './dso-page/dso-page-edit-button/dso-page-edit-button.component';
-import { DsoPageVersionButtonComponent } from './dso-page/dso-page-version-button/dso-page-version-button.component';
 import { HoverClassDirective } from './hover-class.directive';
 import {
   ValidationSuggestionsComponent
 } from './input-suggestions/validation-suggestions/validation-suggestions.component';
-import { ItemAlertsComponent } from './item/item-alerts/item-alerts.component';
 import {
   ItemSearchResultGridElementComponent
 } from './object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
-import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component';
-import {
-  GenericItemPageFieldComponent
-} from '../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component';
-import {
-  MetadataRepresentationListComponent
-} from '../item-page/simple/metadata-representation-list/metadata-representation-list.component';
-import { RelatedItemsComponent } from '../item-page/simple/related-items/related-items-component';
 import { SearchNavbarComponent } from '../search-navbar/search-navbar.component';
 import { ThemedSearchNavbarComponent } from '../search-navbar/themed-search-navbar.component';
-import {
-  ItemVersionsSummaryModalComponent
-} from './item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component';
-import {
-  ItemVersionsDeleteModalComponent
-} from './item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component';
 import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/scope-selector-modal.component';
-import {
-  BitstreamRequestACopyPageComponent
-} from './bitstream-request-a-copy-page/bitstream-request-a-copy-page.component';
 import { DsSelectComponent } from './ds-select/ds-select.component';
 import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component';
 import { ThemedItemListPreviewComponent } from './object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
 import { RSSComponent } from './rss-feed/rss.component';
-import { DsoPageOrcidButtonComponent } from './dso-page/dso-page-orcid-button/dso-page-orcid-button.component';
 import { LogInOrcidComponent } from './log-in/methods/orcid/log-in-orcid.component';
 import { BrowserOnlyPipe } from './utils/browser-only.pipe';
 import { ThemedLoadingComponent } from './loading/themed-loading.component';
-import { PersonPageClaimButtonComponent } from './dso-page/person-page-claim-button/person-page-claim-button.component';
 import { SearchExportCsvComponent } from './search/search-export-csv/search-export-csv.component';
 import {
   ItemPageTitleFieldComponent
@@ -367,7 +343,6 @@ const COMPONENTS = [
   UserMenuComponent,
   DsSelectComponent,
   ErrorComponent,
-  FileSectionComponent,
   LangSwitchComponent,
   LoadingComponent,
   ThemedLoadingComponent,
@@ -421,8 +396,6 @@ const COMPONENTS = [
   SelectableListItemControlComponent,
   ImportableListItemControlComponent,
   LogInContainerComponent,
-  ItemVersionsComponent,
-  ItemVersionsNoticeComponent,
   ModifyItemOverviewComponent,
   ImpersonateNavbarComponent,
   EntityDropdownComponent,
@@ -434,6 +407,8 @@ const COMPONENTS = [
   SearchNavbarComponent,
   ItemPageTitleFieldComponent,
   ThemedSearchNavbarComponent,
+  DsoPageEditButtonComponent,
+  MetadataFieldWrapperComponent,
 ];
 
 const ENTRY_COMPONENTS = [
@@ -484,7 +459,6 @@ const ENTRY_COMPONENTS = [
   CollectionDropdownComponent,
   FileDownloadLinkComponent,
   BitstreamDownloadPageComponent,
-  BitstreamRequestACopyPageComponent,
   CurationFormComponent,
   ExportMetadataSelectorComponent,
   ImportBatchSelectorComponent,
@@ -497,20 +471,6 @@ const ENTRY_COMPONENTS = [
   ScopeSelectorModalComponent,
 ];
 
-const SHARED_ITEM_PAGE_COMPONENTS = [
-  MetadataFieldWrapperComponent,
-  MetadataValuesComponent,
-  DsoPageEditButtonComponent,
-  DsoPageVersionButtonComponent,
-  PersonPageClaimButtonComponent,
-  ItemAlertsComponent,
-  GenericItemPageFieldComponent,
-  MetadataRepresentationListComponent,
-  RelatedItemsComponent,
-  DsoPageOrcidButtonComponent
-
-];
-
 const PROVIDERS = [
   TruncatableService,
   MockAdminGuard,
@@ -546,9 +506,6 @@ const DIRECTIVES = [
     ...COMPONENTS,
     ...ENTRY_COMPONENTS,
     ...DIRECTIVES,
-    ...SHARED_ITEM_PAGE_COMPONENTS,
-    ItemVersionsSummaryModalComponent,
-    ItemVersionsDeleteModalComponent,
   ],
   providers: [
     ...PROVIDERS
@@ -558,7 +515,6 @@ const DIRECTIVES = [
     ...PIPES,
     ...COMPONENTS,
     ...ENTRY_COMPONENTS,
-    ...SHARED_ITEM_PAGE_COMPONENTS,
     ...DIRECTIVES,
     TranslateModule,
   ]
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index d2ac0ae787..202f2c9635 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -114,6 +114,8 @@ import { ObjectListComponent } from './app/shared/object-list/object-list.compon
 import { BrowseByMetadataPageComponent } from './app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component';
 import { BrowseByDatePageComponent } from './app/browse-by/browse-by-date-page/browse-by-date-page.component';
 import { BrowseByTitlePageComponent } from './app/browse-by/browse-by-title-page/browse-by-title-page.component';
+import { ItemVersionsModule } from '../../app/item-page/versions/item-versions.module';
+import { ItemSharedModule } from '../../app/item-page/item-shared.module';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -189,8 +191,10 @@ const DECLARATIONS = [
     CommunityPageModule,
     CoreModule,
     DragDropModule,
+    ItemSharedModule,
     ItemPageModule,
     EditItemPageModule,
+    ItemVersionsModule,
     FormsModule,
     HomePageModule,
     HttpClientModule,
diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts
index a4e8027a15..6ece4d9755 100644
--- a/src/themes/dspace/lazy-theme.module.ts
+++ b/src/themes/dspace/lazy-theme.module.ts
@@ -55,6 +55,8 @@ import {
 } from '../../app/shared/resource-policies/resource-policies.module';
 import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 import { RootModule } from '../../app/root.module';
+import { ItemVersionsModule } from '../../app/item-page/versions/item-versions.module';
+import { ItemSharedModule } from 'src/app/item-page/item-shared.module';
 
 const DECLARATIONS = [
 ];
@@ -76,8 +78,10 @@ const DECLARATIONS = [
     CommunityPageModule,
     CoreModule,
     DragDropModule,
+    ItemSharedModule,
     ItemPageModule,
     EditItemPageModule,
+    ItemVersionsModule,
     FormsModule,
     HomePageModule,
     HttpClientModule,

From 935e9a4690ce0ecd54535adeb447503c0b76c9e6 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Tue, 3 Jan 2023 17:03:32 +0100
Subject: [PATCH 078/160] 96252: Move Bitstream page components out of
 SharedModule

---
 .../bitstream-download-page.component.html                    | 0
 .../bitstream-download-page.component.spec.ts                 | 2 +-
 .../bitstream-download-page.component.ts                      | 2 +-
 src/app/bitstream-page/bitstream-page-routing.module.ts       | 2 +-
 src/app/bitstream-page/bitstream-page.module.ts               | 4 +++-
 src/app/shared/shared.module.ts                               | 1 -
 6 files changed, 6 insertions(+), 5 deletions(-)
 rename src/app/{shared => bitstream-page}/bitstream-download-page/bitstream-download-page.component.html (100%)
 rename src/app/{shared => bitstream-page}/bitstream-download-page/bitstream-download-page.component.spec.ts (98%)
 rename src/app/{shared => bitstream-page}/bitstream-download-page/bitstream-download-page.component.ts (98%)

diff --git a/src/app/shared/bitstream-download-page/bitstream-download-page.component.html b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html
similarity index 100%
rename from src/app/shared/bitstream-download-page/bitstream-download-page.component.html
rename to src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html
diff --git a/src/app/shared/bitstream-download-page/bitstream-download-page.component.spec.ts b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.spec.ts
similarity index 98%
rename from src/app/shared/bitstream-download-page/bitstream-download-page.component.spec.ts
rename to src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.spec.ts
index 4100653e0f..e84b254eae 100644
--- a/src/app/shared/bitstream-download-page/bitstream-download-page.component.spec.ts
+++ b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.spec.ts
@@ -6,7 +6,7 @@ import { Bitstream } from '../../core/shared/bitstream.model';
 import { BitstreamDownloadPageComponent } from './bitstream-download-page.component';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { HardRedirectService } from '../../core/services/hard-redirect.service';
-import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { ActivatedRoute, Router } from '@angular/router';
 import { getForbiddenRoute } from '../../app-routing-paths';
 import { TranslateModule } from '@ngx-translate/core';
diff --git a/src/app/shared/bitstream-download-page/bitstream-download-page.component.ts b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts
similarity index 98%
rename from src/app/shared/bitstream-download-page/bitstream-download-page.component.ts
rename to src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts
index 9dd8c7c723..51ec762ec3 100644
--- a/src/app/shared/bitstream-download-page/bitstream-download-page.component.ts
+++ b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { filter, map, switchMap, take } from 'rxjs/operators';
 import { ActivatedRoute, Router } from '@angular/router';
-import { hasValue, isNotEmpty } from '../empty.util';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { getRemoteDataPayload} from '../../core/shared/operators';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
diff --git a/src/app/bitstream-page/bitstream-page-routing.module.ts b/src/app/bitstream-page/bitstream-page-routing.module.ts
index 0bdda29ddf..c2abe511a4 100644
--- a/src/app/bitstream-page/bitstream-page-routing.module.ts
+++ b/src/app/bitstream-page/bitstream-page-routing.module.ts
@@ -3,7 +3,7 @@ import { RouterModule } from '@angular/router';
 import { EditBitstreamPageComponent } from './edit-bitstream-page/edit-bitstream-page.component';
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
 import { BitstreamPageResolver } from './bitstream-page.resolver';
-import { BitstreamDownloadPageComponent } from '../shared/bitstream-download-page/bitstream-download-page.component';
+import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component';
 import { ResourcePolicyTargetResolver } from '../shared/resource-policies/resolvers/resource-policy-target.resolver';
 import { ResourcePolicyCreateComponent } from '../shared/resource-policies/create/resource-policy-create.component';
 import { ResourcePolicyResolver } from '../shared/resource-policies/resolvers/resource-policy.resolver';
diff --git a/src/app/bitstream-page/bitstream-page.module.ts b/src/app/bitstream-page/bitstream-page.module.ts
index d168a06db2..992f714bf9 100644
--- a/src/app/bitstream-page/bitstream-page.module.ts
+++ b/src/app/bitstream-page/bitstream-page.module.ts
@@ -6,6 +6,7 @@ import { BitstreamPageRoutingModule } from './bitstream-page-routing.module';
 import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
 import { FormModule } from '../shared/form/form.module';
 import { ResourcePoliciesModule } from '../shared/resource-policies/resource-policies.module';
+import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component';
 
 /**
  * This module handles all components that are necessary for Bitstream related pages
@@ -20,7 +21,8 @@ import { ResourcePoliciesModule } from '../shared/resource-policies/resource-pol
   ],
   declarations: [
     BitstreamAuthorizationsComponent,
-    EditBitstreamPageComponent
+    EditBitstreamPageComponent,
+    BitstreamDownloadPageComponent,
   ]
 })
 export class BitstreamPageModule {
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index d50cfd95bf..2e078914e2 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -458,7 +458,6 @@ const ENTRY_COMPONENTS = [
   ClaimedTaskActionsEditMetadataComponent,
   CollectionDropdownComponent,
   FileDownloadLinkComponent,
-  BitstreamDownloadPageComponent,
   CurationFormComponent,
   ExportMetadataSelectorComponent,
   ImportBatchSelectorComponent,

From 1c7108e9286edf3ef54157454a99dca4123ebb79 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Tue, 3 Jan 2023 17:03:42 +0100
Subject: [PATCH 079/160] 96252: Move MyDSpace components out of SharedModule

Also move ds-metadata-field-wrapper to SharedModule so it can be reused in detail view without importing ItemSharedModule
---
 .../my-dspace-page/my-dspace-search.module.ts | 27 +++++++--
 .../mydspace-actions.module.ts                | 59 +++++++++++++++++++
 src/app/shared/shared.module.ts               | 56 +-----------------
 3 files changed, 83 insertions(+), 59 deletions(-)
 create mode 100644 src/app/shared/mydspace-actions/mydspace-actions.module.ts

diff --git a/src/app/my-dspace-page/my-dspace-search.module.ts b/src/app/my-dspace-page/my-dspace-search.module.ts
index a0fa76fafa..1ce39991b3 100644
--- a/src/app/my-dspace-page/my-dspace-search.module.ts
+++ b/src/app/my-dspace-page/my-dspace-search.module.ts
@@ -17,9 +17,16 @@ import { PoolSearchResultDetailElementComponent } from '../shared/object-detail/
 import { ClaimedApprovedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component';
 import { ClaimedDeclinedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component';
 import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
+import { ItemSubmitterComponent } from '../shared/object-collection/shared/mydspace-item-submitter/item-submitter.component';
+import { ItemDetailPreviewComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component';
+import { ItemDetailPreviewFieldComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
+import { ItemListPreviewComponent } from '../shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component';
+import { ThemedItemListPreviewComponent } from '../shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
+import { MyDSpaceItemStatusComponent } from '../shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component';
+import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
+import { MyDSpaceActionsModule } from '../shared/mydspace-actions/mydspace-actions.module';
 
 const ENTRY_COMPONENTS = [
-  // put only entry components that use custom decorator
   WorkspaceItemSearchResultListElementComponent,
   WorkflowItemSearchResultListElementComponent,
   ClaimedSearchResultListElementComponent,
@@ -31,7 +38,17 @@ const ENTRY_COMPONENTS = [
   WorkflowItemSearchResultDetailElementComponent,
   ClaimedTaskSearchResultDetailElementComponent,
   PoolSearchResultDetailElementComponent,
-  ItemSearchResultListElementSubmissionComponent
+  ItemSearchResultListElementSubmissionComponent,
+];
+
+const DECLARATIONS = [
+  ...ENTRY_COMPONENTS,
+  ItemSubmitterComponent,
+  ItemDetailPreviewComponent,
+  ItemDetailPreviewFieldComponent,
+  ItemListPreviewComponent,
+  ThemedItemListPreviewComponent,
+  MyDSpaceItemStatusComponent,
 ];
 
 @NgModule({
@@ -39,10 +56,12 @@ const ENTRY_COMPONENTS = [
     CommonModule,
     SharedModule,
     MyDspacePageRoutingModule,
-    ResearchEntitiesModule.withEntryComponents()
+    MyDSpaceActionsModule,
+    ResearchEntitiesModule.withEntryComponents(),
+    JournalEntitiesModule.withEntryComponents(),
   ],
   declarations: [
-    ...ENTRY_COMPONENTS
+    ...DECLARATIONS,
   ]
 })
 
diff --git a/src/app/shared/mydspace-actions/mydspace-actions.module.ts b/src/app/shared/mydspace-actions/mydspace-actions.module.ts
new file mode 100644
index 0000000000..68e3a8fb58
--- /dev/null
+++ b/src/app/shared/mydspace-actions/mydspace-actions.module.ts
@@ -0,0 +1,59 @@
+/**
+ * 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 { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '../shared.module';
+import { ClaimedTaskActionsApproveComponent } from './claimed-task/approve/claimed-task-actions-approve.component';
+import { ClaimedTaskActionsRejectComponent } from './claimed-task/reject/claimed-task-actions-reject.component';
+import { ClaimedTaskActionsReturnToPoolComponent } from './claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component';
+import { ClaimedTaskActionsEditMetadataComponent } from './claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component';
+import { ClaimedTaskActionsComponent } from './claimed-task/claimed-task-actions.component';
+import { ClaimedTaskActionsLoaderComponent } from './claimed-task/switcher/claimed-task-actions-loader.component';
+import { ItemActionsComponent } from './item/item-actions.component';
+import { PoolTaskActionsComponent } from './pool-task/pool-task-actions.component';
+import { WorkflowitemActionsComponent } from './workflowitem/workflowitem-actions.component';
+import { WorkspaceitemActionsComponent } from './workspaceitem/workspaceitem-actions.component';
+
+const ENTRY_COMPONENTS = [
+  ClaimedTaskActionsApproveComponent,
+  ClaimedTaskActionsRejectComponent,
+  ClaimedTaskActionsReturnToPoolComponent,
+  ClaimedTaskActionsEditMetadataComponent,
+];
+
+const DECLARATIONS = [
+  ...ENTRY_COMPONENTS,
+  ClaimedTaskActionsComponent,
+  ClaimedTaskActionsLoaderComponent,
+  ItemActionsComponent,
+  PoolTaskActionsComponent,
+  WorkflowitemActionsComponent,
+  WorkspaceitemActionsComponent,
+];
+
+/**
+ * This module contains Item actions used in MyDSpace
+ */
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+  ],
+  declarations: [
+    ...DECLARATIONS,
+  ],
+  providers: [
+    ...ENTRY_COMPONENTS,
+  ],
+  exports: [
+    ...DECLARATIONS,
+  ],
+})
+export class MyDSpaceActionsModule {
+
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 2e078914e2..fe72121341 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -76,25 +76,7 @@ import { AlertComponent } from './alert/alert.component';
 import {
   SearchResultDetailElementComponent
 } from './object-detail/my-dspace-result-detail-element/search-result-detail-element.component';
-import { ClaimedTaskActionsComponent } from './mydspace-actions/claimed-task/claimed-task-actions.component';
-import { PoolTaskActionsComponent } from './mydspace-actions/pool-task/pool-task-actions.component';
 import { ObjectDetailComponent } from './object-detail/object-detail.component';
-import {
-  ItemDetailPreviewComponent
-} from './object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component';
-import {
-  MyDSpaceItemStatusComponent
-} from './object-collection/shared/mydspace-item-status/my-dspace-item-status.component';
-import { WorkspaceitemActionsComponent } from './mydspace-actions/workspaceitem/workspaceitem-actions.component';
-import { WorkflowitemActionsComponent } from './mydspace-actions/workflowitem/workflowitem-actions.component';
-import { ItemSubmitterComponent } from './object-collection/shared/mydspace-item-submitter/item-submitter.component';
-import { ItemActionsComponent } from './mydspace-actions/item/item-actions.component';
-import {
-  ClaimedTaskActionsApproveComponent
-} from './mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component';
-import {
-  ClaimedTaskActionsRejectComponent
-} from './mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component';
 import { ObjNgFor } from './utils/object-ngfor.pipe';
 import { BrowseByComponent } from './browse-by/browse-by.component';
 import {
@@ -164,21 +146,8 @@ import {
 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';
-import {
-  MetadataFieldWrapperComponent
-} from '../item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component';
-import { MetadataValuesComponent } from '../item-page/field-components/metadata-values/metadata-values.component';
 import { RoleDirective } from './roles/role.directive';
 import { UserMenuComponent } from './auth-nav-menu/user-menu/user-menu.component';
-import {
-  ClaimedTaskActionsReturnToPoolComponent
-} from './mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component';
-import {
-  ItemDetailPreviewFieldComponent
-} from './object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
 import {
   CollectionSearchResultGridElementComponent
 } from './object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
@@ -236,13 +205,7 @@ import { FileValueAccessorDirective } from './utils/file-value-accessor.directiv
 import {
   ModifyItemOverviewComponent
 } from '../item-page/edit-item-page/modify-item-overview/modify-item-overview.component';
-import {
-  ClaimedTaskActionsLoaderComponent
-} from './mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component';
 import { ClaimedTaskActionsDirective } from './mydspace-actions/claimed-task/switcher/claimed-task-actions.directive';
-import {
-  ClaimedTaskActionsEditMetadataComponent
-} from './mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component';
 import { ImpersonateNavbarComponent } from './impersonate-navbar/impersonate-navbar.component';
 import { NgForTrackByIdDirective } from './ng-for-track-by-id.directive';
 import { FileDownloadLinkComponent } from './file-download-link/file-download-link.component';
@@ -277,7 +240,6 @@ import { ThemedSearchNavbarComponent } from '../search-navbar/themed-search-navb
 import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/scope-selector-modal.component';
 import { DsSelectComponent } from './ds-select/ds-select.component';
 import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component';
-import { ThemedItemListPreviewComponent } from './object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
 import { RSSComponent } from './rss-feed/rss.component';
 import { LogInOrcidComponent } from './log-in/methods/orcid/log-in-orcid.component';
 import { BrowserOnlyPipe } from './utils/browser-only.pipe';
@@ -289,6 +251,7 @@ import {
 import { MarkdownPipe } from './utils/markdown.pipe';
 import { GoogleRecaptchaModule } from '../core/google-recaptcha/google-recaptcha.module';
 import { MenuModule } from './menu/menu.module';
+import { MetadataFieldWrapperComponent } from './metadata-field-wrapper/metadata-field-wrapper.component';
 
 const MODULES = [
   CommonModule,
@@ -362,18 +325,6 @@ const COMPONENTS = [
   SidebarFilterComponent,
   SidebarFilterSelectedOptionComponent,
   ThumbnailComponent,
-  ItemListPreviewComponent,
-  ThemedItemListPreviewComponent,
-  MyDSpaceItemStatusComponent,
-  ItemSubmitterComponent,
-  ItemDetailPreviewComponent,
-  ItemDetailPreviewFieldComponent,
-  ClaimedTaskActionsComponent,
-  ClaimedTaskActionsLoaderComponent,
-  ItemActionsComponent,
-  PoolTaskActionsComponent,
-  WorkflowitemActionsComponent,
-  WorkspaceitemActionsComponent,
   ViewModeSwitchComponent,
   TruncatableComponent,
   TruncatablePartComponent,
@@ -451,11 +402,6 @@ const ENTRY_COMPONENTS = [
   LogInShibbolethComponent,
   LogInOidcComponent,
   LogInOrcidComponent,
-  BundleListElementComponent,
-  ClaimedTaskActionsApproveComponent,
-  ClaimedTaskActionsRejectComponent,
-  ClaimedTaskActionsReturnToPoolComponent,
-  ClaimedTaskActionsEditMetadataComponent,
   CollectionDropdownComponent,
   FileDownloadLinkComponent,
   CurationFormComponent,

From 67616a5d524883022b32545bfdc1ff830e8aecb2 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Tue, 3 Jan 2023 17:03:46 +0100
Subject: [PATCH 080/160] 96252: Remove unused sidebar filter components

---
 src/app/app.reducer.ts                        |   6 -
 src/app/search-page/search-page.module.ts     |   2 -
 src/app/shared/shared.module.ts               |   4 -
 ...ebar-filter-selected-option.component.html |   6 -
 ...ebar-filter-selected-option.component.scss |  11 --
 ...idebar-filter-selected-option.component.ts |  15 ---
 .../sidebar/filter/sidebar-filter.actions.ts  |  73 ------------
 .../filter/sidebar-filter.component.html      |  26 -----
 .../filter/sidebar-filter.component.scss      |  12 --
 .../filter/sidebar-filter.component.ts        |  89 ---------------
 .../sidebar/filter/sidebar-filter.reducer.ts  |  70 ------------
 .../filter/sidebar-filter.service.spec.ts     | 107 ------------------
 .../sidebar/filter/sidebar-filter.service.ts  |  90 ---------------
 13 files changed, 511 deletions(-)
 delete mode 100644 src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.html
 delete mode 100644 src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.scss
 delete mode 100644 src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.ts
 delete mode 100644 src/app/shared/sidebar/filter/sidebar-filter.actions.ts
 delete mode 100644 src/app/shared/sidebar/filter/sidebar-filter.component.html
 delete mode 100644 src/app/shared/sidebar/filter/sidebar-filter.component.scss
 delete mode 100644 src/app/shared/sidebar/filter/sidebar-filter.component.ts
 delete mode 100644 src/app/shared/sidebar/filter/sidebar-filter.reducer.ts
 delete mode 100644 src/app/shared/sidebar/filter/sidebar-filter.service.spec.ts
 delete mode 100644 src/app/shared/sidebar/filter/sidebar-filter.service.ts

diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts
index 1d6e86463d..32438b46ab 100644
--- a/src/app/app.reducer.ts
+++ b/src/app/app.reducer.ts
@@ -42,10 +42,6 @@ import {
   filterReducer,
   SearchFiltersState
 } from './shared/search/search-filters/search-filter/search-filter.reducer';
-import {
-  sidebarFilterReducer,
-  SidebarFiltersState
-} from './shared/sidebar/filter/sidebar-filter.reducer';
 import { sidebarReducer, SidebarState } from './shared/sidebar/sidebar.reducer';
 import { truncatableReducer, TruncatablesState } from './shared/truncatable/truncatable.reducer';
 import { ThemeState, themeReducer } from './shared/theme-support/theme.reducer';
@@ -59,7 +55,6 @@ export interface AppState {
   metadataRegistry: MetadataRegistryState;
   notifications: NotificationsState;
   sidebar: SidebarState;
-  sidebarFilter: SidebarFiltersState;
   searchFilter: SearchFiltersState;
   truncatable: TruncatablesState;
   cssVariables: CSSVariablesState;
@@ -81,7 +76,6 @@ export const appReducers: ActionReducerMap<AppState> = {
   metadataRegistry: metadataRegistryReducer,
   notifications: notificationsReducer,
   sidebar: sidebarReducer,
-  sidebarFilter: sidebarFilterReducer,
   searchFilter: filterReducer,
   truncatable: truncatableReducer,
   cssVariables: cssVariablesReducer,
diff --git a/src/app/search-page/search-page.module.ts b/src/app/search-page/search-page.module.ts
index 758eca15c0..19fd9bd309 100644
--- a/src/app/search-page/search-page.module.ts
+++ b/src/app/search-page/search-page.module.ts
@@ -7,7 +7,6 @@ import { ConfigurationSearchPageGuard } from './configuration-search-page.guard'
 import { SearchTrackerComponent } from './search-tracker.component';
 import { StatisticsModule } from '../statistics/statistics.module';
 import { SearchPageComponent } from './search-page.component';
-import { SidebarFilterService } from '../shared/sidebar/filter/sidebar-filter.service';
 import { SearchFilterService } from '../core/shared/search/search-filter.service';
 import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
 import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
@@ -34,7 +33,6 @@ const components = [
   declarations: components,
   providers: [
     SidebarService,
-    SidebarFilterService,
     SearchFilterService,
     ConfigurationSearchPageGuard,
     SearchConfigurationService
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index fe72121341..50c41c82e6 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -186,8 +186,6 @@ import {
 } from './object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
 import { PageWithSidebarComponent } from './sidebar/page-with-sidebar.component';
 import { SidebarDropdownComponent } from './sidebar/sidebar-dropdown.component';
-import { SidebarFilterComponent } from './sidebar/filter/sidebar-filter.component';
-import { SidebarFilterSelectedOptionComponent } from './sidebar/filter/sidebar-filter-selected-option.component';
 import {
   SelectableListItemControlComponent
 } from './object-collection/shared/selectable-list-item-control/selectable-list-item-control.component';
@@ -322,8 +320,6 @@ const COMPONENTS = [
   SearchFormComponent,
   PageWithSidebarComponent,
   SidebarDropdownComponent,
-  SidebarFilterComponent,
-  SidebarFilterSelectedOptionComponent,
   ThumbnailComponent,
   ViewModeSwitchComponent,
   TruncatableComponent,
diff --git a/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.html b/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.html
deleted file mode 100644
index bbe0b93566..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<a class="d-flex flex-row" (click)="click.emit($event)">
-  <label>
-    <input type="checkbox" [checked]="true" class="my-1 align-self-stretch"/>
-    <span class="filter-value pl-1 text-capitalize">{{label}}</span>
-  </label>
-</a>
diff --git a/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.scss b/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.scss
deleted file mode 100644
index 30ab8912d3..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-a {
-  color: var(--bs-body-color);
-
-  &:hover, &focus {
-    text-decoration: none;
-  }
-
-  span.badge {
-    vertical-align: text-top;
-  }
-}
diff --git a/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.ts b/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.ts
deleted file mode 100644
index 4f1d2415ae..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-
-@Component({
-  selector: 'ds-sidebar-filter-selected-option',
-  styleUrls: ['./sidebar-filter-selected-option.component.scss'],
-  templateUrl: './sidebar-filter-selected-option.component.html',
-})
-
-/**
- * Represents a single selected option in a sidebar filter
- */
-export class SidebarFilterSelectedOptionComponent {
-  @Input() label: string;
-  @Output() click: EventEmitter<any> = new EventEmitter<any>();
-}
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.actions.ts b/src/app/shared/sidebar/filter/sidebar-filter.actions.ts
deleted file mode 100644
index 5dab677c5c..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter.actions.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/* eslint-disable max-classes-per-file */
-import { Action } from '@ngrx/store';
-
-import { type } from '../../ngrx/type';
-
-/**
- * For each action type in an action group, make a simple
- * enum object for all of this group's action types.
- *
- * The 'type' utility function coerces strings into string
- * literal types and runs a simple check to guarantee all
- * action types in the application are unique.
- */
-export const SidebarFilterActionTypes = {
-  INITIALIZE: type('dspace/sidebar-filter/INITIALIZE'),
-  COLLAPSE: type('dspace/sidebar-filter/COLLAPSE'),
-  EXPAND: type('dspace/sidebar-filter/EXPAND'),
-  TOGGLE: type('dspace/sidebar-filter/TOGGLE'),
-};
-
-export class SidebarFilterAction implements Action {
-  /**
-   * Name of the filter the action is performed on, used to identify the filter
-   */
-  filterName: string;
-
-  /**
-   * Type of action that will be performed
-   */
-  type;
-
-  /**
-   * Initialize with the filter's name
-   * @param {string} name of the filter
-   */
-  constructor(name: string) {
-    this.filterName = name;
-  }
-}
-
-/**
- * Used to initialize a filter
- */
-export class FilterInitializeAction extends SidebarFilterAction {
-  type = SidebarFilterActionTypes.INITIALIZE;
-  initiallyExpanded;
-
-  constructor(name: string, initiallyExpanded: boolean) {
-    super(name);
-    this.initiallyExpanded = initiallyExpanded;
-  }
-}
-
-/**
- * Used to collapse a filter
- */
-export class FilterCollapseAction extends SidebarFilterAction {
-  type = SidebarFilterActionTypes.COLLAPSE;
-}
-
-/**
- * Used to expand a filter
- */
-export class FilterExpandAction extends SidebarFilterAction {
-  type = SidebarFilterActionTypes.EXPAND;
-}
-
-/**
- * Used to collapse a filter when it's expanded and expand it when it's collapsed
- */
-export class FilterToggleAction extends SidebarFilterAction {
-  type = SidebarFilterActionTypes.TOGGLE;
-}
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.component.html b/src/app/shared/sidebar/filter/sidebar-filter.component.html
deleted file mode 100644
index 79afaa7583..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter.component.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="facet-filter d-block mb-3 p-3">
-  <div (click)="toggle()" class="filter-name" [attr.data-test]="'filter-toggle' | dsBrowserOnly">
-    <h5 class="d-inline-block mb-0">
-      {{ label | translate }}
-    </h5>
-    <span class="filter-toggle fas float-right"
-          [ngClass]="(collapsed$ | async) ? 'fa-plus' : 'fa-minus'">
-    </span>
-  </div>
-  <div [@slide]="(collapsed$ | async) ? 'collapsed' : 'expanded'"
-       (@slide.start)="startSlide($event)" (@slide.done)="finishSlide($event)"
-       class="sidebar-filter-wrapper" [ngClass]="{'closed' : closed}">
-    <div>
-      <div class="filters py-2">
-        <ng-template *ngIf="!singleValue">
-          <ds-sidebar-filter-selected-option
-            *ngFor="let value of (selectedValues | async)"
-            [label]="value"
-            (click)="removeValue.emit(value)">
-          </ds-sidebar-filter-selected-option>
-        </ng-template>
-      </div>
-      <ng-content></ng-content>
-    </div>
-  </div>
-</div>
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.component.scss b/src/app/shared/sidebar/filter/sidebar-filter.component.scss
deleted file mode 100644
index bf7a089cb1..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter.component.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-:host .facet-filter {
-  border: 1px solid var(--bs-light);
-  cursor: pointer;
-
-  .sidebar-filter-wrapper.closed {
-    overflow: hidden;
-  }
-
-  .filter-toggle {
-    line-height: var(--bs-line-height-base);
-  }
-}
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.component.ts b/src/app/shared/sidebar/filter/sidebar-filter.component.ts
deleted file mode 100644
index 5a019d41df..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter.component.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { Observable } from 'rxjs';
-import { SidebarFilterService } from './sidebar-filter.service';
-import { slide } from '../../animations/slide';
-
-@Component({
-  selector: 'ds-sidebar-filter',
-  styleUrls: ['./sidebar-filter.component.scss'],
-  templateUrl: './sidebar-filter.component.html',
-  animations: [slide],
-})
-/**
- * This components renders a sidebar filter including the label and the selected values.
- * The filter input itself should still be provided in the content.
- */
-export class SidebarFilterComponent implements OnInit {
-
-  @Input() name: string;
-  @Input() type: string;
-  @Input() label: string;
-  @Input() expanded = true;
-  @Input() singleValue = false;
-  @Input() selectedValues: Observable<string[]>;
-  @Output() removeValue: EventEmitter<any> = new EventEmitter<any>();
-
-  /**
-   * True when the filter is 100% collapsed in the UI
-   */
-  closed = true;
-
-  /**
-   * Emits true when the filter is currently collapsed in the store
-   */
-  collapsed$: Observable<boolean>;
-
-  constructor(
-    protected filterService: SidebarFilterService,
-  ) {
-  }
-
-  /**
-   *  Changes the state for this filter to collapsed when it's expanded and to expanded it when it's collapsed
-   */
-  toggle() {
-    this.filterService.toggle(this.name);
-  }
-
-  /**
-   * Method to change this.collapsed to false when the slide animation ends and is sliding open
-   * @param event The animation event
-   */
-  finishSlide(event: any): void {
-    if (event.fromState === 'collapsed') {
-      this.closed = false;
-    }
-  }
-
-  /**
-   * Method to change this.collapsed to true when the slide animation starts and is sliding closed
-   * @param event The animation event
-   */
-  startSlide(event: any): void {
-    if (event.toState === 'collapsed') {
-      this.closed = true;
-    }
-  }
-
-  ngOnInit(): void {
-    this.closed = !this.expanded;
-    this.initializeFilter();
-    this.collapsed$ = this.isCollapsed();
-  }
-
-  /**
-   *  Sets the initial state of the filter
-   */
-  initializeFilter() {
-    this.filterService.initializeFilter(this.name, this.expanded);
-  }
-
-  /**
-   * Checks if the filter is currently collapsed
-   * @returns {Observable<boolean>} Emits true when the current state of the filter is collapsed, false when it's expanded
-   */
-  private isCollapsed(): Observable<boolean> {
-    return this.filterService.isCollapsed(this.name);
-  }
-
-}
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.reducer.ts b/src/app/shared/sidebar/filter/sidebar-filter.reducer.ts
deleted file mode 100644
index b7784dd12b..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter.reducer.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import {
-  FilterInitializeAction,
-  SidebarFilterAction,
-  SidebarFilterActionTypes
-} from './sidebar-filter.actions';
-
-/**
- * Interface that represents the state for a single filters
- */
-export interface SidebarFilterState {
-  filterCollapsed: boolean;
-}
-
-/**
- * Interface that represents the state for all available filters
- */
-export interface SidebarFiltersState {
-  [name: string]: SidebarFilterState;
-}
-
-const initialState: SidebarFiltersState = Object.create(null);
-
-/**
- * Performs a  filter action on the current state
- * @param {SidebarFiltersState} state The state before the action is performed
- * @param {SidebarFilterAction} action The action that should be performed
- * @returns {SidebarFiltersState} The state after the action is performed
- */
-export function sidebarFilterReducer(state = initialState, action: SidebarFilterAction): SidebarFiltersState {
-
-  switch (action.type) {
-
-    case SidebarFilterActionTypes.INITIALIZE: {
-      const initAction = (action as FilterInitializeAction);
-      return Object.assign({}, state, {
-        [action.filterName]: {
-          filterCollapsed: !initAction.initiallyExpanded,
-        }
-      });
-    }
-
-    case SidebarFilterActionTypes.COLLAPSE: {
-      return Object.assign({}, state, {
-        [action.filterName]: {
-          filterCollapsed: true,
-        }
-      });
-    }
-
-    case SidebarFilterActionTypes.EXPAND: {
-      return Object.assign({}, state, {
-        [action.filterName]: {
-          filterCollapsed: false,
-        }
-      });
-    }
-
-    case SidebarFilterActionTypes.TOGGLE: {
-      return Object.assign({}, state, {
-        [action.filterName]: {
-          filterCollapsed: !state[action.filterName].filterCollapsed,
-        }
-      });
-    }
-
-    default: {
-      return state;
-    }
-  }
-}
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.service.spec.ts b/src/app/shared/sidebar/filter/sidebar-filter.service.spec.ts
deleted file mode 100644
index 49192a2006..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter.service.spec.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { Store, StoreModule } from '@ngrx/store';
-import { provideMockStore } from '@ngrx/store/testing';
-import { cold } from 'jasmine-marbles';
-
-import { sidebarFilterReducer } from './sidebar-filter.reducer';
-import { SidebarFilterService } from './sidebar-filter.service';
-import {
-  FilterCollapseAction,
-  FilterExpandAction,
-  FilterInitializeAction,
-  FilterToggleAction
-} from './sidebar-filter.actions';
-import { storeModuleConfig } from '../../../app.reducer';
-
-describe('SidebarFilterService', () => {
-  let service: SidebarFilterService;
-  let store: any;
-  let initialState;
-
-  function init() {
-
-    initialState = {
-      sidebarFilter: {
-        filter_1: {
-          filterCollapsed: true
-        },
-        filter_2: {
-          filterCollapsed: false
-        },
-        filter_3: {
-          filterCollapsed: true
-        }
-      }
-    };
-
-  }
-
-  beforeEach(waitForAsync(() => {
-    init();
-    TestBed.configureTestingModule({
-      imports: [
-        StoreModule.forRoot({ sidebarFilter: sidebarFilterReducer }, storeModuleConfig)
-      ],
-      providers: [
-        provideMockStore({ initialState }),
-        { provide: SidebarFilterService, useValue: service }
-      ]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    store = TestBed.inject(Store);
-    service = new SidebarFilterService(store);
-    spyOn(store, 'dispatch');
-  });
-
-  describe('initializeFilter', () => {
-    it('should dispatch an FilterInitializeAction with the correct arguments', () => {
-      service.initializeFilter('fakeFilter', true);
-      expect(store.dispatch).toHaveBeenCalledWith(new FilterInitializeAction('fakeFilter', true));
-    });
-  });
-
-  describe('collapse', () => {
-    it('should dispatch an FilterInitializeAction with the correct arguments', () => {
-      service.collapse('fakeFilter');
-      expect(store.dispatch).toHaveBeenCalledWith(new FilterCollapseAction('fakeFilter'));
-    });
-  });
-
-  describe('expand', () => {
-    it('should dispatch an FilterInitializeAction with the correct arguments', () => {
-      service.expand('fakeFilter');
-      expect(store.dispatch).toHaveBeenCalledWith(new FilterExpandAction('fakeFilter'));
-    });
-  });
-
-  describe('toggle', () => {
-    it('should dispatch an FilterInitializeAction with the correct arguments', () => {
-      service.toggle('fakeFilter');
-      expect(store.dispatch).toHaveBeenCalledWith(new FilterToggleAction('fakeFilter'));
-    });
-  });
-
-  describe('isCollapsed', () => {
-    it('should return true', () => {
-
-      const result = service.isCollapsed('filter_1');
-      const expected = cold('b', {
-        b: true
-      });
-
-      expect(result).toBeObservable(expected);
-    });
-
-    it('should return false', () => {
-
-      const result = service.isCollapsed('filter_2');
-      const expected = cold('b', {
-        b: false
-      });
-
-      expect(result).toBeObservable(expected);
-    });
-  });
-});
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.service.ts b/src/app/shared/sidebar/filter/sidebar-filter.service.ts
deleted file mode 100644
index b67de24f9e..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter.service.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { Injectable } from '@angular/core';
-import {
-  FilterCollapseAction,
-  FilterExpandAction, FilterInitializeAction,
-  FilterToggleAction
-} from './sidebar-filter.actions';
-import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
-import { SidebarFiltersState, SidebarFilterState } from './sidebar-filter.reducer';
-import { Observable } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
-import { hasValue } from '../../empty.util';
-
-/**
- * Service that performs all actions that have to do with sidebar filters like collapsing or expanding them.
- */
-@Injectable()
-export class SidebarFilterService {
-
-  constructor(private store: Store<SidebarFiltersState>) {
-  }
-
-  /**
-   * Dispatches an initialize action to the store for a given filter
-   * @param {string} filter The filter for which the action is dispatched
-   * @param {boolean} expanded If the filter should be open from the start
-   */
-  public initializeFilter(filter: string, expanded: boolean): void {
-    this.store.dispatch(new FilterInitializeAction(filter, expanded));
-  }
-
-  /**
-   * Dispatches a collapse action to the store for a given filter
-   * @param {string} filterName The filter for which the action is dispatched
-   */
-  public collapse(filterName: string): void {
-    this.store.dispatch(new FilterCollapseAction(filterName));
-  }
-
-  /**
-   * Dispatches an expand action to the store for a given filter
-   * @param {string} filterName The filter for which the action is dispatched
-   */
-  public expand(filterName: string): void {
-    this.store.dispatch(new FilterExpandAction(filterName));
-  }
-
-  /**
-   * Dispatches a toggle action to the store for a given filter
-   * @param {string} filterName The filter for which the action is dispatched
-   */
-  public toggle(filterName: string): void {
-    this.store.dispatch(new FilterToggleAction(filterName));
-  }
-
-  /**
-   * Checks if the state of a given filter is currently collapsed or not
-   * @param {string} filterName The filtername for which the collapsed state is checked
-   * @returns {Observable<boolean>} Emits the current collapsed state of the given filter, if it's unavailable, return false
-   */
-  isCollapsed(filterName: string): Observable<boolean> {
-    return this.store.pipe(
-      select(filterByNameSelector(filterName)),
-      map((object: SidebarFilterState) => {
-        if (object) {
-          return object.filterCollapsed;
-        } else {
-          return false;
-        }
-      }),
-      distinctUntilChanged()
-    );
-  }
-
-}
-
-const filterStateSelector = (state: SidebarFiltersState) => state.sidebarFilter;
-
-function filterByNameSelector(name: string): MemoizedSelector<SidebarFiltersState, SidebarFilterState> {
-  return keySelector<SidebarFilterState>(name);
-}
-
-export function keySelector<T>(key: string): MemoizedSelector<SidebarFiltersState, T> {
-  return createSelector(filterStateSelector, (state: SidebarFilterState) => {
-    if (hasValue(state)) {
-      return state[key];
-    } else {
-      return undefined;
-    }
-  });
-}

From f6db75f4f8d442940655b1ccf58c0829152918ac Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Tue, 3 Jan 2023 17:05:36 +0100
Subject: [PATCH 081/160] 96252: Remove unneeded imports from SharedModule

These are no longer required in SharedModule, so we can remove them from main.js
---
 .../community-list-page/community-list-page.module.ts |  5 ++++-
 src/app/shared/form/form.module.ts                    |  5 +++++
 src/app/shared/search/search.module.ts                |  4 +++-
 src/app/shared/shared.module.ts                       | 11 -----------
 src/themes/custom/eager-theme.module.ts               |  5 +----
 src/themes/dspace/eager-theme.module.ts               |  2 --
 6 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/app/community-list-page/community-list-page.module.ts b/src/app/community-list-page/community-list-page.module.ts
index 18c28068be..15946b2e89 100644
--- a/src/app/community-list-page/community-list-page.module.ts
+++ b/src/app/community-list-page/community-list-page.module.ts
@@ -6,6 +6,7 @@ import { CommunityListPageRoutingModule } from './community-list-page.routing.mo
 import { CommunityListComponent } from './community-list/community-list.component';
 import { ThemedCommunityListPageComponent } from './themed-community-list-page.component';
 import { ThemedCommunityListComponent } from './community-list/themed-community-list.component';
+import { CdkTreeModule } from '@angular/cdk/tree';
 
 
 const DECLARATIONS = [
@@ -21,13 +22,15 @@ const DECLARATIONS = [
   imports: [
     CommonModule,
     SharedModule,
-    CommunityListPageRoutingModule
+    CommunityListPageRoutingModule,
+    CdkTreeModule,
   ],
   declarations: [
     ...DECLARATIONS
   ],
   exports: [
     ...DECLARATIONS,
+    CdkTreeModule,
   ],
 })
 export class CommunityListPageModule {
diff --git a/src/app/shared/form/form.module.ts b/src/app/shared/form/form.module.ts
index 598cc2d32c..b30b6c8306 100644
--- a/src/app/shared/form/form.module.ts
+++ b/src/app/shared/form/form.module.ts
@@ -37,6 +37,8 @@ import { FormBuilderService } from './builder/form-builder.service';
 import { DsDynamicTypeBindRelationService } from './builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service';
 import { FormService } from './form.service';
 import { NgxMaskModule } from 'ngx-mask';
+import { NgbDatepickerModule, NgbTimepickerModule } from '@ng-bootstrap/ng-bootstrap';
+import { CdkTreeModule } from '@angular/cdk/tree';
 
 const COMPONENTS = [
   CustomSwitchComponent,
@@ -84,6 +86,9 @@ const DIRECTIVES = [
     TranslateModule,
     SortablejsModule,
     NgxMaskModule.forRoot(),
+    NgbDatepickerModule,
+    NgbTimepickerModule,
+    CdkTreeModule,
   ],
   exports: [
     ...COMPONENTS,
diff --git a/src/app/shared/search/search.module.ts b/src/app/shared/search/search.module.ts
index 426ed82aef..713b9925a6 100644
--- a/src/app/shared/search/search.module.ts
+++ b/src/app/shared/search/search.module.ts
@@ -31,6 +31,7 @@ import { SearchComponent } from './search.component';
 import { ThemedSearchComponent } from './themed-search.component';
 import { ThemedSearchResultsComponent } from './search-results/themed-search-results.component';
 import { ThemedSearchSettingsComponent } from './search-settings/themed-search-settings.component';
+import { NouisliderModule } from 'ng2-nouislider';
 
 const COMPONENTS = [
   SearchComponent,
@@ -91,7 +92,8 @@ export const MODELS = [
       missingTranslationHandler: { provide: MissingTranslationHandler, useClass: MissingTranslationHelper },
       useDefaultLang: true
     }),
-    SharedModule.withEntryComponents()
+    SharedModule.withEntryComponents(),
+    NouisliderModule,
   ],
   exports: [
     ...COMPONENTS
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 50c41c82e6..b7479cd0b8 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -2,21 +2,15 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { CdkTreeModule } from '@angular/cdk/tree';
 import { DragDropModule } from '@angular/cdk/drag-drop';
-
-import { NouisliderModule } from 'ng2-nouislider';
 import {
-  NgbDatepickerModule,
   NgbDropdownModule,
   NgbNavModule,
   NgbPaginationModule,
-  NgbTimepickerModule,
   NgbTooltipModule,
   NgbTypeaheadModule,
 } from '@ng-bootstrap/ng-bootstrap';
 import { MissingTranslationHandler, TranslateModule } from '@ngx-translate/core';
-import { NgxPaginationModule } from 'ngx-pagination';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import { MomentModule } from 'ngx-moment';
 import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component';
@@ -256,19 +250,14 @@ const MODULES = [
   FormsModule,
   InfiniteScrollModule,
   NgbNavModule,
-  NgbDatepickerModule,
-  NgbTimepickerModule,
   NgbTypeaheadModule,
-  NgxPaginationModule,
   NgbPaginationModule,
   NgbDropdownModule,
   NgbTooltipModule,
   ReactiveFormsModule,
   RouterModule,
-  NouisliderModule,
   MomentModule,
   DragDropModule,
-  CdkTreeModule,
   GoogleRecaptchaModule,
   MenuModule,
 ];
diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts
index 4e3c6f8b46..7637ffdb80 100644
--- a/src/themes/custom/eager-theme.module.ts
+++ b/src/themes/custom/eager-theme.module.ts
@@ -7,7 +7,6 @@ import { NavbarComponent } from './app/navbar/navbar.component';
 import { SearchNavbarComponent } from './app/search-navbar/search-navbar.component';
 import { HeaderComponent } from './app/header/header.component';
 import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-navbar-wrapper.component';
-import { SearchModule } from '../../app/shared/search/search.module';
 import { RootModule } from '../../app/root.module';
 import { NavbarModule } from '../../app/navbar/navbar.module';
 import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component';
@@ -42,7 +41,7 @@ import {
 } from './app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
 
 import { CommunityListElementComponent } from './app/shared/object-list/community-list-element/community-list-element.component';
-import { CollectionListElementComponent} from './app/shared/object-list/collection-list-element/collection-list-element.component';
+import { CollectionListElementComponent } from './app/shared/object-list/collection-list-element/collection-list-element.component';
 
 
 /**
@@ -80,8 +79,6 @@ const DECLARATIONS = [
   imports: [
     CommonModule,
     SharedModule,
-    SearchModule,
-    FormsModule,
     RootModule,
     NavbarModule,
     ItemPageModule,
diff --git a/src/themes/dspace/eager-theme.module.ts b/src/themes/dspace/eager-theme.module.ts
index 5dd114cd72..dd09f9263e 100644
--- a/src/themes/dspace/eager-theme.module.ts
+++ b/src/themes/dspace/eager-theme.module.ts
@@ -29,8 +29,6 @@ const DECLARATIONS = [
   imports: [
     CommonModule,
     SharedModule,
-    SearchModule,
-    FormsModule,
     RootModule,
     NavbarModule,
   ],

From c4de31ec4d50c137095fb738d383ee9d0cce25a0 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 4 Jan 2023 11:55:37 +0100
Subject: [PATCH 082/160] 97742: Removing old item-metadata component & adding
 support for itemtemplate dso-edit-metadata

---
 .../collection-page/collection-page.module.ts |   4 +-
 .../edit-item-template-page.component.html    |   2 +-
 .../dso-edit-metadata.component.html          |   2 +-
 .../dso-edit-metadata.component.ts            |  14 +-
 .../metadata-field-selector.component.spec.ts |  21 +-
 .../metadata-field-selector.component.ts      |  28 +-
 .../edit-item-page/edit-item-page.module.ts   |   8 -
 .../edit-in-place-field.component.html        |  71 ---
 .../edit-in-place-field.component.scss        |  13 -
 .../edit-in-place-field.component.spec.ts     | 505 ------------------
 .../edit-in-place-field.component.ts          | 201 -------
 .../item-metadata.component.html              |  69 ---
 .../item-metadata.component.scss              |  20 -
 .../item-metadata.component.spec.ts           | 290 ----------
 .../item-metadata/item-metadata.component.ts  | 135 -----
 src/assets/i18n/en.json5                      |  60 +++
 16 files changed, 114 insertions(+), 1329 deletions(-)
 delete mode 100644 src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
 delete mode 100644 src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss
 delete mode 100644 src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
 delete mode 100644 src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts
 delete mode 100644 src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html
 delete mode 100644 src/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss
 delete mode 100644 src/app/item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts
 delete mode 100644 src/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts

diff --git a/src/app/collection-page/collection-page.module.ts b/src/app/collection-page/collection-page.module.ts
index 3652823200..ff4c2cc13e 100644
--- a/src/app/collection-page/collection-page.module.ts
+++ b/src/app/collection-page/collection-page.module.ts
@@ -15,6 +15,7 @@ import { StatisticsModule } from '../statistics/statistics.module';
 import { CollectionFormModule } from './collection-form/collection-form.module';
 import { ThemedCollectionPageComponent } from './themed-collection-page.component';
 import { ComcolModule } from '../shared/comcol/comcol.module';
+import { DsoSharedModule } from '../dso-shared/dso-shared.module';
 
 @NgModule({
   imports: [
@@ -24,7 +25,8 @@ import { ComcolModule } from '../shared/comcol/comcol.module';
     StatisticsModule.forRoot(),
     EditItemPageModule,
     CollectionFormModule,
-    ComcolModule
+    ComcolModule,
+    DsoSharedModule,
   ],
   declarations: [
     CollectionPageComponent,
diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
index f8c5c92e96..7cff79cce5 100644
--- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
+++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
@@ -3,7 +3,7 @@
     <div class="col-12" *ngVar="(itemRD$ | async) as itemRD">
       <ng-container *ngIf="itemRD?.hasSucceeded">
         <h2 class="border-bottom">{{ 'collection.edit.template.head' | translate:{ collection: collection?.name } }}</h2>
-        <ds-item-metadata [updateService]="itemTemplateService" [item]="itemRD?.payload"></ds-item-metadata>
+        <ds-dso-edit-metadata [updateDataService]="itemTemplateService" [dso]="itemRD?.payload"></ds-dso-edit-metadata>
         <button [routerLink]="getCollectionEditUrl(collection)" class="btn btn-outline-secondary">{{ 'collection.edit.template.cancel' | translate }}</button>
       </ng-container>
       <ds-loading *ngIf="itemRD?.isLoading" [message]="'collection.edit.template.loading' | translate"></ds-loading>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index 71d3b34e42..51f347e163 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -58,7 +58,7 @@
     </ds-dso-edit-metadata-field-values>
   </div>
 
-  <div *ngIf="isEmpty">
+  <div *ngIf="isEmpty && !form.newValue">
     <ds-alert [content]="dsoType + '.edit.metadata.empty'" [type]="AlertTypeEnum.Info"></ds-alert>
   </div>
   <div class="button-row bottom d-inline-block w-100">
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
index 7f98720b2c..a2ceaa21d6 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -45,7 +45,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
    * Resolved update data-service for the given DSpaceObject (depending on its type, e.g. ItemDataService for an Item)
    * Used to send the PATCH request
    */
-  updateDataService: UpdateDataService<DSpaceObject>;
+  @Input() updateDataService: UpdateDataService<DSpaceObject>;
 
   /**
    * Type of the DSpaceObject in String
@@ -143,11 +143,13 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
     } else {
       type = this.dso.type;
     }
-    const provider = getDataServiceFor(type);
-    this.updateDataService = Injector.create({
-      providers: [],
-      parent: this.parentInjector
-    }).get(provider);
+    if (hasNoValue(this.updateDataService)) {
+      const provider = getDataServiceFor(type);
+      this.updateDataService = Injector.create({
+        providers: [],
+        parent: this.parentInjector
+      }).get(provider);
+    }
     this.dsoType = type.value;
   }
 
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts
index ee4738a322..e0fde0e8f2 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts
@@ -7,16 +7,18 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { RegistryService } from '../../../core/registry/registry.service';
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { By } from '@angular/platform-browser';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 
 describe('MetadataFieldSelectorComponent', () => {
   let component: MetadataFieldSelectorComponent;
   let fixture: ComponentFixture<MetadataFieldSelectorComponent>;
 
   let registryService: RegistryService;
+  let notificationsService: NotificationsService;
 
   let metadataSchema: MetadataSchema;
   let metadataFields: MetadataField[];
@@ -45,12 +47,14 @@ describe('MetadataFieldSelectorComponent', () => {
     registryService = jasmine.createSpyObj('registryService', {
       queryMetadataFields: createSuccessfulRemoteDataObject$(createPaginatedList(metadataFields)),
     });
+    notificationsService = jasmine.createSpyObj('notificationsService', ['error', 'success']);
 
     TestBed.configureTestingModule({
       declarations: [MetadataFieldSelectorComponent, VarDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
         { provide: RegistryService, useValue: registryService },
+        { provide: NotificationsService, useValue: notificationsService },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -99,5 +103,20 @@ describe('MetadataFieldSelectorComponent', () => {
         done();
       });
     });
+
+    describe('when querying the metadata fields returns an error response', () => {
+      beforeEach(() => {
+        (registryService.queryMetadataFields as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Failed'));
+      });
+
+      it('should return an observable false and show a notification', (done) => {
+        component.mdField = 'dc.description.abstract';
+        component.validate().subscribe((result) => {
+          expect(result).toBeFalse();
+          expect(notificationsService.error).toHaveBeenCalled();
+          done();
+        });
+      });
+    });
   });
 });
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
index 2bbe64b3df..066f671301 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
@@ -12,7 +12,7 @@ import {
 import { switchMap, debounceTime, distinctUntilChanged, map, tap, take } from 'rxjs/operators';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import {
-  getAllSucceededRemoteData, getFirstSucceededRemoteData,
+  getAllSucceededRemoteData, getFirstCompletedRemoteData, getFirstSucceededRemoteData,
   metadataFieldsToString
 } from '../../../core/shared/operators';
 import { Observable } from 'rxjs/internal/Observable';
@@ -21,6 +21,9 @@ import { FormControl } from '@angular/forms';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { hasValue } from '../../../shared/empty.util';
 import { Subscription } from 'rxjs/internal/Subscription';
+import { of } from 'rxjs/internal/observable/of';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'ds-metadata-field-selector',
@@ -97,7 +100,9 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    */
   subs: Subscription[] = [];
 
-  constructor(protected registryService: RegistryService) {
+  constructor(protected registryService: RegistryService,
+              protected notificationsService: NotificationsService,
+              protected translate: TranslateService) {
   }
 
   /**
@@ -148,11 +153,20 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    */
   validate(): Observable<boolean> {
     return this.registryService.queryMetadataFields(this.mdField, null, true, false, followLink('schema')).pipe(
-      getFirstSucceededRemoteData(),
-      metadataFieldsToString(),
-      take(1),
-      map((fields: string[]) => fields.indexOf(this.mdField) > -1),
-      tap((exists: boolean) => this.showInvalid = !exists),
+      getFirstCompletedRemoteData(),
+      switchMap((rd) => {
+        if (rd.hasSucceeded) {
+          return of(rd).pipe(
+            metadataFieldsToString(),
+            take(1),
+            map((fields: string[]) => fields.indexOf(this.mdField) > -1),
+            tap((exists: boolean) => this.showInvalid = !exists),
+          );
+        } else {
+          this.notificationsService.error(this.translate.instant(`${this.dsoType}.edit.metadata.metadatafield.error`), rd.errorMessage);
+          return [false];
+        }
+      }),
     );
   }
 
diff --git a/src/app/item-page/edit-item-page/edit-item-page.module.ts b/src/app/item-page/edit-item-page/edit-item-page.module.ts
index 71ab64fa33..90322f119a 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.module.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.module.ts
@@ -14,8 +14,6 @@ import { AbstractSimpleItemActionComponent } from './simple-item-action/abstract
 import { ItemPrivateComponent } from './item-private/item-private.component';
 import { ItemPublicComponent } from './item-public/item-public.component';
 import { ItemDeleteComponent } from './item-delete/item-delete.component';
-import { ItemMetadataComponent } from './item-metadata/item-metadata.component';
-import { EditInPlaceFieldComponent } from './item-metadata/edit-in-place-field/edit-in-place-field.component';
 import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component';
 import { ItemEditBitstreamComponent } from './item-bitstreams/item-edit-bitstream/item-edit-bitstream.component';
 import { SearchPageModule } from '../../search-page/search-page.module';
@@ -63,15 +61,12 @@ import { DsoSharedModule } from '../../dso-shared/dso-shared.module';
     ItemPublicComponent,
     ItemDeleteComponent,
     ItemStatusComponent,
-    ItemMetadataComponent,
     ItemRelationshipsComponent,
     ItemBitstreamsComponent,
     ItemVersionHistoryComponent,
-    EditInPlaceFieldComponent,
     ItemEditBitstreamComponent,
     ItemEditBitstreamBundleComponent,
     PaginatedDragAndDropBitstreamListComponent,
-    EditInPlaceFieldComponent,
     EditRelationshipComponent,
     EditRelationshipListComponent,
     ItemCollectionMapperComponent,
@@ -84,9 +79,6 @@ import { DsoSharedModule } from '../../dso-shared/dso-shared.module';
     BundleDataService,
     ObjectValuesPipe
   ],
-  exports: [
-    ItemMetadataComponent
-  ]
 })
 export class EditItemPageModule {
 
diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
deleted file mode 100644
index f5543af971..0000000000
--- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<td>
-    <div class="metadata-field">
-        <div *ngIf="!(editable | async)">
-            <span >{{metadata?.key?.split('.').join('.&#8203;')}}</span>
-        </div>
-        <div *ngIf="(editable | async)" class="field-container">
-            <ds-validation-suggestions [disable]="fieldUpdate.changeType != 1" [suggestions]="(metadataFieldSuggestions | async)"
-                                         [(ngModel)]="metadata.key"
-                                         [url]="this.url"
-                                         [metadata]="this.metadata"
-                                  (submitSuggestion)="update(suggestionControl)"
-                                  (clickSuggestion)="update(suggestionControl)"
-                                  (typeSuggestion)="update(suggestionControl)"
-                                  (dsClickOutside)="checkValidity(suggestionControl)"
-                                  (findSuggestions)="findMetadataFieldSuggestions($event)"
-                                  #suggestionControl="ngModel"
-                                  [valid]="(valid | async) !== false"
-                                  dsAutoFocus autoFocusSelector=".suggestion_input"
-                                  [ngModelOptions]="{standalone: true}"
-            ></ds-validation-suggestions>
-        </div>
-        <small class="text-danger"
-               *ngIf="(valid | async) === false">{{"item.edit.metadata.metadatafield.invalid" | translate}}</small>
-    </div>
-</td>
-<td class="w-100">
-    <div class="value-field">
-        <div *ngIf="!(editable | async)">
-            <span class="dont-break-out">{{metadata?.value}}</span>
-        </div>
-        <div *ngIf="(editable | async)" class="field-container">
-            <textarea class="form-control" type="textarea" attr.aria-labelledby="fieldValue" [(ngModel)]="metadata.value" [dsDebounce]
-                      (onDebounce)="update()"></textarea>
-        </div>
-    </div>
-</td>
-<td class="text-center">
-    <div class="language-field">
-        <div *ngIf="!(editable | async)">
-            <span>{{metadata?.language}}</span>
-        </div>
-        <div *ngIf="(editable | async)" class="field-container">
-            <input class="form-control" type="text" attr.aria-labelledby="fieldLang" [(ngModel)]="metadata.language" [dsDebounce]
-                   (onDebounce)="update()"/>
-        </div>
-    </div>
-</td>
-<td class="text-center">
-    <div class="btn-group edit-field">
-        <button [disabled]="!(canSetEditable() | async)" *ngIf="!(editable | async)"
-                (click)="setEditable(true)" class="btn btn-outline-primary btn-sm"
-                title="{{'item.edit.metadata.edit.buttons.edit' | translate}}">
-            <i class="fas fa-edit fa-fw"></i>
-        </button>
-        <button [disabled]="!(canSetUneditable() | async) || (valid | async) === false" *ngIf="(editable | async)"
-                (click)="setEditable(false)" class="btn btn-outline-success btn-sm"
-                title="{{'item.edit.metadata.edit.buttons.unedit' | translate}}">
-            <i class="fas fa-check fa-fw"></i>
-        </button>
-        <button [disabled]="!(canRemove() | async)" (click)="remove()"
-                class="btn btn-outline-danger btn-sm"
-                title="{{'item.edit.metadata.edit.buttons.remove' | translate}}">
-            <i class="fas fa-trash-alt fa-fw"></i>
-        </button>
-        <button [disabled]="!(canUndo() | async)" (click)="removeChangesFromField()"
-                class="btn btn-outline-warning btn-sm"
-                title="{{'item.edit.metadata.edit.buttons.undo' | translate}}">
-            <i class="fas fa-undo-alt fa-fw"></i>
-        </button>
-    </div>
-</td>
diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss
deleted file mode 100644
index a2a6786b36..0000000000
--- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-.btn[disabled] {
-    color: var(--bs-gray-600);
-    border-color: var(--bs-gray-600);
-    z-index: 0; // prevent border colors jumping on hover
-}
-
-.metadata-field {
-    width: var(--ds-edit-item-metadata-field-width);
-}
-
-.language-field {
-    width: var(--ds-edit-item-language-field-width);
-}
diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
deleted file mode 100644
index 03e8e5d720..0000000000
--- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
+++ /dev/null
@@ -1,505 +0,0 @@
-import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { FormsModule } from '@angular/forms';
-import { By } from '@angular/platform-browser';
-import { TranslateModule } from '@ngx-translate/core';
-import { getTestScheduler } from 'jasmine-marbles';
-import { of as observableOf } from 'rxjs';
-import { TestScheduler } from 'rxjs/testing';
-import { MetadataFieldDataService } from '../../../../core/data/metadata-field-data.service';
-import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
-import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { MetadataField } from '../../../../core/metadata/metadata-field.model';
-import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
-import { RegistryService } from '../../../../core/registry/registry.service';
-import { MetadatumViewModel } from '../../../../core/shared/metadata.models';
-import { InputSuggestion } from '../../../../shared/input-suggestions/input-suggestions.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { followLink } from '../../../../shared/utils/follow-link-config.model';
-import { EditInPlaceFieldComponent } from './edit-in-place-field.component';
-import { MockComponent, MockDirective } from 'ng-mocks';
-import { DebounceDirective } from '../../../../shared/utils/debounce.directive';
-import { ValidationSuggestionsComponent } from '../../../../shared/input-suggestions/validation-suggestions/validation-suggestions.component';
-
-let comp: EditInPlaceFieldComponent;
-let fixture: ComponentFixture<EditInPlaceFieldComponent>;
-let de: DebugElement;
-let el: HTMLElement;
-let metadataFieldService;
-let objectUpdatesService;
-let paginatedMetadataFields;
-const mdSchema = Object.assign(new MetadataSchema(), { prefix: 'dc' });
-const mdSchemaRD$ = createSuccessfulRemoteDataObject$(mdSchema);
-const mdField1 = Object.assign(new MetadataField(), {
-  schema: mdSchemaRD$,
-  element: 'contributor',
-  qualifier: 'author'
-});
-const mdField2 = Object.assign(new MetadataField(), {
-  schema: mdSchemaRD$,
-  element: 'title'
-});
-const mdField3 = Object.assign(new MetadataField(), {
-  schema: mdSchemaRD$,
-  element: 'description',
-  qualifier: 'abstract',
-});
-
-const metadatum = Object.assign(new MetadatumViewModel(), {
-  key: 'dc.description.abstract',
-  value: 'Example abstract',
-  language: 'en'
-});
-
-const url = 'http://test-url.com/test-url';
-const fieldUpdate = {
-  field: metadatum,
-  changeType: undefined
-};
-let scheduler: TestScheduler;
-
-describe('EditInPlaceFieldComponent', () => {
-
-  beforeEach(waitForAsync(() => {
-    scheduler = getTestScheduler();
-
-    paginatedMetadataFields = buildPaginatedList(undefined, [mdField1, mdField2, mdField3]);
-
-    metadataFieldService = jasmine.createSpyObj({
-      queryMetadataFields: createSuccessfulRemoteDataObject$(paginatedMetadataFields),
-    });
-    objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
-      {
-        saveChangeFieldUpdate: {},
-        saveRemoveFieldUpdate: {},
-        setEditableFieldUpdate: {},
-        setValidFieldUpdate: {},
-        removeSingleFieldUpdate: {},
-        isEditable: observableOf(false), // should always return something --> its in ngOnInit
-        isValid: observableOf(true) // should always return something --> its in ngOnInit
-      }
-    );
-
-    TestBed.configureTestingModule({
-      imports: [FormsModule, TranslateModule.forRoot()],
-      declarations: [
-        EditInPlaceFieldComponent,
-        MockDirective(DebounceDirective),
-        MockComponent(ValidationSuggestionsComponent)
-      ],
-      providers: [
-        { provide: RegistryService, useValue: metadataFieldService },
-        { provide: ObjectUpdatesService, useValue: objectUpdatesService },
-        { provide: MetadataFieldDataService, useValue: {} }
-      ], schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EditInPlaceFieldComponent);
-    comp = fixture.componentInstance; // EditInPlaceFieldComponent test instance
-    de = fixture.debugElement;
-    el = de.nativeElement;
-
-    comp.url = url;
-    comp.fieldUpdate = fieldUpdate;
-    comp.metadata = metadatum;
-  });
-
-  describe('update', () => {
-    beforeEach(() => {
-      comp.update();
-      fixture.detectChanges();
-    });
-
-    it('it should call saveChangeFieldUpdate on the objectUpdatesService with the correct url and metadata', () => {
-      expect(objectUpdatesService.saveChangeFieldUpdate).toHaveBeenCalledWith(url, metadatum);
-    });
-  });
-
-  describe('setEditable', () => {
-    const editable = false;
-    beforeEach(() => {
-      comp.setEditable(editable);
-      fixture.detectChanges();
-    });
-
-    it('it should call setEditableFieldUpdate on the objectUpdatesService with the correct url and uuid and false', () => {
-      expect(objectUpdatesService.setEditableFieldUpdate).toHaveBeenCalledWith(url, metadatum.uuid, editable);
-    });
-  });
-
-  describe('editable is true', () => {
-    beforeEach(() => {
-      objectUpdatesService.isEditable.and.returnValue(observableOf(true));
-      fixture.detectChanges();
-    });
-    it('the div should contain input fields or textareas', () => {
-      const inputField = de.queryAll(By.css('input'));
-      const textAreas = de.queryAll(By.css('textarea'));
-      expect(inputField.length + textAreas.length).toBeGreaterThan(0);
-    });
-  });
-
-  describe('editable is false', () => {
-    beforeEach(() => {
-      objectUpdatesService.isEditable.and.returnValue(observableOf(false));
-      fixture.detectChanges();
-    });
-    it('the div should contain no input fields or textareas', () => {
-      const inputField = de.queryAll(By.css('input'));
-      const textAreas = de.queryAll(By.css('textarea'));
-      expect(inputField.length + textAreas.length).toBe(0);
-    });
-  });
-
-  describe('isValid is true', () => {
-    beforeEach(() => {
-      objectUpdatesService.isValid.and.returnValue(observableOf(true));
-      fixture.detectChanges();
-    });
-    it('the div should not contain an error message', () => {
-      const errorMessages = de.queryAll(By.css('small.text-danger'));
-      expect(errorMessages.length).toBe(0);
-
-    });
-  });
-
-  describe('isValid is false', () => {
-    beforeEach(() => {
-      objectUpdatesService.isValid.and.returnValue(observableOf(false));
-      fixture.detectChanges();
-    });
-    it('there should be an error message', () => {
-      const errorMessages = de.queryAll(By.css('small.text-danger'));
-      expect(errorMessages.length).toBeGreaterThan(0);
-
-    });
-  });
-
-  describe('remove', () => {
-    beforeEach(() => {
-      comp.remove();
-      fixture.detectChanges();
-    });
-
-    it('it should call saveRemoveFieldUpdate on the objectUpdatesService with the correct url and metadata', () => {
-      expect(objectUpdatesService.saveRemoveFieldUpdate).toHaveBeenCalledWith(url, metadatum);
-    });
-  });
-
-  describe('removeChangesFromField', () => {
-    beforeEach(() => {
-      comp.removeChangesFromField();
-      fixture.detectChanges();
-    });
-
-    it('it should call removeChangesFromField on the objectUpdatesService with the correct url and uuid', () => {
-      expect(objectUpdatesService.removeSingleFieldUpdate).toHaveBeenCalledWith(url, metadatum.uuid);
-    });
-  });
-
-  describe('findMetadataFieldSuggestions', () => {
-    const query = 'query string';
-
-    const metadataFieldSuggestions: InputSuggestion[] =
-      [
-        {
-          displayValue: ('dc.' + mdField1.toString()).split('.').join('.&#8203;'),
-          value: ('dc.' + mdField1.toString())
-        },
-        {
-          displayValue: ('dc.' + mdField2.toString()).split('.').join('.&#8203;'),
-          value: ('dc.' + mdField2.toString())
-        },
-        {
-          displayValue: ('dc.' + mdField3.toString()).split('.').join('.&#8203;'),
-          value: ('dc.' + mdField3.toString())
-        }
-      ];
-
-    beforeEach(fakeAsync(() => {
-      comp.findMetadataFieldSuggestions(query);
-      tick();
-      fixture.detectChanges();
-    }));
-
-    it('it should call queryMetadataFields on the metadataFieldService with the correct query', () => {
-      expect(metadataFieldService.queryMetadataFields).toHaveBeenCalledWith(query, null, true, false, followLink('schema'));
-    });
-
-    it('it should set metadataFieldSuggestions to the right value', () => {
-      const expected = 'a';
-      scheduler.expectObservable(comp.metadataFieldSuggestions).toBe(expected, { a: metadataFieldSuggestions });
-    });
-  });
-
-  describe('canSetEditable', () => {
-    describe('when editable is currently true', () => {
-      beforeEach(() => {
-        objectUpdatesService.isEditable.and.returnValue(observableOf(true));
-        fixture.detectChanges();
-      });
-
-      it('canSetEditable should return an observable emitting false', () => {
-        const expected = '(a|)';
-        scheduler.expectObservable(comp.canSetEditable()).toBe(expected, { a: false });
-      });
-    });
-
-    describe('when editable is currently false', () => {
-      beforeEach(() => {
-        objectUpdatesService.isEditable.and.returnValue(observableOf(false));
-        fixture.detectChanges();
-      });
-
-      describe('when the fieldUpdate\'s changeType is currently not REMOVE', () => {
-        beforeEach(() => {
-          comp.fieldUpdate.changeType = FieldChangeType.ADD;
-          fixture.detectChanges();
-        });
-        it('canSetEditable should return an observable emitting true', () => {
-          const expected = '(a|)';
-          scheduler.expectObservable(comp.canSetEditable()).toBe(expected, { a: true });
-        });
-      });
-
-      describe('when the fieldUpdate\'s changeType is currently REMOVE', () => {
-        beforeEach(() => {
-          comp.fieldUpdate.changeType = FieldChangeType.REMOVE;
-          fixture.detectChanges();
-        });
-        it('canSetEditable should return an observable emitting false', () => {
-          const expected = '(a|)';
-          scheduler.expectObservable(comp.canSetEditable()).toBe(expected, { a: false });
-        });
-      });
-    });
-  });
-
-  describe('canSetUneditable', () => {
-    describe('when editable is currently true', () => {
-      beforeEach(() => {
-        objectUpdatesService.isEditable.and.returnValue(observableOf(true));
-        fixture.detectChanges();
-      });
-
-      it('canSetUneditable should return an observable emitting true', () => {
-        const expected = '(a|)';
-        scheduler.expectObservable(comp.canSetUneditable()).toBe(expected, { a: true });
-      });
-    });
-
-    describe('when editable is currently false', () => {
-      beforeEach(() => {
-        objectUpdatesService.isEditable.and.returnValue(observableOf(false));
-        fixture.detectChanges();
-      });
-
-      it('canSetUneditable should return an observable emitting false', () => {
-        const expected = '(a|)';
-        scheduler.expectObservable(comp.canSetUneditable()).toBe(expected, { a: false });
-      });
-    });
-  });
-
-  describe('when canSetEditable emits true', () => {
-    beforeEach(() => {
-      objectUpdatesService.isEditable.and.returnValue(observableOf(false));
-      spyOn(comp, 'canSetEditable').and.returnValue(observableOf(true));
-      fixture.detectChanges();
-    });
-    it('the div should have an enabled button with an edit icon', () => {
-      const editIcon = de.query(By.css('i.fa-edit')).parent.nativeElement.disabled;
-      expect(editIcon).toBe(false);
-    });
-  });
-
-  describe('when canSetEditable emits false', () => {
-    beforeEach(() => {
-      objectUpdatesService.isEditable.and.returnValue(observableOf(false));
-      spyOn(comp, 'canSetEditable').and.returnValue(observableOf(false));
-      fixture.detectChanges();
-    });
-    it('the div should have a disabled button with an edit icon', () => {
-      const editIcon = de.query(By.css('i.fa-edit')).parent.nativeElement.disabled;
-      expect(editIcon).toBe(true);
-    });
-  });
-
-  describe('when canSetUneditable emits true', () => {
-    beforeEach(() => {
-      objectUpdatesService.isEditable.and.returnValue(observableOf(true));
-      spyOn(comp, 'canSetUneditable').and.returnValue(observableOf(true));
-      fixture.detectChanges();
-    });
-    it('the div should have an enabled button with a check icon', () => {
-      const checkButtonAttrs = de.query(By.css('i.fa-check')).parent.nativeElement.disabled;
-      expect(checkButtonAttrs).toBe(false);
-    });
-  });
-
-  describe('when canSetUneditable emits false', () => {
-    beforeEach(() => {
-      objectUpdatesService.isEditable.and.returnValue(observableOf(true));
-      spyOn(comp, 'canSetUneditable').and.returnValue(observableOf(false));
-      fixture.detectChanges();
-    });
-    it('the div should have a disabled button with a check icon', () => {
-      const checkButtonAttrs = de.query(By.css('i.fa-check')).parent.nativeElement.disabled;
-      expect(checkButtonAttrs).toBe(true);
-    });
-  });
-
-  describe('when canRemove emits true', () => {
-    beforeEach(() => {
-      spyOn(comp, 'canRemove').and.returnValue(observableOf(true));
-      fixture.detectChanges();
-    });
-    it('the div should have an enabled button with a trash icon', () => {
-      const trashButtonAttrs = de.query(By.css('i.fa-trash-alt')).parent.nativeElement.disabled;
-      expect(trashButtonAttrs).toBe(false);
-    });
-  });
-
-  describe('when canRemove emits false', () => {
-    beforeEach(() => {
-      spyOn(comp, 'canRemove').and.returnValue(observableOf(false));
-      fixture.detectChanges();
-    });
-    it('the div should have a disabled button with a trash icon', () => {
-      const trashButtonAttrs = de.query(By.css('i.fa-trash-alt')).parent.nativeElement.disabled;
-      expect(trashButtonAttrs).toBe(true);
-    });
-  });
-
-  describe('when canUndo emits true', () => {
-    beforeEach(() => {
-      spyOn(comp, 'canUndo').and.returnValue(observableOf(true));
-      fixture.detectChanges();
-    });
-    it('the div should have an enabled button with an undo icon', () => {
-      const undoIcon = de.query(By.css('i.fa-undo-alt')).parent.nativeElement.disabled;
-      expect(undoIcon).toBe(false);
-    });
-  });
-
-  describe('when canUndo emits false', () => {
-    beforeEach(() => {
-      spyOn(comp, 'canUndo').and.returnValue(observableOf(false));
-      fixture.detectChanges();
-    });
-    it('the div should have a disabled button with an undo icon', () => {
-      const undoIcon = de.query(By.css('i.fa-undo-alt')).parent.nativeElement.disabled;
-      expect(undoIcon).toBe(true);
-    });
-  });
-
-  describe('canRemove', () => {
-    describe('when the fieldUpdate\'s changeType is currently not REMOVE or ADD', () => {
-      beforeEach(() => {
-        comp.fieldUpdate.changeType = FieldChangeType.UPDATE;
-        fixture.detectChanges();
-      });
-      it('canRemove should return an observable emitting true', () => {
-        const expected = '(a|)';
-        scheduler.expectObservable(comp.canRemove()).toBe(expected, { a: true });
-      });
-    });
-
-    describe('when the fieldUpdate\'s changeType is currently ADD', () => {
-      beforeEach(() => {
-        comp.fieldUpdate.changeType = FieldChangeType.ADD;
-        fixture.detectChanges();
-      });
-      it('canRemove should return an observable emitting false', () => {
-        const expected = '(a|)';
-        scheduler.expectObservable(comp.canRemove()).toBe(expected, { a: false });
-      });
-    });
-  });
-
-  describe('canUndo', () => {
-
-    describe('when editable is currently true', () => {
-      beforeEach(() => {
-        objectUpdatesService.isEditable.and.returnValue(observableOf(true));
-        comp.fieldUpdate.changeType = undefined;
-        fixture.detectChanges();
-      });
-      it('canUndo should return an observable emitting true', () => {
-        const expected = '(a|)';
-        scheduler.expectObservable(comp.canUndo()).toBe(expected, { a: true });
-      });
-    });
-
-    describe('when editable is currently false', () => {
-      describe('when the fieldUpdate\'s changeType is currently ADD, UPDATE or REMOVE', () => {
-        beforeEach(() => {
-          comp.fieldUpdate.changeType = FieldChangeType.ADD;
-          fixture.detectChanges();
-        });
-
-        it('canUndo should return an observable emitting true', () => {
-          const expected = '(a|)';
-          scheduler.expectObservable(comp.canUndo()).toBe(expected, { a: true });
-        });
-      });
-
-      describe('when the fieldUpdate\'s changeType is currently undefined', () => {
-        beforeEach(() => {
-          comp.fieldUpdate.changeType = undefined;
-          fixture.detectChanges();
-        });
-
-        it('canUndo should return an observable emitting false', () => {
-          const expected = '(a|)';
-          scheduler.expectObservable(comp.canUndo()).toBe(expected, { a: false });
-        });
-      });
-    });
-
-  });
-
-  describe('canEditMetadataField', () => {
-    describe('when the fieldUpdate\'s changeType is currently ADD', () => {
-      beforeEach(() => {
-        objectUpdatesService.isEditable.and.returnValue(observableOf(true));
-        comp.fieldUpdate.changeType = FieldChangeType.ADD;
-        fixture.detectChanges();
-      });
-      it('can edit metadata field', () => {
-        const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions'))
-          .componentInstance.disable;
-       expect(disabledMetadataField).toBe(false);
-      });
-    });
-    describe('when the fieldUpdate\'s changeType is currently REMOVE', () => {
-      beforeEach(() => {
-        objectUpdatesService.isEditable.and.returnValue(observableOf(true));
-        comp.fieldUpdate.changeType = FieldChangeType.REMOVE;
-        fixture.detectChanges();
-      });
-      it('can edit metadata field', () => {
-        const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions'))
-          .componentInstance.disable;
-        expect(disabledMetadataField).toBe(true);
-      });
-    });
-    describe('when the fieldUpdate\'s changeType is currently UPDATE', () => {
-      beforeEach(() => {
-        objectUpdatesService.isEditable.and.returnValue(observableOf(true));
-        comp.fieldUpdate.changeType = FieldChangeType.UPDATE;
-        fixture.detectChanges();
-      });
-      it('can edit metadata field', () => {
-        const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions'))
-          .componentInstance.disable;
-        expect(disabledMetadataField).toBe(true);
-      });
-    });
-  });
-});
diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts
deleted file mode 100644
index 2782747916..0000000000
--- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts
+++ /dev/null
@@ -1,201 +0,0 @@
-import { Component, Input, OnChanges, OnInit } from '@angular/core';
-import {
-  metadataFieldsToString,
-  getFirstSucceededRemoteData
-} from '../../../../core/shared/operators';
-import { hasValue, isNotEmpty } from '../../../../shared/empty.util';
-import { RegistryService } from '../../../../core/registry/registry.service';
-import { cloneDeep } from 'lodash';
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
-import { FieldUpdate } from '../../../../core/data/object-updates/object-updates.reducer';
-import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { NgModel } from '@angular/forms';
-import { MetadatumViewModel } from '../../../../core/shared/metadata.models';
-import { InputSuggestion } from '../../../../shared/input-suggestions/input-suggestions.model';
-import { followLink } from '../../../../shared/utils/follow-link-config.model';
-
-@Component({
-  // tslint:disable-next-line:component-selector
-  selector: '[ds-edit-in-place-field]',
-  styleUrls: ['./edit-in-place-field.component.scss'],
-  templateUrl: './edit-in-place-field.component.html',
-})
-/**
- * Component that displays a single metadatum of an item on the edit page
- */
-export class EditInPlaceFieldComponent implements OnInit, OnChanges {
-  /**
-   * The current field, value and state of the metadatum
-   */
-  @Input() fieldUpdate: FieldUpdate;
-
-  /**
-   * The current url of this page
-   */
-  @Input() url: string;
-
-  /**
-   * The metadatum of this field
-   */
-  @Input() metadata: MetadatumViewModel;
-
-  /**
-   * Emits whether or not this field is currently editable
-   */
-  editable: Observable<boolean>;
-
-  /**
-   * Emits whether or not this field is currently valid
-   */
-  valid: Observable<boolean>;
-
-  /**
-   * The current suggestions for the metadatafield when editing
-   */
-  metadataFieldSuggestions: BehaviorSubject<InputSuggestion[]> = new BehaviorSubject([]);
-
-  constructor(
-    private registryService: RegistryService,
-    private objectUpdatesService: ObjectUpdatesService,
-  ) {
-  }
-
-  /**
-   * Sets up an observable that keeps track of the current editable and valid state of this field
-   */
-  ngOnInit(): void {
-    this.editable = this.objectUpdatesService.isEditable(this.url, this.metadata.uuid);
-    this.valid = this.objectUpdatesService.isValid(this.url, this.metadata.uuid);
-  }
-
-  /**
-   * Sends a new change update for this field to the object updates service
-   */
-  update(ngModel?: NgModel) {
-    this.objectUpdatesService.saveChangeFieldUpdate(this.url, cloneDeep(this.metadata));
-    if (hasValue(ngModel)) {
-      this.checkValidity(ngModel);
-    }
-  }
-
-  /**
-   * Method to check the validity of a form control
-   * @param ngModel
-   */
-  public checkValidity(ngModel: NgModel) {
-    ngModel.control.setValue(ngModel.viewModel);
-    ngModel.control.updateValueAndValidity();
-    this.objectUpdatesService.setValidFieldUpdate(this.url, this.metadata.uuid, ngModel.control.valid);
-  }
-
-  /**
-   * Sends a new editable state for this field to the service to change it
-   * @param editable The new editable state for this field
-   */
-  setEditable(editable: boolean) {
-    this.objectUpdatesService.setEditableFieldUpdate(this.url, this.metadata.uuid, editable);
-  }
-
-  /**
-   * Sends a new remove update for this field to the object updates service
-   */
-  remove() {
-    this.objectUpdatesService.saveRemoveFieldUpdate(this.url, cloneDeep(this.metadata));
-  }
-
-  /**
-   * Notifies the object updates service that the updates for the current field can be removed
-   */
-  removeChangesFromField() {
-    this.objectUpdatesService.removeSingleFieldUpdate(this.url, this.metadata.uuid);
-  }
-
-  /**
-   * Sets the current metadatafield based on the fieldUpdate input field
-   */
-  ngOnChanges(): void {
-    this.metadata = cloneDeep(this.fieldUpdate.field) as MetadatumViewModel;
-  }
-
-  /**
-   * Requests all metadata fields that contain the query string in their key
-   * Then sets all found metadata fields as metadataFieldSuggestions
-   * Ignores fields from metadata schemas "relation" and "relationship"
-   * @param query The query to look for
-   */
-  findMetadataFieldSuggestions(query: string) {
-    if (isNotEmpty(query)) {
-      return this.registryService.queryMetadataFields(query, null, true, false, followLink('schema')).pipe(
-        getFirstSucceededRemoteData(),
-        metadataFieldsToString(),
-      ).subscribe((fieldNames: string[]) => {
-          this.setInputSuggestions(fieldNames);
-        });
-    } else {
-      this.metadataFieldSuggestions.next([]);
-    }
-  }
-
-  /**
-   * Set the list of input suggestion with the given Metadata fields, which all require a resolved MetadataSchema
-   * @param fields  list of Metadata fields, which all require a resolved MetadataSchema
-   */
-  setInputSuggestions(fields: string[]) {
-    this.metadataFieldSuggestions.next(
-      fields.map((fieldName: string) => {
-        return {
-          displayValue: fieldName.split('.').join('.&#8203;'),
-          value: fieldName
-        };
-      })
-    );
-  }
-
-  /**
-   * Check if a user should be allowed to edit this field
-   * @return an observable that emits true when the user should be able to edit this field and false when they should not
-   */
-  canSetEditable(): Observable<boolean> {
-    return this.editable.pipe(
-      map((editable: boolean) => {
-        if (editable) {
-          return false;
-        } else {
-          return this.fieldUpdate.changeType !== FieldChangeType.REMOVE;
-        }
-      })
-    );
-  }
-
-  /**
-   * Check if a user should be allowed to disabled editing this field
-   * @return an observable that emits true when the user should be able to disable editing this field and false when they should not
-   */
-  canSetUneditable(): Observable<boolean> {
-    return this.editable;
-  }
-
-  /**
-   * Check if a user should be allowed to remove this field
-   * @return an observable that emits true when the user should be able to remove this field and false when they should not
-   */
-  canRemove(): Observable<boolean> {
-    return observableOf(this.fieldUpdate.changeType !== FieldChangeType.REMOVE && this.fieldUpdate.changeType !== FieldChangeType.ADD);
-  }
-
-  /**
-   * Check if a user should be allowed to undo changes to this field
-   * @return an observable that emits true when the user should be able to undo changes to this field and false when they should not
-   */
-  canUndo(): Observable<boolean> {
-    return this.editable.pipe(
-      map((editable: boolean) => this.fieldUpdate.changeType >= 0 || editable)
-    );
-  }
-
-  protected isNotEmpty(value): boolean {
-    return isNotEmpty(value);
-  }
-}
diff --git a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html
deleted file mode 100644
index 70cd2aaa39..0000000000
--- a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<div class="item-metadata">
-  <div class="button-row top d-flex mb-2">
-    <button class="mr-auto btn btn-success"
-            (click)="add()"><i
-      class="fas fa-plus"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.add-button" | translate}}</span>
-    </button>
-    <button class="btn btn-warning" *ngIf="isReinstatable() | async"
-            (click)="reinstate()"><i
-      class="fas fa-undo-alt"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
-    </button>
-    <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || !(isValid() | async)"
-            (click)="submit()"><i
-      class="fas fa-save"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
-    </button>
-    <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-            [disabled]="!(hasChanges() | async)"
-            (click)="discard()"><i
-      class="fas fa-times"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
-    </button>
-  </div>
-  <table class="table table-responsive table-striped table-bordered"
-         *ngIf="((updates$ | async)| dsObjectValues).length > 0">
-    <thead>
-    <tr>
-      <th><span id="fieldName">{{'item.edit.metadata.headers.field' | translate}}</span></th>
-      <th><span id="fieldValue">{{'item.edit.metadata.headers.value' | translate}}</span></th>
-      <th class="text-center"><span id="fieldLang">{{'item.edit.metadata.headers.language' | translate}}</span></th>
-      <th class="text-center">{{'item.edit.metadata.headers.edit' | translate}}</th>
-    </tr>
-    </thead>
-    <tbody>
-    <tr *ngFor="let updateValue of ((updates$ | async)| dsObjectValues); trackBy: trackUpdate"
-        ds-edit-in-place-field
-        [fieldUpdate]="updateValue || {}"
-        [url]="url"
-        [ngClass]="{
-                'table-warning': updateValue.changeType === 0,
-                'table-danger': updateValue.changeType === 2,
-                'table-success': updateValue.changeType === 1
-            }">
-
-    </tr>
-    </tbody>
-  </table>
-  <div *ngIf="((updates$ | async)| dsObjectValues).length == 0">
-    <ds-alert [content]="'item.edit.metadata.empty'" [type]="AlertTypeEnum.Info"></ds-alert>
-  </div>
-  <div class="button-row bottom">
-    <div class="mt-2 float-right">
-      <button class="btn btn-warning" *ngIf="isReinstatable() | async"
-              (click)="reinstate()"><i
-        class="fas fa-undo-alt"></i> {{"item.edit.metadata.reinstate-button" | translate}}
-      </button>
-      <button class="btn btn-primary mr-0" [disabled]="!(hasChanges() | async)"
-              (click)="submit()"><i
-        class="fas fa-save"></i> {{"item.edit.metadata.save-button" | translate}}
-      </button>
-      <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-              [disabled]="!(hasChanges() | async)"
-              (click)="discard()"><i
-        class="fas fa-times"></i> {{"item.edit.metadata.discard-button" | translate}}
-      </button>
-    </div>
-  </div>
-</div>
diff --git a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss
deleted file mode 100644
index 46ce1a6f4b..0000000000
--- a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-.button-row {
-    .btn {
-        margin-right: calc(0.5 * var(--bs-spacer));
-
-        &:last-child {
-            margin-right: 0;
-        }
-
-        @media screen and (min-width: map-get($grid-breakpoints, sm)) {
-            min-width: var(--ds-edit-item-button-min-width);
-        }
-    }
-
-    &.top .btn {
-        margin-top: calc(var(--bs-spacer) / 2);
-        margin-bottom: calc(var(--bs-spacer) / 2);
-    }
-
-
-}
diff --git a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts
deleted file mode 100644
index 0f01efcc55..0000000000
--- a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts
+++ /dev/null
@@ -1,290 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { of as observableOf } from 'rxjs';
-import { getTestScheduler } from 'jasmine-marbles';
-import { ItemMetadataComponent } from './item-metadata.component';
-import { TestScheduler } from 'rxjs/testing';
-import { SharedModule } from '../../../shared/shared.module';
-import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { TranslateModule } from '@ngx-translate/core';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { By } from '@angular/platform-browser';
-import { INotification, Notification } from '../../../shared/notifications/models/notification.model';
-import { NotificationType } from '../../../shared/notifications/models/notification-type';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { Item } from '../../../core/shared/item.model';
-import { FieldChangeType } from '../../../core/data/object-updates/object-updates.actions';
-import { MetadatumViewModel } from '../../../core/shared/metadata.models';
-import { RegistryService } from '../../../core/registry/registry.service';
-import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
-import { MetadataField } from '../../../core/metadata/metadata-field.model';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { DSOSuccessResponse } from '../../../core/cache/response.models';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-
-let comp: any;
-let fixture: ComponentFixture<ItemMetadataComponent>;
-let de: DebugElement;
-let el: HTMLElement;
-let objectUpdatesService;
-const infoNotification: INotification = new Notification('id', NotificationType.Info, 'info');
-const warningNotification: INotification = new Notification('id', NotificationType.Warning, 'warning');
-const successNotification: INotification = new Notification('id', NotificationType.Success, 'success');
-const date = new Date();
-const router = new RouterStub();
-let metadataFieldService;
-let paginatedMetadataFields;
-let routeStub;
-let objectCacheService;
-
-const mdSchema = Object.assign(new MetadataSchema(), { prefix: 'dc' });
-const mdField1 = Object.assign(new MetadataField(), {
-  schema: mdSchema,
-  element: 'contributor',
-  qualifier: 'author'
-});
-const mdField2 = Object.assign(new MetadataField(), { schema: mdSchema, element: 'title' });
-const mdField3 = Object.assign(new MetadataField(), {
-  schema: mdSchema,
-  element: 'description',
-  qualifier: 'abstract'
-});
-
-let itemService;
-const notificationsService = jasmine.createSpyObj('notificationsService',
-  {
-    info: infoNotification,
-    warning: warningNotification,
-    success: successNotification
-  }
-);
-const metadatum1 = Object.assign(new MetadatumViewModel(), {
-  key: 'dc.description.abstract',
-  value: 'Example abstract',
-  language: 'en'
-});
-
-const metadatum2 = Object.assign(new MetadatumViewModel(), {
-  key: 'dc.title',
-  value: 'Title test',
-  language: 'de'
-});
-
-const metadatum3 = Object.assign(new MetadatumViewModel(), {
-  key: 'dc.contributor.author',
-  value: 'Shakespeare, William',
-});
-
-const url = 'http://test-url.com/test-url';
-
-router.url = url;
-
-const fieldUpdate1 = {
-  field: metadatum1,
-  changeType: undefined
-};
-
-const fieldUpdate2 = {
-  field: metadatum2,
-  changeType: FieldChangeType.REMOVE
-};
-
-const fieldUpdate3 = {
-  field: metadatum3,
-  changeType: undefined
-};
-
-const operation1 = { op: 'remove', path: '/metadata/dc.title/1' };
-
-let scheduler: TestScheduler;
-let item;
-describe('ItemMetadataComponent', () => {
-  beforeEach(waitForAsync(() => {
-      item = Object.assign(new Item(), {
-          metadata: {
-            [metadatum1.key]: [metadatum1],
-            [metadatum2.key]: [metadatum2],
-            [metadatum3.key]: [metadatum3]
-          },
-          _links: {
-            self: {
-              href: 'https://rest.api/core/items/a36d8bd2-8e8c-4969-9b1f-a574c2064983'
-            }
-          }
-        },
-        {
-          lastModified: date
-        }
-      )
-      ;
-      itemService = jasmine.createSpyObj('itemService', {
-        update: createSuccessfulRemoteDataObject$(item),
-        commitUpdates: {},
-        patch: observableOf(new DSOSuccessResponse(['item-selflink'], 200, 'OK')),
-        findByHref: createSuccessfulRemoteDataObject$(item)
-      });
-      routeStub = {
-        data: observableOf({}),
-        parent: {
-          data: observableOf({ dso: createSuccessfulRemoteDataObject(item) })
-        }
-      };
-      paginatedMetadataFields = createPaginatedList([mdField1, mdField2, mdField3]);
-
-      metadataFieldService = jasmine.createSpyObj({
-        getAllMetadataFields: createSuccessfulRemoteDataObject$(paginatedMetadataFields)
-      });
-      scheduler = getTestScheduler();
-      objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
-        {
-          getFieldUpdates: observableOf({
-            [metadatum1.uuid]: fieldUpdate1,
-            [metadatum2.uuid]: fieldUpdate2,
-            [metadatum3.uuid]: fieldUpdate3
-          }),
-          saveAddFieldUpdate: {},
-          discardFieldUpdates: {},
-          reinstateFieldUpdates: observableOf(true),
-          initialize: {},
-          getUpdatedFields: observableOf([metadatum1, metadatum2, metadatum3]),
-          getLastModified: observableOf(date),
-          hasUpdates: observableOf(true),
-          isReinstatable: observableOf(false), // should always return something --> its in ngOnInit
-          isValidPage: observableOf(true),
-          createPatch: observableOf([
-            operation1
-          ])
-        }
-      );
-      objectCacheService = jasmine.createSpyObj('objectCacheService', ['addPatch']);
-
-      TestBed.configureTestingModule({
-        imports: [SharedModule, TranslateModule.forRoot()],
-        declarations: [ItemMetadataComponent],
-        providers: [
-          { provide: ItemDataService, useValue: itemService },
-          { provide: ObjectUpdatesService, useValue: objectUpdatesService },
-          { provide: Router, useValue: router },
-          { provide: ActivatedRoute, useValue: routeStub },
-          { provide: NotificationsService, useValue: notificationsService },
-          { provide: RegistryService, useValue: metadataFieldService },
-          { provide: ObjectCacheService, useValue: objectCacheService },
-        ], schemas: [
-          NO_ERRORS_SCHEMA
-        ]
-      }).compileComponents();
-    })
-  );
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ItemMetadataComponent);
-    comp = fixture.componentInstance; // EditInPlaceFieldComponent test instance
-    de = fixture.debugElement;
-    el = de.nativeElement;
-    comp.url = url;
-    fixture.detectChanges();
-  });
-
-  describe('add', () => {
-    const md = new MetadatumViewModel();
-    beforeEach(() => {
-      comp.add(md);
-    });
-
-    it('it should call saveAddFieldUpdate on the objectUpdatesService with the correct url and metadata', () => {
-      expect(objectUpdatesService.saveAddFieldUpdate).toHaveBeenCalledWith(url, md);
-    });
-  });
-
-  describe('discard', () => {
-    beforeEach(() => {
-      comp.discard();
-    });
-
-    it('it should call discardFieldUpdates on the objectUpdatesService with the correct url and notification', () => {
-      expect(objectUpdatesService.discardFieldUpdates).toHaveBeenCalledWith(url, infoNotification);
-    });
-  });
-
-  describe('reinstate', () => {
-    beforeEach(() => {
-      comp.reinstate();
-    });
-
-    it('it should call reinstateFieldUpdates on the objectUpdatesService with the correct url', () => {
-      expect(objectUpdatesService.reinstateFieldUpdates).toHaveBeenCalledWith(url);
-    });
-  });
-
-  describe('submit', () => {
-    beforeEach(() => {
-      comp.submit();
-    });
-
-    it('it should call reinstateFieldUpdates on the objectUpdatesService with the correct url and metadata', () => {
-      expect(objectUpdatesService.createPatch).toHaveBeenCalledWith(url);
-      expect(itemService.patch).toHaveBeenCalledWith(comp.item, [operation1]);
-      expect(objectUpdatesService.getFieldUpdates).toHaveBeenCalledWith(url, comp.item.metadataAsList);
-    });
-  });
-
-  describe('hasChanges', () => {
-    describe('when the objectUpdatesService\'s hasUpdated method returns true', () => {
-      beforeEach(() => {
-        objectUpdatesService.hasUpdates.and.returnValue(observableOf(true));
-      });
-
-      it('should return an observable that emits true', () => {
-        const expected = '(a|)';
-        scheduler.expectObservable(comp.hasChanges()).toBe(expected, { a: true });
-      });
-    });
-
-    describe('when the objectUpdatesService\'s hasUpdated method returns false', () => {
-      beforeEach(() => {
-        objectUpdatesService.hasUpdates.and.returnValue(observableOf(false));
-      });
-
-      it('should return an observable that emits false', () => {
-        const expected = '(a|)';
-        scheduler.expectObservable(comp.hasChanges()).toBe(expected, { a: false });
-      });
-    });
-  });
-
-  describe('changeType is UPDATE', () => {
-    beforeEach(() => {
-      fieldUpdate1.changeType = FieldChangeType.UPDATE;
-      fixture.detectChanges();
-    });
-    it('the div should have class table-warning', () => {
-      const element = de.queryAll(By.css('tr'))[1].nativeElement;
-      expect(element.classList).toContain('table-warning');
-    });
-  });
-
-  describe('changeType is ADD', () => {
-    beforeEach(() => {
-      fieldUpdate1.changeType = FieldChangeType.ADD;
-      fixture.detectChanges();
-    });
-    it('the div should have class table-success', () => {
-      const element = de.queryAll(By.css('tr'))[1].nativeElement;
-      expect(element.classList).toContain('table-success');
-    });
-  });
-
-  describe('changeType is REMOVE', () => {
-    beforeEach(() => {
-      fieldUpdate1.changeType = FieldChangeType.REMOVE;
-      fixture.detectChanges();
-    });
-    it('the div should have class table-danger', () => {
-      const element = de.queryAll(By.css('tr'))[1].nativeElement;
-      expect(element.classList).toContain('table-danger');
-    });
-  });
-});
diff --git a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts
deleted file mode 100644
index 5030ef3bb3..0000000000
--- a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import { Component, Input } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { cloneDeep } from 'lodash';
-import { first, switchMap } from 'rxjs/operators';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { RemoteData } from '../../../core/data/remote-data';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { MetadataValue, MetadatumViewModel } from '../../../core/shared/metadata.models';
-import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
-import { UpdateDataService } from '../../../core/data/update-data.service';
-import { hasNoValue, hasValue } from '../../../shared/empty.util';
-import { AlertType } from '../../../shared/alert/aletr-type';
-import { Operation } from 'fast-json-patch';
-import { MetadataPatchOperationService } from '../../../core/data/object-updates/patch-operation-service/metadata-patch-operation.service';
-
-@Component({
-  selector: 'ds-item-metadata',
-  styleUrls: ['./item-metadata.component.scss'],
-  templateUrl: './item-metadata.component.html',
-})
-/**
- * Component for displaying an item's metadata edit page
- */
-export class ItemMetadataComponent extends AbstractItemUpdateComponent {
-
-  /**
-   * The AlertType enumeration
-   * @type {AlertType}
-   */
-  public AlertTypeEnum = AlertType;
-
-  /**
-   * A custom update service to use for adding and committing patches
-   * This will default to the ItemDataService
-   */
-  @Input() updateService: UpdateDataService<Item>;
-
-  constructor(
-    public itemService: ItemDataService,
-    public objectUpdatesService: ObjectUpdatesService,
-    public router: Router,
-    public notificationsService: NotificationsService,
-    public translateService: TranslateService,
-    public route: ActivatedRoute,
-  ) {
-    super(itemService, objectUpdatesService, router, notificationsService, translateService, route);
-  }
-
-  /**
-   * Set up and initialize all fields
-   */
-  ngOnInit(): void {
-    super.ngOnInit();
-    if (hasNoValue(this.updateService)) {
-      this.updateService = this.itemService;
-    }
-  }
-
-  /**
-   * Initialize the values and updates of the current item's metadata fields
-   */
-  public initializeUpdates(): void {
-    this.updates$ = this.objectUpdatesService.getFieldUpdates(this.url, this.item.metadataAsList);
-    }
-
-  /**
-   * Initialize the prefix for notification messages
-   */
-  public initializeNotificationsPrefix(): void {
-    this.notificationsPrefix = 'item.edit.metadata.notifications.';
-  }
-
-  /**
-   * Sends a new add update for a field to the object updates service
-   * @param metadata The metadata to add, if no parameter is supplied, create a new Metadatum
-   */
-  add(metadata: MetadatumViewModel = new MetadatumViewModel()) {
-    this.objectUpdatesService.saveAddFieldUpdate(this.url, metadata);
-  }
-
-  /**
-   * Sends all initial values of this item to the object updates service
-   */
-  public initializeOriginalFields() {
-    this.objectUpdatesService.initialize(this.url, this.item.metadataAsList, this.item.lastModified, MetadataPatchOperationService);
-  }
-
-  /**
-   * Requests all current metadata for this item and requests the item service to update the item
-   * Makes sure the new version of the item is rendered on the page
-   */
-  public submit() {
-    this.isValid().pipe(first()).subscribe((isValid) => {
-      if (isValid) {
-        this.objectUpdatesService.createPatch(this.url).pipe(
-          first(),
-          switchMap((patch: Operation[]) => {
-            return this.updateService.patch(this.item, patch).pipe(
-              getFirstCompletedRemoteData()
-            );
-          })
-        ).subscribe(
-          (rd: RemoteData<Item>) => {
-            if (rd.hasFailed) {
-              this.notificationsService.error(this.getNotificationTitle('error'), rd.errorMessage);
-            } else {
-              this.item = rd.payload;
-              this.checkAndFixMetadataUUIDs();
-              this.initializeOriginalFields();
-              this.updates$ = this.objectUpdatesService.getFieldUpdates(this.url, this.item.metadataAsList);
-              this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved'));
-            }
-          }
-        );
-      } else {
-        this.notificationsService.error(this.getNotificationTitle('invalid'), this.getNotificationContent('invalid'));
-      }
-    });
-  }
-
-  /**
-   * Check for empty metadata UUIDs and fix them (empty UUIDs would break the object-update service)
-   */
-  checkAndFixMetadataUUIDs() {
-    const metadata = cloneDeep(this.item.metadata);
-    Object.keys(this.item.metadata).forEach((key: string) => {
-      metadata[key] = this.item.metadata[key].map((value) => hasValue(value.uuid) ? value : Object.assign(new MetadataValue(), value));
-    });
-    this.item.metadata = metadata;
-  }
-}
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 0140bad6dd..fd2b049d54 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1815,6 +1815,8 @@
 
   "item.edit.metadata.headers.value": "Value",
 
+  "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+
   "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
 
   "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
@@ -2270,6 +2272,64 @@
 
 
 
+  "itemtemplate.edit.metadata.add-button": "Add",
+
+  "itemtemplate.edit.metadata.discard-button": "Discard",
+
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
+
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
+
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
+
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
+
+  "itemtemplate.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the \"Relationships\" tab",
+
+  "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+
+  "itemtemplate.edit.metadata.headers.edit": "Edit",
+
+  "itemtemplate.edit.metadata.headers.field": "Field",
+
+  "itemtemplate.edit.metadata.headers.language": "Lang",
+
+  "itemtemplate.edit.metadata.headers.value": "Value",
+
+  "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Changed discarded",
+
+  "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
+
+  "itemtemplate.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
+
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
+
+  "itemtemplate.edit.metadata.notifications.outdated.content": "The item template you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Changed outdated",
+
+  "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
+
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
+
+  "itemtemplate.edit.metadata.reinstate-button": "Undo",
+
+  "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+
+  "itemtemplate.edit.metadata.save-button": "Save",
+
+
+
   "journal.listelement.badge": "Journal",
 
   "journal.page.description": "Description",

From ceb6ea3672961f7bba0ffba7959a8b94e870b48d Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 4 Jan 2023 14:29:48 +0100
Subject: [PATCH 083/160] 93747: Fixed and improved ArrayMoveChangeAnalyzer

---
 ...array-move-change-analyzer.service.spec.ts | 13 ++++--
 .../array-move-change-analyzer.service.ts     | 41 +++++++++++--------
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/app/core/data/array-move-change-analyzer.service.spec.ts b/src/app/core/data/array-move-change-analyzer.service.spec.ts
index 5f5388d935..025791d6dc 100644
--- a/src/app/core/data/array-move-change-analyzer.service.spec.ts
+++ b/src/app/core/data/array-move-change-analyzer.service.spec.ts
@@ -41,21 +41,28 @@ describe('ArrayMoveChangeAnalyzer', () => {
     ], new MoveTest(0, 3));
 
     testMove([
+      { op: 'move', from: '/2', path: '/3' },
       { op: 'move', from: '/0', path: '/3' },
-      { op: 'move', from: '/2', path: '/1' }
     ], new MoveTest(0, 3), new MoveTest(1, 2));
 
     testMove([
+      { op: 'move', from: '/3', path: '/4' },
       { op: 'move', from: '/0', path: '/1' },
-      { op: 'move', from: '/3', path: '/4' }
     ], new MoveTest(0, 1), new MoveTest(3, 4));
 
     testMove([], new MoveTest(0, 4), new MoveTest(4, 0));
 
     testMove([
+      { op: 'move', from: '/2', path: '/3' },
       { op: 'move', from: '/0', path: '/3' },
-      { op: 'move', from: '/2', path: '/1' }
     ], new MoveTest(0, 4), new MoveTest(1, 3), new MoveTest(2, 4));
+
+    testMove([
+      { op: 'move', from: '/3', path: '/4' },
+      { op: 'move', from: '/2', path: '/4' },
+      { op: 'move', from: '/1', path: '/3' },
+      { op: 'move', from: '/0', path: '/3' },
+    ], new MoveTest(4, 1), new MoveTest(4, 2), new MoveTest(0, 3));
   });
 
   describe('when some values are undefined (index 2 and 3)', () => {
diff --git a/src/app/core/data/array-move-change-analyzer.service.ts b/src/app/core/data/array-move-change-analyzer.service.ts
index f6e07608f6..36744e9f96 100644
--- a/src/app/core/data/array-move-change-analyzer.service.ts
+++ b/src/app/core/data/array-move-change-analyzer.service.ts
@@ -16,22 +16,31 @@ export class ArrayMoveChangeAnalyzer<T> {
    * @param array2  The custom array to compare with the original
    */
   diff(array1: T[], array2: T[]): MoveOperation[] {
-    const result = [];
-    const moved = [...array1];
-    array1.forEach((value: T, index: number) => {
-      if (hasValue(value)) {
-        const otherIndex = array2.indexOf(value);
-        const movedIndex = moved.indexOf(value);
-        if (index !== otherIndex && movedIndex !== otherIndex) {
-          moveItemInArray(moved, movedIndex, otherIndex);
-          result.push(Object.assign({
-            op: 'move',
-            from: '/' + movedIndex,
-            path: '/' + otherIndex
-          }) as MoveOperation);
-        }
+    return this.getMoves(array1, array2).map((move) => Object.assign({
+      op: 'move',
+      from: '/' + move[0],
+      path: '/' + move[1],
+    }) as MoveOperation);
+  }
+
+  /**
+   * Determine a set of moves required to transform array1 into array2
+   * The moves are returned as an array of pairs of numbers where the first number is the original index and the second
+   * is the new index
+   * It is assumed the operations are executed in the order they're returned (and not simultaneously)
+   * @param array1
+   * @param array2
+   */
+  private getMoves(array1: any[], array2: any[]): number[][] {
+    const moved = [...array2];
+
+    return array1.reduce((moves, item, index) => {
+      if (hasValue(item) && item !== moved[index]) {
+        const last = moved.lastIndexOf(item);
+        moveItemInArray(moved, last, index);
+        moves.unshift([index, last]);
       }
-    });
-    return result;
+      return moves;
+    }, []);
   }
 }

From 124469209a1bbeedd46d8f12c3ca852728bbe40c Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 4 Jan 2023 17:51:34 +0100
Subject: [PATCH 084/160] 97742: Post merge test & build fixes

---
 .../dso-edit-metadata-value.component.spec.ts |  6 ++--
 .../dso-edit-metadata-value.component.ts      |  4 +--
 .../dso-edit-metadata.component.spec.ts       | 24 +++++++------
 .../dso-edit-metadata.component.ts            | 11 +++---
 .../themed-item-metadata.component.ts         | 34 -------------------
 .../item-metadata.component.html              |  0
 .../item-metadata.component.scss              |  0
 .../item-metadata/item-metadata.component.ts  | 17 ----------
 src/themes/custom/lazy-theme.module.ts        |  2 --
 9 files changed, 26 insertions(+), 72 deletions(-)
 delete mode 100644 src/app/item-page/edit-item-page/item-metadata/themed-item-metadata.component.ts
 delete mode 100644 src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.html
 delete mode 100644 src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss
 delete mode 100644 src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts

diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
index 08f041c4cd..10b3016a52 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
@@ -4,7 +4,7 @@ import { VarDirective } from '../../../shared/utils/var.directive';
 import { TranslateModule } from '@ngx-translate/core';
 import { RouterTestingModule } from '@angular/router/testing';
 import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { RelationshipService } from '../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { of } from 'rxjs/internal/observable/of';
 import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
@@ -22,7 +22,7 @@ describe('DsoEditMetadataValueComponent', () => {
   let component: DsoEditMetadataValueComponent;
   let fixture: ComponentFixture<DsoEditMetadataValueComponent>;
 
-  let relationshipService: RelationshipService;
+  let relationshipService: RelationshipDataService;
   let dsoNameService: DSONameService;
 
   let editMetadataValue: DsoEditMetadataValue;
@@ -52,7 +52,7 @@ describe('DsoEditMetadataValueComponent', () => {
       declarations: [DsoEditMetadataValueComponent, VarDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
-        { provide: RelationshipService, useValue: relationshipService },
+        { provide: RelationshipDataService, useValue: relationshipService },
         { provide: DSONameService, useValue: dsoNameService },
       ],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
index dce0ec68b0..3fdcd381ab 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
@@ -5,7 +5,7 @@ import {
   MetadataRepresentation,
   MetadataRepresentationType
 } from '../../../core/shared/metadata-representation/metadata-representation.model';
-import { RelationshipService } from '../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
 import { map } from 'rxjs/operators';
@@ -97,7 +97,7 @@ export class DsoEditMetadataValueComponent implements OnInit {
    */
   mdRepresentationName$: Observable<string | null>;
 
-  constructor(protected relationshipService: RelationshipService,
+  constructor(protected relationshipService: RelationshipDataService,
               protected dsoNameService: DSONameService) {
   }
 
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts
index b3650114c9..7067c44fbb 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts
@@ -3,22 +3,32 @@ 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';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import { DebugElement, Injectable, NO_ERRORS_SCHEMA } from '@angular/core';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { Item } from '../../core/shared/item.model';
-import { ItemDataService } from '../../core/data/item-data.service';
 import { MetadataValue } from '../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { By } from '@angular/platform-browser';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service';
 import { ITEM } from '../../core/shared/item.resource-type';
+import { DATA_SERVICE_FACTORY } from '../../core/data/base/data-service.decorator';
+import { Operation } from 'fast-json-patch';
+import { RemoteData } from '../../core/data/remote-data';
+import { Observable } from 'rxjs/internal/Observable';
 
 const ADD_BTN = 'add';
 const REINSTATE_BTN = 'reinstate';
 const SAVE_BTN = 'save';
 const DISCARD_BTN = 'discard';
 
+@Injectable()
+class TestDataService {
+  patch(object: Item, operations: Operation[]): Observable<RemoteData<Item>> {
+    return createSuccessfulRemoteDataObject$(object);
+  }
+}
+
 describe('DsoEditMetadataComponent', () => {
   let component: DsoEditMetadataComponent;
   let fixture: ComponentFixture<DsoEditMetadataComponent>;
@@ -26,8 +36,6 @@ describe('DsoEditMetadataComponent', () => {
   let notificationsService: NotificationsService;
 
   let dso: DSpaceObject;
-  let updatedDso: DSpaceObject;
-  let dataService: ItemDataService;
 
   beforeEach(waitForAsync(() => {
     dso = Object.assign(new Item(), {
@@ -59,11 +67,6 @@ describe('DsoEditMetadataComponent', () => {
         ],
       },
     });
-    updatedDso = Object.assign(new Item(), dso);
-    updatedDso.metadata['dc.title'][0].value = 'Updated Title';
-    dataService = jasmine.createSpyObj('itemDataService', {
-      patch: createSuccessfulRemoteDataObject$(updatedDso),
-    });
 
     notificationsService = jasmine.createSpyObj('notificationsService', ['error', 'success']);
 
@@ -71,7 +74,8 @@ describe('DsoEditMetadataComponent', () => {
       declarations: [DsoEditMetadataComponent, VarDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
-        { provide: ItemDataService, useValue: dataService },
+        TestDataService,
+        { provide: DATA_SERVICE_FACTORY, useValue: jasmine.createSpy('getDataServiceFor').and.returnValue(TestDataService) },
         { provide: NotificationsService, useValue: notificationsService },
         ArrayMoveChangeAnalyzer,
       ],
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
index a2ceaa21d6..d67a7ea738 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -1,4 +1,4 @@
-import { Component, Injector, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { Component, Inject, Injector, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { AlertType } from '../../shared/alert/aletr-type';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { DsoEditMetadataForm } from './dso-edit-metadata-form';
@@ -13,13 +13,15 @@ import {
   getFirstCompletedRemoteData,
 } from '../../core/shared/operators';
 import { UpdateDataService } from '../../core/data/update-data.service';
-import { getDataServiceFor } from '../../core/cache/builders/build-decorators';
 import { ResourceType } from '../../core/shared/resource-type';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { MetadataFieldSelectorComponent } from './metadata-field-selector/metadata-field-selector.component';
 import { Observable } from 'rxjs/internal/Observable';
 import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service';
+import { DATA_SERVICE_FACTORY } from '../../core/data/base/data-service.decorator';
+import { GenericConstructor } from '../../core/shared/generic-constructor';
+import { HALDataService } from '../../core/data/base/hal-data-service.interface';
 
 @Component({
   selector: 'ds-dso-edit-metadata',
@@ -107,7 +109,8 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
               protected notificationsService: NotificationsService,
               protected translateService: TranslateService,
               protected parentInjector: Injector,
-              protected arrayMoveChangeAnalyser: ArrayMoveChangeAnalyzer<number>) {
+              protected arrayMoveChangeAnalyser: ArrayMoveChangeAnalyzer<number>,
+              @Inject(DATA_SERVICE_FACTORY) protected getDataServiceFor: (resourceType: ResourceType) => GenericConstructor<HALDataService<any>>) {
   }
 
   /**
@@ -144,7 +147,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
       type = this.dso.type;
     }
     if (hasNoValue(this.updateDataService)) {
-      const provider = getDataServiceFor(type);
+      const provider = this.getDataServiceFor(type);
       this.updateDataService = Injector.create({
         providers: [],
         parent: this.parentInjector
diff --git a/src/app/item-page/edit-item-page/item-metadata/themed-item-metadata.component.ts b/src/app/item-page/edit-item-page/item-metadata/themed-item-metadata.component.ts
deleted file mode 100644
index 53f0120015..0000000000
--- a/src/app/item-page/edit-item-page/item-metadata/themed-item-metadata.component.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Component, Input } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
-import { UpdateDataService } from '../../../core/data/update-data.service';
-import { ItemMetadataComponent } from './item-metadata.component';
-import { ThemedComponent } from '../../../shared/theme-support/themed.component';
-
-@Component({
-  selector: 'ds-themed-item-metadata',
-  styleUrls: [],
-  templateUrl: './../../../shared/theme-support/themed.component.html',
-})
-/**
- * Component for displaying an item's metadata edit page
- */
-export class ThemedItemMetadataComponent extends ThemedComponent<ItemMetadataComponent> {
-
-  @Input() item: Item;
-
-  @Input() updateService: UpdateDataService<Item>;
-
-  protected inAndOutputNames: (keyof ItemMetadataComponent & keyof this)[] = ['item', 'updateService'];
-
-  protected getComponentName(): string {
-    return 'ItemMetadataComponent';
-  }
-
-  protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../../themes/${themeName}/app/item-page/edit-item-page/item-metadata/item-metadata.component`);
-  }
-
-  protected importUnthemedComponent(): Promise<any> {
-    return import(`./item-metadata.component`);
-  }
-}
diff --git a/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.html b/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.html
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss b/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts b/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts
deleted file mode 100644
index d6d7c4b8fb..0000000000
--- a/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Component } from '@angular/core';
-import {
-  ItemMetadataComponent as BaseComponent
-} from '../../../../../../app/item-page/edit-item-page/item-metadata/item-metadata.component';
-
-@Component({
-  selector: 'ds-item-metadata',
-  // styleUrls: ['./item-metadata.component.scss'],
-  styleUrls: ['../../../../../../app/item-page/edit-item-page/item-metadata/item-metadata.component.scss'],
-  // templateUrl: './item-metadata.component.html',
-  templateUrl: '../../../../../../app/item-page/edit-item-page/item-metadata/item-metadata.component.html',
-})
-/**
- * Component for displaying an item's metadata edit page
- */
-export class ItemMetadataComponent extends BaseComponent {
-}
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index d2ac0ae787..a57c4178a7 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -94,7 +94,6 @@ import { AuthNavMenuComponent } from './app/shared/auth-nav-menu/auth-nav-menu.c
 import {
   ExpandableNavbarSectionComponent
 } from './app/navbar/expandable-navbar-section/expandable-navbar-section.component';
-import { ItemMetadataComponent } from './app/item-page/edit-item-page/item-metadata/item-metadata.component';
 import {
   EditItemTemplatePageComponent
 } from './app/collection-page/edit-item-template-page/edit-item-template-page.component';
@@ -157,7 +156,6 @@ const DECLARATIONS = [
   ComcolPageHandleComponent,
   AuthNavMenuComponent,
   ExpandableNavbarSectionComponent,
-  ItemMetadataComponent,
   EditItemTemplatePageComponent,
   LoadingComponent,
   SearchResultsComponent,

From 30eba0bdefd58ab8aea067b3ae839aee30904bb0 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 5 Jan 2023 11:37:46 +0100
Subject: [PATCH 085/160] 97742: Themed DsoEditMetadataComponent

---
 .../edit-item-template-page.component.html    |  2 +-
 .../themed-dso-edit-metadata.component.ts     | 33 +++++++++++++++++++
 src/app/dso-shared/dso-shared.module.ts       |  7 ++++
 .../edit-item-page.routing.module.ts          |  3 +-
 .../dso-edit-metadata.component.html          |  0
 .../dso-edit-metadata.component.scss          |  0
 .../dso-edit-metadata.component.ts            | 12 +++++++
 src/themes/custom/lazy-theme.module.ts        |  6 ++--
 8 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts
 create mode 100644 src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
 create mode 100644 src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
 create mode 100644 src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts

diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
index ba18fa69b9..4d630659e8 100644
--- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
+++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
@@ -3,7 +3,7 @@
     <div class="col-12" *ngVar="(itemRD$ | async) as itemRD">
       <ng-container *ngIf="itemRD?.hasSucceeded">
         <h2 class="border-bottom">{{ 'collection.edit.template.head' | translate:{ collection: collection?.name } }}</h2>
-        <ds-dso-edit-metadata [updateDataService]="itemTemplateService" [dso]="itemRD?.payload"></ds-dso-edit-metadata>
+        <ds-themed-dso-edit-metadata [updateDataService]="itemTemplateService" [dso]="itemRD?.payload"></ds-themed-dso-edit-metadata>
         <button [routerLink]="getCollectionEditUrl(collection)" class="btn btn-outline-secondary">{{ 'collection.edit.template.cancel' | translate }}</button>
       </ng-container>
       <ds-themed-loading *ngIf="itemRD?.isLoading" [message]="'collection.edit.template.loading' | translate"></ds-themed-loading>
diff --git a/src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts
new file mode 100644
index 0000000000..ba21907c99
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts
@@ -0,0 +1,33 @@
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { DsoEditMetadataComponent } from './dso-edit-metadata.component';
+import { Component, Input } from '@angular/core';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { UpdateDataService } from '../../core/data/update-data.service';
+
+@Component({
+  selector: 'ds-themed-dso-edit-metadata',
+  styleUrls: [],
+  templateUrl: './../../shared/theme-support/themed.component.html',
+})
+export class ThemedDsoEditMetadataComponent extends ThemedComponent<DsoEditMetadataComponent> {
+
+  @Input() dso: DSpaceObject;
+
+  @Input() updateDataService: UpdateDataService<DSpaceObject>;
+
+  protected inAndOutputNames: (keyof DsoEditMetadataComponent & keyof this)[] = ['dso', 'updateDataService'];
+
+  protected getComponentName(): string {
+    return 'DsoEditMetadataComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./dso-edit-metadata.component`);
+  }
+
+
+}
diff --git a/src/app/dso-shared/dso-shared.module.ts b/src/app/dso-shared/dso-shared.module.ts
index 0a9294105b..e09cbac915 100644
--- a/src/app/dso-shared/dso-shared.module.ts
+++ b/src/app/dso-shared/dso-shared.module.ts
@@ -5,6 +5,7 @@ import { MetadataFieldSelectorComponent } from './dso-edit-metadata/metadata-fie
 import { DsoEditMetadataFieldValuesComponent } from './dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component';
 import { DsoEditMetadataValueComponent } from './dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component';
 import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component';
+import { ThemedDsoEditMetadataComponent } from './dso-edit-metadata/themed-dso-edit-metadata.component';
 
 @NgModule({
   imports: [
@@ -12,6 +13,7 @@ import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata/dso-edit-me
   ],
   declarations: [
     DsoEditMetadataComponent,
+    ThemedDsoEditMetadataComponent,
     MetadataFieldSelectorComponent,
     DsoEditMetadataFieldValuesComponent,
     DsoEditMetadataValueComponent,
@@ -19,6 +21,11 @@ import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata/dso-edit-me
   ],
   exports: [
     DsoEditMetadataComponent,
+    ThemedDsoEditMetadataComponent,
+    MetadataFieldSelectorComponent,
+    DsoEditMetadataFieldValuesComponent,
+    DsoEditMetadataValueComponent,
+    DsoEditMetadataHeadersComponent,
   ],
 })
 export class DsoSharedModule {
diff --git a/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
index 7ccf1fec37..47bf41335f 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
@@ -38,6 +38,7 @@ import { ItemPageRelationshipsGuard } from './item-page-relationships.guard';
 import { ItemPageVersionHistoryGuard } from './item-page-version-history.guard';
 import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.guard';
 import { DsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/dso-edit-metadata.component';
+import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component';
 
 /**
  * Routing module that handles the routing for the Edit Item page administrator functionality
@@ -75,7 +76,7 @@ import { DsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/dso
               },
               {
                 path: 'metadata',
-                component: DsoEditMetadataComponent,
+                component: ThemedDsoEditMetadataComponent,
                 data: { title: 'item.edit.tabs.metadata.title', showBreadcrumbs: true },
                 canActivate: [ItemPageMetadataGuard]
               },
diff --git a/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
new file mode 100644
index 0000000000..b1cd6d2b39
--- /dev/null
+++ b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -0,0 +1,12 @@
+import { DsoEditMetadataComponent as BaseComponent } from '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component';
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-dso-edit-metadata',
+  // styleUrls: ['./dso-edit-metadata.component.scss'],
+  styleUrls: ['../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss'],
+  // templateUrl: './dso-edit-metadata.component.html',
+  templateUrl: '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html',
+})
+export class DsoEditMetadataComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index a57c4178a7..3c618a5746 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -113,6 +113,8 @@ import { ObjectListComponent } from './app/shared/object-list/object-list.compon
 import { BrowseByMetadataPageComponent } from './app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component';
 import { BrowseByDatePageComponent } from './app/browse-by/browse-by-date-page/browse-by-date-page.component';
 import { BrowseByTitlePageComponent } from './app/browse-by/browse-by-title-page/browse-by-title-page.component';
+import { DsoEditMetadataComponent } from './app/dso-shared/dso-edit-metadata/dso-edit-metadata.component';
+import { DsoSharedModule } from '../../app/dso-shared/dso-shared.module';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -166,8 +168,7 @@ const DECLARATIONS = [
   BrowseByMetadataPageComponent,
   BrowseByDatePageComponent,
   BrowseByTitlePageComponent,
-
-
+  DsoEditMetadataComponent,
 ];
 
 @NgModule({
@@ -218,6 +219,7 @@ const DECLARATIONS = [
     FormsModule,
     ResourcePoliciesModule,
     ComcolModule,
+    DsoSharedModule,
   ],
   declarations: DECLARATIONS,
   exports: [

From 57f10fa9eb3d93fef491a67e66b355f24fe27255 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 5 Jan 2023 11:47:53 +0100
Subject: [PATCH 086/160] v1.22.19

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 52b089be37..0f41cec0c8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "7.5.0-next",
+  "version": "1.22.19",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",

From 9f61109e8373edfb6b45b7d3511b211102faebdb Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 5 Jan 2023 13:07:31 +0100
Subject: [PATCH 087/160] 97742: Lint fix

---
 .../dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
index 2c584fb534..8206ec9135 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { MetadataMap, MetadataValue } from '../../core/shared/metadata.models';
 import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { MoveOperation, Operation } from 'fast-json-patch';
@@ -7,8 +8,6 @@ import { MetadataPatchAddOperation } from '../../core/data/object-updates/patch-
 import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service';
 import { MetadataPatchMoveOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model';
 
-/* tslint:disable:max-classes-per-file */
-
 /**
  * Enumeration for the type of change occurring on a metadata value
  */
@@ -452,4 +451,3 @@ export class DsoEditMetadataForm {
     return operations;
   }
 }
-/* tslint:enable:max-classes-per-file */

From 8cbf3511bb902ff0737ece47fa03dd15a3539b05 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 5 Jan 2023 13:13:40 +0100
Subject: [PATCH 088/160] 97742: Lint fixes

---
 .../metadata-field-selector.component.ts                        | 2 +-
 .../item-page/edit-item-page/edit-item-page.routing.module.ts   | 1 -
 .../metadata-representation-list.component.spec.ts              | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
index 066f671301..5053a4b83d 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
@@ -12,7 +12,7 @@ import {
 import { switchMap, debounceTime, distinctUntilChanged, map, tap, take } from 'rxjs/operators';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import {
-  getAllSucceededRemoteData, getFirstCompletedRemoteData, getFirstSucceededRemoteData,
+  getAllSucceededRemoteData, getFirstCompletedRemoteData,
   metadataFieldsToString
 } from '../../../core/shared/operators';
 import { Observable } from 'rxjs/internal/Observable';
diff --git a/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
index 47bf41335f..e6fa53f3f3 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
@@ -37,7 +37,6 @@ import { ItemPageBitstreamsGuard } from './item-page-bitstreams.guard';
 import { ItemPageRelationshipsGuard } from './item-page-relationships.guard';
 import { ItemPageVersionHistoryGuard } from './item-page-version-history.guard';
 import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.guard';
-import { DsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/dso-edit-metadata.component';
 import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component';
 
 /**
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 7321e57b9f..54420721b8 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
@@ -4,8 +4,6 @@ import { By } from '@angular/platform-browser';
 import { MetadataRepresentationListComponent } from './metadata-representation-list.component';
 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';
 import { TranslateModule } from '@ngx-translate/core';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { of as observableOf } from 'rxjs';

From 594f8eaa779a06ac5ade960d4b7913fa78285e87 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Thu, 5 Jan 2023 13:18:36 +0100
Subject: [PATCH 089/160] Fix breadcrumb color css

---
 src/app/breadcrumbs/breadcrumbs.component.scss | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/breadcrumbs/breadcrumbs.component.scss b/src/app/breadcrumbs/breadcrumbs.component.scss
index 412dca87db..029609e6c0 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.scss
+++ b/src/app/breadcrumbs/breadcrumbs.component.scss
@@ -23,9 +23,12 @@ li.breadcrumb-item {
   }
 }
 
-li.breadcrumb-item > a {
-  color: var(--ds-breadcrumb-link-color) !important;
+li.breadcrumb-item {
+    a {
+        color: var(--ds-breadcrumb-link-color) !important;
+    }
 }
+
 li.breadcrumb-item.active {
   color: var(--ds-breadcrumb-link-active-color) !important;
 }

From e5082ffa1f1be76e421589c3388c1ffc1b69309d Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Thu, 5 Jan 2023 13:30:28 +0100
Subject: [PATCH 090/160] Remove unneeded important

---
 src/app/breadcrumbs/breadcrumbs.component.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/breadcrumbs/breadcrumbs.component.scss b/src/app/breadcrumbs/breadcrumbs.component.scss
index 029609e6c0..a4d83b82ea 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.scss
+++ b/src/app/breadcrumbs/breadcrumbs.component.scss
@@ -25,12 +25,12 @@ li.breadcrumb-item {
 
 li.breadcrumb-item {
     a {
-        color: var(--ds-breadcrumb-link-color) !important;
+        color: var(--ds-breadcrumb-link-color);
     }
 }
 
 li.breadcrumb-item.active {
-  color: var(--ds-breadcrumb-link-active-color) !important;
+  color: var(--ds-breadcrumb-link-active-color);
 }
 
 .breadcrumb-item+ .breadcrumb-item::before {

From 5da65b3c791e573d4d43046080c5a23c49ac2530 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 5 Jan 2023 13:42:25 +0100
Subject: [PATCH 091/160] 97742: Revert accidental dspace-angular version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0f41cec0c8..52b089be37 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "1.22.19",
+  "version": "7.5.0-next",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",

From 10bf18fe29c0dedb7bdaa52bdbb16ddef35e967e Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Mon, 2 Jan 2023 15:33:25 +0100
Subject: [PATCH 092/160] 97399 WIP: Tests for ContextHelpDirective

---
 .../page-internal-server-error.component.html |  2 +-
 .../context-help-wrapper.component.ts         |  6 +-
 src/app/shared/context-help.directive.spec.ts | 65 +++++++++++++++++--
 src/app/shared/context-help.directive.ts      |  8 +--
 4 files changed, 69 insertions(+), 12 deletions(-)

diff --git a/src/app/page-internal-server-error/page-internal-server-error.component.html b/src/app/page-internal-server-error/page-internal-server-error.component.html
index 4995afc80b..595fd9961b 100644
--- a/src/app/page-internal-server-error/page-internal-server-error.component.html
+++ b/src/app/page-internal-server-error/page-internal-server-error.component.html
@@ -1,6 +1,6 @@
 <div class="page-internal-server-error container">
   <h1>500</h1>
-  <h2><small>{{"500.page-internal-server-error" | translate}}</small></h2>
+  <h2><small *dsContextHelp="{content: 'context-help.multi-para.test'}">{{"500.page-internal-server-error" | translate}}</small></h2>
   <br/>
   <p>{{"500.help" | translate}}</p>
   <br/>
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
index 1792425798..0ef535bf95 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
@@ -53,7 +53,7 @@ export class ContextHelpWrapperComponent {
    * into link-free pieces of text and objects of the form
    * {href: string, text: string} (which represent links).
    * This function makes no effort to check whether the href is a
-   * correct URL. Currently this function does not support escape
+   * correct URL. Currently, this function does not support escape
    * characters: its behavior when given a string containing square
    * brackets that do not deliminate a link is undefined.
    * Regular parentheses outside of links do work, however.
@@ -66,7 +66,7 @@ export class ContextHelpWrapperComponent {
    *   " is a link, and ",
    *   {href: "https://youtube.com", text: "so is this"}
    * ]
-   */ 
+   */
   private parseLinks(content: string): (string | {href: string, text: string})[] {
     // Implementation note: due to unavailability of `matchAll` method on strings,
     // separate "split" and "parse" steps are needed.
@@ -93,4 +93,4 @@ export class ContextHelpWrapperComponent {
 }
 
 
-  
+
diff --git a/src/app/shared/context-help.directive.spec.ts b/src/app/shared/context-help.directive.spec.ts
index f00fb9d355..35770b6038 100644
--- a/src/app/shared/context-help.directive.spec.ts
+++ b/src/app/shared/context-help.directive.spec.ts
@@ -1,8 +1,65 @@
-import { ContextHelpDirective } from './context-help.directive';
+import { Component, DebugElement, Input } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { of as observableOf, Observable } from 'rxjs';
+import { ContextHelpDirective, ContextHelpDirectiveInput } from './context-help.directive';
+import { TranslateService } from '@ngx-translate/core';
+import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component';
+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+
+@Component({
+  template: `<div *dsContextHelp="contextHelpParams()">some text</div>`
+})
+class TestComponent {
+  @Input() content = '';
+  contextHelpParams(): ContextHelpDirectiveInput {
+    return {
+      content: this.content
+    };
+  }
+}
+
+// tslint:disable-next-line:max-classes-per-file
+class MockTranslateService {
+  messages: {[index: string]: string} = {
+    lorem: 'lorem ipsum dolor sit amet',
+    linkTest: 'This is text, [this](https://dspace.lyrasis.org) is a link, and [so is this](https://google.com)'
+  };
+
+  get(key: string): Observable<string> {
+    return observableOf(this.messages[key]);
+  }
+}
 
 describe('ContextHelpDirective', () => {
-  it('should create an instance', () => {
-    const directive = new ContextHelpDirective();
-    expect(directive).toBeTruthy();
+  let component: TestComponent;
+  let fixture: ComponentFixture<TestComponent>;
+  // let el: DebugElement;
+  // let translateService: TranslateService;
+
+  beforeEach(() => {
+    console.log('Anyone hear that?');
+    fixture = TestBed.configureTestingModule({
+      imports: [NgbTooltipModule],
+      providers: [
+        { provide: TranslateService, useClass: MockTranslateService }
+      ],
+      declarations: [TestComponent, ContextHelpWrapperComponent, ContextHelpDirective]
+    }).createComponent(TestComponent);
+    component = fixture.componentInstance;
+  });
+
+  it('should add the tooltip icon', () => {
+    component.content = 'lorem';
+    fixture.detectChanges();
+
+    expect(component).toBeDefined();
+    const [wrapper] = fixture.nativeElement.children;
+    const [i, div] = wrapper.children;
+    expect(wrapper.tagName).toBe('DS-CONTEXT-HELP-WRAPPER');
+    expect(i.tagName).toBe('I');
+    expect(div.tagName).toBe('DIV');
+    expect(div.innerHTML).toBe('some text');
+    i.click(); // TODO: triggers a type error
   });
 });
diff --git a/src/app/shared/context-help.directive.ts b/src/app/shared/context-help.directive.ts
index 4ffa4d24d6..1d8bcccfa7 100644
--- a/src/app/shared/context-help.directive.ts
+++ b/src/app/shared/context-help.directive.ts
@@ -3,10 +3,10 @@ import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
 import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component';
 import { PlacementDir } from './context-help-wrapper/placement-dir.model';
 
-export type ContextHelpDirectiveInput = {
-  content: string,
-  tooltipPlacement?: PlacementArray,
-  iconPlacement?: PlacementDir
+export interface ContextHelpDirectiveInput {
+  content: string;
+  tooltipPlacement?: PlacementArray;
+  iconPlacement?: PlacementDir;
 }
 
 /*

From c156e1ca6f57c9c914a772e349ea8182ff54ad73 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Wed, 4 Jan 2023 11:43:15 +0100
Subject: [PATCH 093/160] 97732 Context help model, actions and reducer

---
 src/app/shared/context-help.actions.ts      | 81 +++++++++++++++++++++
 src/app/shared/context-help.model.ts        |  4 +
 src/app/shared/context-help.reducer.ts      | 47 ++++++++++++
 src/app/shared/context-help.service.spec.ts | 16 ++++
 src/app/shared/context-help.service.ts      | 33 +++++++++
 5 files changed, 181 insertions(+)
 create mode 100644 src/app/shared/context-help.actions.ts
 create mode 100644 src/app/shared/context-help.model.ts
 create mode 100644 src/app/shared/context-help.reducer.ts
 create mode 100644 src/app/shared/context-help.service.spec.ts
 create mode 100644 src/app/shared/context-help.service.ts

diff --git a/src/app/shared/context-help.actions.ts b/src/app/shared/context-help.actions.ts
new file mode 100644
index 0000000000..2bd8b6a163
--- /dev/null
+++ b/src/app/shared/context-help.actions.ts
@@ -0,0 +1,81 @@
+import { Action } from '@ngrx/store';
+import { type } from './ngrx/type';
+import { ContextHelpModel } from './context-help.model';
+
+export const ContextHelpActionTypes = {
+  'CONTEXT_HELP_TOGGLE_ICONS': type('dspace/context-help/CONTEXT_HELP_TOGGLE_ICONS'),
+  'CONTEXT_HELP_ADD': type('dspace/context-help/CONTEXT_HELP_ADD'),
+  'CONTEXT_HELP_REMOVE': type('dspace/context-help/CONTEXT_HELP_REMOVE'),
+  'CONTEXT_HELP_TOGGLE_TOOLTIP': type('dspace/context-help/CONTEXT_HELP_TOGGLE_TOOLTIP'),
+  'CONTEXT_HELP_SHOW_TOOLTIP': type('dspace/context-help/CONTEXT_HELP_SHOW_TOOLTIP'),
+  'CONTEXT_HELP_HIDE_TOOLTIP' : type('dspace/context-help/CONTEXT_HELP_HIDE_TOOLTIP'),
+};
+
+/**
+ * Toggles the visibility of all context help icons.
+ */
+export class ContextHelpToggleIconsAction implements Action {
+  type = ContextHelpActionTypes.CONTEXT_HELP_TOGGLE_ICONS;
+}
+
+/**
+ * Registers a new context help icon to the store.
+ */
+export class ContextHelpAddAction implements Action {
+  type = ContextHelpActionTypes.CONTEXT_HELP_ADD;
+  model: ContextHelpModel;
+
+  constructor (model: ContextHelpModel) {
+    this.model = model;
+  }
+}
+
+/**
+ * Removes a context help icon from the store.
+ */
+export class ContextHelpRemoveAction implements Action {
+  type = ContextHelpActionTypes.CONTEXT_HELP_REMOVE;
+  id: string;
+
+  constructor(id: string) {
+    this.id = id;
+  }
+}
+
+export abstract class ContextHelpTooltipAction implements Action {
+  type;
+  id: string;
+
+  constructor(id: string) {
+    this.id = id;
+  }
+}
+
+/**
+ * Toggles the tooltip of a single context help icon.
+ */
+export class ContextHelpToggleTooltipAction extends ContextHelpTooltipAction {
+  type = ContextHelpActionTypes.CONTEXT_HELP_TOGGLE_TOOLTIP;
+}
+
+/**
+ * Shows the tooltip of a single context help icon.
+ */
+export class ContextHelpShowTooltipAction extends ContextHelpTooltipAction {
+  type = ContextHelpActionTypes.CONTEXT_HELP_SHOW_TOOLTIP;
+}
+
+/**
+ * Hides the tooltip of a single context help icon.
+ */
+export class ContextHelpHideTooltipAction extends ContextHelpTooltipAction {
+  type = ContextHelpActionTypes.CONTEXT_HELP_HIDE_TOOLTIP;
+}
+
+export type ContextHelpAction
+  = ContextHelpToggleIconsAction
+  | ContextHelpAddAction
+  | ContextHelpRemoveAction
+  | ContextHelpToggleTooltipAction
+  | ContextHelpShowTooltipAction
+  | ContextHelpHideTooltipAction;
diff --git a/src/app/shared/context-help.model.ts b/src/app/shared/context-help.model.ts
new file mode 100644
index 0000000000..4b2b344f60
--- /dev/null
+++ b/src/app/shared/context-help.model.ts
@@ -0,0 +1,4 @@
+export class ContextHelpModel {
+  id: string;
+  tooltipVisible?: boolean = false;
+}
diff --git a/src/app/shared/context-help.reducer.ts b/src/app/shared/context-help.reducer.ts
new file mode 100644
index 0000000000..b5f683956f
--- /dev/null
+++ b/src/app/shared/context-help.reducer.ts
@@ -0,0 +1,47 @@
+import { ContextHelpModel } from './context-help.model';
+import { ContextHelpAction, ContextHelpActionTypes } from './context-help.actions';
+
+export type ContextHelpModels = {
+  [id: string]: ContextHelpModel;
+};
+
+export interface ContextHelpState {
+  allIconsVisible: boolean;
+  models: ContextHelpModels;
+}
+
+export function contextHelpReducer(state: ContextHelpState, action: ContextHelpAction): ContextHelpState {
+  switch (action.type) {
+    case ContextHelpActionTypes.CONTEXT_HELP_TOGGLE_ICONS: {
+      return {...state, allIconsVisible: true};
+    }
+    case ContextHelpActionTypes.CONTEXT_HELP_ADD: {
+      const newModels = {...state.models, [action.model.id]: action.model};
+      return {...state, models: newModels};
+    }
+    case ContextHelpActionTypes.CONTEXT_HELP_REMOVE: {
+      const {[action.id]: _, ...remainingModels} = state.models;
+      return {...state, models: remainingModels};
+    }
+    case ContextHelpActionTypes.CONTEXT_HELP_TOGGLE_TOOLTIP: {
+      return modifyTooltipVisibility(state, action.id, v => !v);
+    }
+    case ContextHelpActionTypes.CONTEXT_HELP_SHOW_TOOLTIP: {
+      return modifyTooltipVisibility(state, action.id, _ => true);
+    }
+    case ContextHelpActionTypes.CONTEXT_HELP_HIDE_TOOLTIP: {
+      return modifyTooltipVisibility(state, action.id, _ => false);
+    }
+    default: {
+      return state;
+    }
+  }
+}
+
+function modifyTooltipVisibility(state: ContextHelpState, id: string, modify: (vis: boolean) => boolean)
+  : ContextHelpState {
+  const {[id]: matchingModel, ...otherModels} = state.models;
+  const modifiedModel = {...matchingModel, tooltipVisible: modify(matchingModel.tooltipVisible)};
+  const newModels = {...otherModels, [id]: modifiedModel};
+  return {...state, models: newModels};
+}
diff --git a/src/app/shared/context-help.service.spec.ts b/src/app/shared/context-help.service.spec.ts
new file mode 100644
index 0000000000..d2d29121b0
--- /dev/null
+++ b/src/app/shared/context-help.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ContextHelpService } from './context-help.service';
+
+describe('ContextHelpService', () => {
+  let service: ContextHelpService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ContextHelpService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/context-help.service.ts b/src/app/shared/context-help.service.ts
new file mode 100644
index 0000000000..071308c713
--- /dev/null
+++ b/src/app/shared/context-help.service.ts
@@ -0,0 +1,33 @@
+import { Injectable } from '@angular/core';
+import { ContextHelpModel } from './context-help.model';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ContextHelpService {
+  constructor() { }
+
+  toggleIcons() {
+
+  }
+
+  add(contextHelp: ContextHelpModel) {
+
+  }
+
+  remove(id: string) {
+
+  }
+
+  showTooltip(id: string) {
+
+  }
+
+  hideTooltip(id: string) {
+
+  }
+
+  toggleTooltip(id: string) {
+
+  }
+}

From 5ba45cb0fac564bfd701a92da6824b831ada0976 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Wed, 4 Jan 2023 15:54:09 +0100
Subject: [PATCH 094/160] 97732 Context help service, changes to directive and
 component

---
 src/app/app.reducer.ts                        |  5 +-
 .../page-internal-server-error.component.html |  2 +-
 .../context-help-wrapper.component.html       |  8 +-
 .../context-help-wrapper.component.ts         | 75 +++++++++++++--
 src/app/shared/context-help.actions.ts        |  6 +-
 src/app/shared/context-help.directive.ts      | 48 +++++++---
 src/app/shared/context-help.model.ts          |  4 +-
 src/app/shared/context-help.reducer.ts        | 11 ++-
 src/app/shared/context-help.service.ts        | 95 ++++++++++++++++---
 9 files changed, 206 insertions(+), 48 deletions(-)

diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts
index 5bd4f745d9..e842c0efd3 100644
--- a/src/app/app.reducer.ts
+++ b/src/app/app.reducer.ts
@@ -50,6 +50,7 @@ import { sidebarReducer, SidebarState } from './shared/sidebar/sidebar.reducer';
 import { truncatableReducer, TruncatablesState } from './shared/truncatable/truncatable.reducer';
 import { ThemeState, themeReducer } from './shared/theme-support/theme.reducer';
 import { correlationIdReducer } from './correlation-id/correlation-id.reducer';
+import { contextHelpReducer, ContextHelpState } from './shared/context-help.reducer';
 
 export interface AppState {
   router: fromRouter.RouterReducerState;
@@ -71,6 +72,7 @@ export interface AppState {
   epeopleRegistry: EPeopleRegistryState;
   groupRegistry: GroupRegistryState;
   correlationId: string;
+  contextHelp: ContextHelpState;
 }
 
 export const appReducers: ActionReducerMap<AppState> = {
@@ -92,7 +94,8 @@ export const appReducers: ActionReducerMap<AppState> = {
   communityList: CommunityListReducer,
   epeopleRegistry: ePeopleRegistryReducer,
   groupRegistry: groupRegistryReducer,
-  correlationId: correlationIdReducer
+  correlationId: correlationIdReducer,
+  contextHelp: contextHelpReducer,
 };
 
 export const routerStateSelector = (state: AppState) => state.router;
diff --git a/src/app/page-internal-server-error/page-internal-server-error.component.html b/src/app/page-internal-server-error/page-internal-server-error.component.html
index 595fd9961b..bb43cdc678 100644
--- a/src/app/page-internal-server-error/page-internal-server-error.component.html
+++ b/src/app/page-internal-server-error/page-internal-server-error.component.html
@@ -1,6 +1,6 @@
 <div class="page-internal-server-error container">
   <h1>500</h1>
-  <h2><small *dsContextHelp="{content: 'context-help.multi-para.test'}">{{"500.page-internal-server-error" | translate}}</small></h2>
+  <h2><small *dsContextHelp="{content: 'context-help.multi-para.test', id: 'server-error'}">{{"500.page-internal-server-error" | translate}}</small></h2>
   <br/>
   <p>{{"500.help" | translate}}</p>
   <br/>
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.html b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
index 939ad8323c..03fc46c172 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
@@ -10,12 +10,16 @@
         </ng-container>
     </div>
 </ng-template>
-<i [ngClass]="{'ds-context-help-icon fas fa-question-circle shadow-sm': true,
+<i *ngIf="shouldShowIcon$ | async"
+   [ngClass]="{'ds-context-help-icon fas fa-question-circle shadow-sm': true,
               'ds-context-help-icon-right': iconPlacement !== 'left',
               'ds-context-help-icon-left': iconPlacement === 'left'}"
    [ngbTooltip]="help"
    [placement]="tooltipPlacement"
+   autoClose="outside"
+   triggers="manual"
    container="'body'"
-   triggers="click:blur">
+   #tooltip="ngbTooltip"
+   (click)="onClick()">
 </i>
 <ng-container *ngTemplateOutlet="templateRef"></ng-container>
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
index 0ef535bf95..e4e22d7ebc 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
@@ -1,11 +1,16 @@
-import { Component, Input, OnInit, TemplateRef } from '@angular/core';
+import { Component, Input, OnInit, TemplateRef, OnDestroy, AfterViewInit, ViewChild } from '@angular/core';
 import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
+import { Observable, of as observableOf, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { PlacementDir } from './placement-dir.model';
+import content from '*.scss';
+import { ContextHelpService } from '../context-help.service';
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
+import { hasValueOperator } from '../empty.util';
+import { ContextHelp } from '../context-help.model';
 
-/*
+/**
  * This component renders an info icon next to the wrapped element which
  * produces a tooltip when clicked.
  */
@@ -14,28 +19,39 @@ import { PlacementDir } from './placement-dir.model';
   templateUrl: './context-help-wrapper.component.html',
   styleUrls: ['./context-help-wrapper.component.scss'],
 })
-export class ContextHelpWrapperComponent {
-  /*
+export class ContextHelpWrapperComponent implements OnInit, AfterViewInit, OnDestroy {
+  /**
    * Template reference for the wrapped element.
    */
   @Input() templateRef: TemplateRef<any>;
 
-  /*
+  /**
+   * Identifier for the context help tooltip.
+   */
+  @Input() id: string;
+
+  /**
    * Indicate where the tooltip should show up, relative to the info icon.
    */
   @Input() tooltipPlacement?: PlacementArray;
 
-  /*
+  /**
    * Indicate whether the info icon should appear to the left or to
    * the right of the wrapped element.
    */
   @Input() iconPlacement?: PlacementDir;
 
-  /*
+  /**
    * If true, don't process text to render links.
    */
   @Input() dontParseLinks?: boolean;
 
+  @ViewChild('tooltip', { static: false }) tooltip: NgbTooltip;
+
+  shouldShowIcon$: Observable<boolean>;
+
+  private subs: Subscription[] = [];
+
   // TODO: dependent on evaluation order of input setters?
   parsedContent$: Observable<(string | {href: string, text: string})[]> = observableOf([]);
   @Input() set content(content : string) {
@@ -46,9 +62,48 @@ export class ContextHelpWrapperComponent {
     );
   }
 
-  constructor(private translateService: TranslateService) { }
+  constructor(
+    private translateService: TranslateService,
+    private contextHelpService: ContextHelpService
+  ) { }
 
-  /*
+  ngOnInit() {
+    this.shouldShowIcon$ = this.contextHelpService.shouldShowIcons$();
+  }
+
+  ngAfterViewInit() {
+    this.subs = [
+      this.contextHelpService.getContextHelp$(this.id)
+        .pipe(hasValueOperator())
+        .subscribe((ch: ContextHelp) => {
+          if (ch.isTooltipVisible && !this.tooltip.isOpen()) {
+            this.tooltip.open();
+          } else if (!ch.isTooltipVisible && this.tooltip.isOpen()) {
+            this.tooltip.close()
+          }
+        }),
+
+      this.tooltip.shown.subscribe(() => {
+        this.contextHelpService.showTooltip(this.id);
+      }),
+
+      this.tooltip.hidden.subscribe(() => {
+        this.contextHelpService.hideTooltip(this.id);
+      })
+    ];
+  }
+
+  ngOnDestroy() {
+    for (let sub of this.subs) {
+      sub.unsubscribe();
+    }
+  }
+
+  onClick() {
+    this.contextHelpService.toggleTooltip(this.id);
+  }
+
+  /**
    * Parses Markdown-style links, splitting up a given text
    * into link-free pieces of text and objects of the form
    * {href: string, text: string} (which represent links).
diff --git a/src/app/shared/context-help.actions.ts b/src/app/shared/context-help.actions.ts
index 2bd8b6a163..5f985c2f73 100644
--- a/src/app/shared/context-help.actions.ts
+++ b/src/app/shared/context-help.actions.ts
@@ -1,6 +1,6 @@
 import { Action } from '@ngrx/store';
 import { type } from './ngrx/type';
-import { ContextHelpModel } from './context-help.model';
+import { ContextHelp } from './context-help.model';
 
 export const ContextHelpActionTypes = {
   'CONTEXT_HELP_TOGGLE_ICONS': type('dspace/context-help/CONTEXT_HELP_TOGGLE_ICONS'),
@@ -23,9 +23,9 @@ export class ContextHelpToggleIconsAction implements Action {
  */
 export class ContextHelpAddAction implements Action {
   type = ContextHelpActionTypes.CONTEXT_HELP_ADD;
-  model: ContextHelpModel;
+  model: ContextHelp;
 
-  constructor (model: ContextHelpModel) {
+  constructor (model: ContextHelp) {
     this.model = model;
   }
 }
diff --git a/src/app/shared/context-help.directive.ts b/src/app/shared/context-help.directive.ts
index 1d8bcccfa7..89e283715a 100644
--- a/src/app/shared/context-help.directive.ts
+++ b/src/app/shared/context-help.directive.ts
@@ -1,15 +1,28 @@
-import { ComponentFactoryResolver, ComponentRef, Directive, ElementRef, Input, OnChanges, OnInit, TemplateRef, ViewContainerRef } from '@angular/core';
+import {
+  ComponentFactoryResolver,
+  ComponentRef,
+  Directive,
+  ElementRef,
+  Input,
+  OnChanges,
+  OnInit,
+  TemplateRef,
+  ViewContainerRef,
+  OnDestroy
+} from '@angular/core';
 import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
 import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component';
 import { PlacementDir } from './context-help-wrapper/placement-dir.model';
+import { ContextHelpService } from './context-help.service';
 
 export interface ContextHelpDirectiveInput {
   content: string;
+  id: string;
   tooltipPlacement?: PlacementArray;
   iconPlacement?: PlacementDir;
 }
 
-/*
+/**
  * Directive to add a clickable tooltip icon to an element.
  * The tooltip icon's position is configurable ('left' or 'right')
  * and so is the position of the tooltip itself (PlacementArray).
@@ -17,14 +30,15 @@ export interface ContextHelpDirectiveInput {
 @Directive({
   selector: '[dsContextHelp]',
 })
-export class ContextHelpDirective implements OnChanges {
-  /*
+export class ContextHelpDirective implements OnChanges, OnDestroy {
+  /**
    * Expects an object with the following fields:
    * - content: a string referring to an entry in the i18n files
    * - tooltipPlacement: a PlacementArray describing where the tooltip should expand, relative to the tooltip icon
    * - iconPlacement: a string 'left' or 'right', describing where the tooltip icon should be placed, relative to the element
    */
-  @Input() dsContextHelp: string | ContextHelpDirectiveInput;
+  @Input() dsContextHelp: ContextHelpDirectiveInput;
+  mostRecentId: string | undefined = undefined;
 
   protected wrapper: ComponentRef<ContextHelpWrapperComponent>;
 
@@ -32,19 +46,31 @@ export class ContextHelpDirective implements OnChanges {
     private templateRef: TemplateRef<any>,
     private viewContainerRef: ViewContainerRef,
     private componentFactoryResolver: ComponentFactoryResolver,
+    private contextHelpService: ContextHelpService
   ){}
 
   ngOnChanges() {
-    const input: ContextHelpDirectiveInput = typeof(this.dsContextHelp) === 'string'
-      ? {content: this.dsContextHelp}
-      : this.dsContextHelp;
+    this.clearMostRecentId();
+    this.mostRecentId = this.dsContextHelp.id;
+    this.contextHelpService.add({id: this.dsContextHelp.id}); // TODO: tooltipVisible field
 
     const factory
       = this.componentFactoryResolver.resolveComponentFactory(ContextHelpWrapperComponent);
     this.wrapper = this.viewContainerRef.createComponent(factory);
     this.wrapper.instance.templateRef = this.templateRef;
-    this.wrapper.instance.content = input.content;
-    this.wrapper.instance.tooltipPlacement = input.tooltipPlacement;
-    this.wrapper.instance.iconPlacement = input.iconPlacement;
+    this.wrapper.instance.content = this.dsContextHelp.content;
+    this.wrapper.instance.id = this.dsContextHelp.id;
+    this.wrapper.instance.tooltipPlacement = this.dsContextHelp.tooltipPlacement;
+    this.wrapper.instance.iconPlacement = this.dsContextHelp.iconPlacement;
+  }
+
+  ngOnDestroy() {
+    this.clearMostRecentId();
+  }
+
+  private clearMostRecentId(): void {
+    if (this.mostRecentId !== undefined) {
+      this.contextHelpService.remove(this.mostRecentId);
+    }
   }
 }
diff --git a/src/app/shared/context-help.model.ts b/src/app/shared/context-help.model.ts
index 4b2b344f60..9c024dbf1f 100644
--- a/src/app/shared/context-help.model.ts
+++ b/src/app/shared/context-help.model.ts
@@ -1,4 +1,4 @@
-export class ContextHelpModel {
+export class ContextHelp {
   id: string;
-  tooltipVisible?: boolean = false;
+  isTooltipVisible?: boolean = false;
 }
diff --git a/src/app/shared/context-help.reducer.ts b/src/app/shared/context-help.reducer.ts
index b5f683956f..b705c797ac 100644
--- a/src/app/shared/context-help.reducer.ts
+++ b/src/app/shared/context-help.reducer.ts
@@ -1,8 +1,8 @@
-import { ContextHelpModel } from './context-help.model';
+import { ContextHelp } from './context-help.model';
 import { ContextHelpAction, ContextHelpActionTypes } from './context-help.actions';
 
 export type ContextHelpModels = {
-  [id: string]: ContextHelpModel;
+  [id: string]: ContextHelp;
 };
 
 export interface ContextHelpState {
@@ -10,7 +10,10 @@ export interface ContextHelpState {
   models: ContextHelpModels;
 }
 
-export function contextHelpReducer(state: ContextHelpState, action: ContextHelpAction): ContextHelpState {
+// TODO
+const initialState: ContextHelpState = {allIconsVisible: true, models: {}};
+
+export function contextHelpReducer(state: ContextHelpState = initialState, action: ContextHelpAction): ContextHelpState {
   switch (action.type) {
     case ContextHelpActionTypes.CONTEXT_HELP_TOGGLE_ICONS: {
       return {...state, allIconsVisible: true};
@@ -41,7 +44,7 @@ export function contextHelpReducer(state: ContextHelpState, action: ContextHelpA
 function modifyTooltipVisibility(state: ContextHelpState, id: string, modify: (vis: boolean) => boolean)
   : ContextHelpState {
   const {[id]: matchingModel, ...otherModels} = state.models;
-  const modifiedModel = {...matchingModel, tooltipVisible: modify(matchingModel.tooltipVisible)};
+  const modifiedModel = {...matchingModel, isTooltipVisible: modify(matchingModel.isTooltipVisible)};
   const newModels = {...otherModels, [id]: modifiedModel};
   return {...state, models: newModels};
 }
diff --git a/src/app/shared/context-help.service.ts b/src/app/shared/context-help.service.ts
index 071308c713..7bbd1216e1 100644
--- a/src/app/shared/context-help.service.ts
+++ b/src/app/shared/context-help.service.ts
@@ -1,33 +1,100 @@
 import { Injectable } from '@angular/core';
-import { ContextHelpModel } from './context-help.model';
+import { ContextHelp } from './context-help.model';
+import { Store, createFeatureSelector, createSelector, select, MemoizedSelector } from '@ngrx/store';
+import { ContextHelpState } from './context-help.reducer';
+import {
+  ContextHelpToggleIconsAction,
+  ContextHelpAddAction,
+  ContextHelpRemoveAction,
+  ContextHelpShowTooltipAction,
+  ContextHelpHideTooltipAction,
+  ContextHelpToggleTooltipAction
+} from './context-help.actions';
+import { Observable } from 'rxjs';
+
+const contextHelpStateSelector =
+  createFeatureSelector<ContextHelpState>('contextHelp');
+const allIconsVisibleSelector = createSelector(
+  contextHelpStateSelector,
+  (state: ContextHelpState): boolean => state.allIconsVisible
+);
+const contextHelpSelector =
+  (id: string): MemoizedSelector<ContextHelpState, ContextHelp> => createSelector(
+    contextHelpStateSelector,
+    (state: ContextHelpState) => state.models[id]
+  );
 
 @Injectable({
   providedIn: 'root'
 })
 export class ContextHelpService {
-  constructor() { }
+  constructor(private store: Store<ContextHelpState>) { }
 
+  /**
+   * Observable keeping track of whether context help icons should be visible globally.
+   */
+  shouldShowIcons$(): Observable<boolean> {
+    return this.store.pipe(select(allIconsVisibleSelector));
+  }
+
+  /**
+   * Observable that tracks the state for a specific context help icon.
+   *
+   * @param id: id of the context help icon.
+   */
+  getContextHelp$(id: string): Observable<ContextHelp> {
+    return this.store.pipe(select(contextHelpSelector(id)));
+  }
+
+  /**
+   * Toggles the visibility of all context help icons.
+   */
   toggleIcons() {
-
+    this.store.dispatch(new ContextHelpToggleIconsAction());
   }
 
-  add(contextHelp: ContextHelpModel) {
-
+  /**
+   * Registers a new context help icon to the store.
+   *
+   * @param contextHelp: the initial state of the new help icon.
+   */
+  add(contextHelp: ContextHelp) {
+    this.store.dispatch(new ContextHelpAddAction(contextHelp));
   }
 
+  /**
+   * Removes a context help icon from the store.
+   *
+   * @id: the id of the help icon to be removed.
+   */
   remove(id: string) {
-
-  }
-
-  showTooltip(id: string) {
-
-  }
-
-  hideTooltip(id: string) {
-
+    this.store.dispatch(new ContextHelpRemoveAction(id));
   }
 
+  /**
+   * Toggles the tooltip of a single context help icon.
+   *
+   * @id: the id of the help icon for which the visibility will be toggled.
+   */
   toggleTooltip(id: string) {
+    this.store.dispatch(new ContextHelpToggleTooltipAction(id));
+  }
 
+  /**
+   * Shows the tooltip of a single context help icon.
+   *
+   * @id: the id of the help icon that will be made visible.
+   */
+  showTooltip(id: string) {
+    this.store.dispatch(new ContextHelpShowTooltipAction(id));
+  }
+
+  /**
+   * Hides the tooltip of a single context help icon.
+   *
+   * @id: the id of the help icon that will be made invisible.
+   */
+  hideTooltip(id: string) {
+    this.store.dispatch(new ContextHelpHideTooltipAction(id));
   }
 }

From e16a3edf785ec23dd77ab3e4dde579239e3bbdfd Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Wed, 4 Jan 2023 17:02:39 +0100
Subject: [PATCH 095/160] 97732 ContextHelpToggleComponent added

---
 src/app/app.module.ts                         |  2 ++
 .../context-help-toggle.component.html        |  8 ++++++
 .../context-help-toggle.component.scss        |  8 ++++++
 .../context-help-toggle.component.spec.ts     | 25 +++++++++++++++++++
 .../context-help-toggle.component.ts          | 22 ++++++++++++++++
 src/app/header/header.component.html          |  1 +
 .../page-internal-server-error.component.html |  1 +
 .../context-help-wrapper.component.ts         |  5 ++--
 src/app/shared/context-help.reducer.ts        |  2 +-
 9 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 src/app/header/context-help-toggle/context-help-toggle.component.html
 create mode 100644 src/app/header/context-help-toggle/context-help-toggle.component.scss
 create mode 100644 src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
 create mode 100644 src/app/header/context-help-toggle/context-help-toggle.component.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 67bccd9105..189d203256 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -58,6 +58,7 @@ import { ThemedPageInternalServerErrorComponent } from './page-internal-server-e
 import { PageInternalServerErrorComponent } from './page-internal-server-error/page-internal-server-error.component';
 
 import { APP_CONFIG, AppConfig } from '../config/app-config.interface';
+import { ContextHelpToggleComponent } from './header/context-help-toggle/context-help-toggle.component';
 
 export function getConfig() {
   return environment;
@@ -167,6 +168,7 @@ const DECLARATIONS = [
   RootComponent,
   ThemedRootComponent,
   HeaderComponent,
+  ContextHelpToggleComponent,
   ThemedHeaderComponent,
   HeaderNavbarWrapperComponent,
   ThemedHeaderNavbarWrapperComponent,
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.html b/src/app/header/context-help-toggle/context-help-toggle.component.html
new file mode 100644
index 0000000000..caf1bf5daf
--- /dev/null
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.html
@@ -0,0 +1,8 @@
+<div>
+  <a href="javascript:void(0);"
+     role="button"
+     (click)="onClick()"
+  >
+    <i class="fas fa-question-circle ds-context-help-toggle"></i>
+  </a>
+</div>
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.scss b/src/app/header/context-help-toggle/context-help-toggle.component.scss
new file mode 100644
index 0000000000..ba34ba8b89
--- /dev/null
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.scss
@@ -0,0 +1,8 @@
+.ds-context-help-toggle {
+  color: var(--ds-header-icon-color);
+  background-color: var(--ds-header-bg);
+}
+
+.ds-context-help-toggle:hover {
+  color: var(--ds-header-icon-color-hover);
+}
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
new file mode 100644
index 0000000000..16d82f1a0a
--- /dev/null
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ContextHelpToggleComponent } from './context-help-toggle.component';
+
+describe('ContextHelpToggleComponent', () => {
+  let component: ContextHelpToggleComponent;
+  let fixture: ComponentFixture<ContextHelpToggleComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ContextHelpToggleComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ContextHelpToggleComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.ts b/src/app/header/context-help-toggle/context-help-toggle.component.ts
new file mode 100644
index 0000000000..cc5e779d6e
--- /dev/null
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.ts
@@ -0,0 +1,22 @@
+import { Component, OnInit } from '@angular/core';
+import { ContextHelpService } from '../../shared/context-help.service';
+
+@Component({
+  selector: 'ds-context-help-toggle',
+  templateUrl: './context-help-toggle.component.html',
+  styleUrls: ['./context-help-toggle.component.scss']
+})
+export class ContextHelpToggleComponent implements OnInit {
+
+  constructor(
+    private contextHelpService: ContextHelpService
+  ) { }
+
+  ngOnInit(): void {
+  }
+
+  onClick() {
+    console.log('toggling icons');
+    this.contextHelpService.toggleIcons();
+  }
+}
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index c7b979d266..d04f095156 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -8,6 +8,7 @@
       <nav role="navigation" [attr.aria-label]="'nav.user.description' | translate" class="navbar navbar-light navbar-expand-md flex-shrink-0 px-0">
         <ds-search-navbar></ds-search-navbar>
         <ds-lang-switch></ds-lang-switch>
+        <ds-context-help-toggle></ds-context-help-toggle>
         <ds-auth-nav-menu></ds-auth-nav-menu>
         <ds-impersonate-navbar></ds-impersonate-navbar>
         <div class="pl-2">
diff --git a/src/app/page-internal-server-error/page-internal-server-error.component.html b/src/app/page-internal-server-error/page-internal-server-error.component.html
index bb43cdc678..fe72c78d92 100644
--- a/src/app/page-internal-server-error/page-internal-server-error.component.html
+++ b/src/app/page-internal-server-error/page-internal-server-error.component.html
@@ -1,4 +1,5 @@
 <div class="page-internal-server-error container">
+  <ds-context-help-toggle></ds-context-help-toggle>
   <h1>500</h1>
   <h2><small *dsContextHelp="{content: 'context-help.multi-para.test', id: 'server-error'}">{{"500.page-internal-server-error" | translate}}</small></h2>
   <br/>
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
index e4e22d7ebc..4639c12086 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
@@ -69,10 +69,11 @@ export class ContextHelpWrapperComponent implements OnInit, AfterViewInit, OnDes
 
   ngOnInit() {
     this.shouldShowIcon$ = this.contextHelpService.shouldShowIcons$();
+    this.subs.push(this.shouldShowIcon$.subscribe());
   }
 
   ngAfterViewInit() {
-    this.subs = [
+    this.subs.push(
       this.contextHelpService.getContextHelp$(this.id)
         .pipe(hasValueOperator())
         .subscribe((ch: ContextHelp) => {
@@ -90,7 +91,7 @@ export class ContextHelpWrapperComponent implements OnInit, AfterViewInit, OnDes
       this.tooltip.hidden.subscribe(() => {
         this.contextHelpService.hideTooltip(this.id);
       })
-    ];
+    );
   }
 
   ngOnDestroy() {
diff --git a/src/app/shared/context-help.reducer.ts b/src/app/shared/context-help.reducer.ts
index b705c797ac..5176da0adc 100644
--- a/src/app/shared/context-help.reducer.ts
+++ b/src/app/shared/context-help.reducer.ts
@@ -16,7 +16,7 @@ const initialState: ContextHelpState = {allIconsVisible: true, models: {}};
 export function contextHelpReducer(state: ContextHelpState = initialState, action: ContextHelpAction): ContextHelpState {
   switch (action.type) {
     case ContextHelpActionTypes.CONTEXT_HELP_TOGGLE_ICONS: {
-      return {...state, allIconsVisible: true};
+      return {...state, allIconsVisible: !state.allIconsVisible};
     }
     case ContextHelpActionTypes.CONTEXT_HELP_ADD: {
       const newModels = {...state.models, [action.model.id]: action.model};

From 920e36ecf28620571ac28731d4a9ae97397f2b3d Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Thu, 5 Jan 2023 12:06:14 +0100
Subject: [PATCH 096/160] 97732 Fixed bug where ContextHelpWrapperComponent
 subscriptions would not properly be initialized if the application launches
 with help icons hidden by default

---
 src/app/footer/footer.component.html          |  1 +
 .../context-help-toggle.component.html        |  4 +-
 .../context-help-toggle.component.scss        |  6 +-
 .../context-help-toggle.component.ts          |  5 +-
 .../page-internal-server-error.component.html |  1 -
 .../context-help-wrapper.component.scss       |  1 -
 .../context-help-wrapper.component.ts         | 68 +++++++++++--------
 src/app/shared/context-help.directive.ts      |  2 +-
 src/app/shared/context-help.reducer.ts        |  3 +-
 src/assets/i18n/en.json5                      |  2 +
 .../dspace/app/header/header.component.html   |  1 +
 .../dspace/app/navbar/navbar.component.html   |  3 +-
 12 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index 58f264a5ef..8f991b9e41 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -65,6 +65,7 @@
       <ul class="footer-info list-unstyled small d-flex justify-content-center mb-0">
         <li>
             <a *dsContextHelp="{content: 'context-help.multi-para.test',
+                                id: 'show-cookie-settings',
                                 tooltipPlacement: 'top',
                                 iconPlacement: 'left'
                                }"
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.html b/src/app/header/context-help-toggle/context-help-toggle.component.html
index caf1bf5daf..9fba8fa032 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.html
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.html
@@ -2,7 +2,9 @@
   <a href="javascript:void(0);"
      role="button"
      (click)="onClick()"
+     [attr.aria-label]="'nav.context-help-toggle' | translate"
+     [title]="'nav.context-help-toggle' | translate"
   >
-    <i class="fas fa-question-circle ds-context-help-toggle"></i>
+    <i class="fas fa-lg fa-fw fa-question-circle ds-context-help-toggle"></i>
   </a>
 </div>
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.scss b/src/app/header/context-help-toggle/context-help-toggle.component.scss
index ba34ba8b89..89f0c65bd8 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.scss
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.scss
@@ -1,8 +1,8 @@
 .ds-context-help-toggle {
   color: var(--ds-header-icon-color);
   background-color: var(--ds-header-bg);
-}
 
-.ds-context-help-toggle:hover {
-  color: var(--ds-header-icon-color-hover);
+  &:hover, &focus {
+    color: var(--ds-header-icon-color-hover);
+  }
 }
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.ts b/src/app/header/context-help-toggle/context-help-toggle.component.ts
index cc5e779d6e..2956d3ef4c 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ContextHelpService } from '../../shared/context-help.service';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'ds-context-help-toggle',
@@ -9,14 +10,14 @@ import { ContextHelpService } from '../../shared/context-help.service';
 export class ContextHelpToggleComponent implements OnInit {
 
   constructor(
-    private contextHelpService: ContextHelpService
+    private contextHelpService: ContextHelpService,
+    private translateService: TranslateService
   ) { }
 
   ngOnInit(): void {
   }
 
   onClick() {
-    console.log('toggling icons');
     this.contextHelpService.toggleIcons();
   }
 }
diff --git a/src/app/page-internal-server-error/page-internal-server-error.component.html b/src/app/page-internal-server-error/page-internal-server-error.component.html
index fe72c78d92..bb43cdc678 100644
--- a/src/app/page-internal-server-error/page-internal-server-error.component.html
+++ b/src/app/page-internal-server-error/page-internal-server-error.component.html
@@ -1,5 +1,4 @@
 <div class="page-internal-server-error container">
-  <ds-context-help-toggle></ds-context-help-toggle>
   <h1>500</h1>
   <h2><small *dsContextHelp="{content: 'context-help.multi-para.test', id: 'server-error'}">{{"500.page-internal-server-error" | translate}}</small></h2>
   <br/>
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss b/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
index d945548ca4..3bf9c7bba8 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
@@ -13,7 +13,6 @@
   border-radius: 50%;
 }
 
-
 .ds-context-help-icon-left {
     left: var(--ds-context-x-offset);
 }
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
index 4639c12086..68f2ac0002 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
@@ -19,7 +19,7 @@ import { ContextHelp } from '../context-help.model';
   templateUrl: './context-help-wrapper.component.html',
   styleUrls: ['./context-help-wrapper.component.scss'],
 })
-export class ContextHelpWrapperComponent implements OnInit, AfterViewInit, OnDestroy {
+export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
   /**
    * Template reference for the wrapped element.
    */
@@ -46,11 +46,9 @@ export class ContextHelpWrapperComponent implements OnInit, AfterViewInit, OnDes
    */
   @Input() dontParseLinks?: boolean;
 
-  @ViewChild('tooltip', { static: false }) tooltip: NgbTooltip;
-
   shouldShowIcon$: Observable<boolean>;
 
-  private subs: Subscription[] = [];
+  tooltip: NgbTooltip;
 
   // TODO: dependent on evaluation order of input setters?
   parsedContent$: Observable<(string | {href: string, text: string})[]> = observableOf([]);
@@ -62,6 +60,9 @@ export class ContextHelpWrapperComponent implements OnInit, AfterViewInit, OnDes
     );
   }
 
+  private subs: {always: Subscription[], tooltipBound: Subscription[]}
+    = {always: [], tooltipBound: []};
+
   constructor(
     private translateService: TranslateService,
     private contextHelpService: ContextHelpService
@@ -69,35 +70,37 @@ export class ContextHelpWrapperComponent implements OnInit, AfterViewInit, OnDes
 
   ngOnInit() {
     this.shouldShowIcon$ = this.contextHelpService.shouldShowIcons$();
-    this.subs.push(this.shouldShowIcon$.subscribe());
+    this.subs.always = [this.shouldShowIcon$.subscribe()];
   }
 
-  ngAfterViewInit() {
-    this.subs.push(
-      this.contextHelpService.getContextHelp$(this.id)
-        .pipe(hasValueOperator())
-        .subscribe((ch: ContextHelp) => {
-          if (ch.isTooltipVisible && !this.tooltip.isOpen()) {
-            this.tooltip.open();
-          } else if (!ch.isTooltipVisible && this.tooltip.isOpen()) {
-            this.tooltip.close()
-          }
+  @ViewChild('tooltip', { static: false }) set setTooltip(tooltip: NgbTooltip) {
+    this.tooltip = tooltip;
+    this.clearSubs('tooltipBound');
+    if (this.tooltip !== undefined) {
+      this.subs.tooltipBound = [
+        this.contextHelpService.getContextHelp$(this.id)
+          .pipe(hasValueOperator())
+          .subscribe((ch: ContextHelp) => {
+            if (ch.isTooltipVisible && !this.tooltip.isOpen()) {
+              this.tooltip.open();
+            } else if (!ch.isTooltipVisible && this.tooltip.isOpen()) {
+              this.tooltip.close();
+            }
+          }),
+
+        this.tooltip.shown.subscribe(() => {
+          this.contextHelpService.showTooltip(this.id);
         }),
 
-      this.tooltip.shown.subscribe(() => {
-        this.contextHelpService.showTooltip(this.id);
-      }),
-
-      this.tooltip.hidden.subscribe(() => {
-        this.contextHelpService.hideTooltip(this.id);
-      })
-    );
+        this.tooltip.hidden.subscribe(() => {
+          this.contextHelpService.hideTooltip(this.id);
+        })
+      ];
+    }
   }
 
   ngOnDestroy() {
-    for (let sub of this.subs) {
-      sub.unsubscribe();
-    }
+    this.clearSubs();
   }
 
   onClick() {
@@ -146,7 +149,14 @@ export class ContextHelpWrapperComponent implements OnInit, AfterViewInit, OnDes
         : ({href: match[2], text: match[1]});
     });
   }
+
+  private clearSubs(filter: null | 'tooltipBound' = null) {
+    if (filter === null) {
+      [].concat(...Object.values(this.subs)).forEach(sub => sub.unsubscribe());
+      this.subs = {always: [], tooltipBound: []};
+    } else {
+      this.subs[filter].forEach(sub => sub.unsubscribe());
+      this.subs[filter] = [];
+    }
+  }
 }
-
-
-
diff --git a/src/app/shared/context-help.directive.ts b/src/app/shared/context-help.directive.ts
index 89e283715a..56e7514b98 100644
--- a/src/app/shared/context-help.directive.ts
+++ b/src/app/shared/context-help.directive.ts
@@ -52,7 +52,7 @@ export class ContextHelpDirective implements OnChanges, OnDestroy {
   ngOnChanges() {
     this.clearMostRecentId();
     this.mostRecentId = this.dsContextHelp.id;
-    this.contextHelpService.add({id: this.dsContextHelp.id}); // TODO: tooltipVisible field
+    this.contextHelpService.add({id: this.dsContextHelp.id, isTooltipVisible: false});
 
     const factory
       = this.componentFactoryResolver.resolveComponentFactory(ContextHelpWrapperComponent);
diff --git a/src/app/shared/context-help.reducer.ts b/src/app/shared/context-help.reducer.ts
index 5176da0adc..13e9488dfd 100644
--- a/src/app/shared/context-help.reducer.ts
+++ b/src/app/shared/context-help.reducer.ts
@@ -10,8 +10,7 @@ export interface ContextHelpState {
   models: ContextHelpModels;
 }
 
-// TODO
-const initialState: ContextHelpState = {allIconsVisible: true, models: {}};
+const initialState: ContextHelpState = {allIconsVisible: false, models: {}};
 
 export function contextHelpReducer(state: ContextHelpState = initialState, action: ContextHelpAction): ContextHelpState {
   switch (action.type) {
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 4151e4202d..473dab6090 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2674,6 +2674,8 @@
 
   "nav.community-browse.header": "By Community",
 
+  "nav.context-help-toggle": "Toggle context help",
+
   "nav.language": "Language switch",
 
   "nav.login": "Log In",
diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html
index cf691ea6c4..43c252035d 100644
--- a/src/themes/dspace/app/header/header.component.html
+++ b/src/themes/dspace/app/header/header.component.html
@@ -8,6 +8,7 @@
     <div class="d-flex flex-grow-1 ml-auto justify-content-end align-items-center">
       <ds-search-navbar class="navbar-search"></ds-search-navbar>
       <ds-lang-switch></ds-lang-switch>
+      <ds-context-help-toggle></ds-context-help-toggle>
       <ds-auth-nav-menu></ds-auth-nav-menu>
       <ds-impersonate-navbar></ds-impersonate-navbar>
       <div class="pl-2">
diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html
index f061c7cb3b..75f693fcfa 100644
--- a/src/themes/dspace/app/navbar/navbar.component.html
+++ b/src/themes/dspace/app/navbar/navbar.component.html
@@ -14,7 +14,8 @@
     </div>
     <ds-search-navbar class="navbar-collapsed"></ds-search-navbar>
     <ds-lang-switch class="navbar-collapsed"></ds-lang-switch>
+    <ds-context-help-toggle class="navbar-collapsed"></ds-context-help-toggle>
     <ds-auth-nav-menu class="navbar-collapsed"></ds-auth-nav-menu>
     <ds-impersonate-navbar class="navbar-collapsed"></ds-impersonate-navbar>
   </div>
-</nav>
\ No newline at end of file
+</nav>

From 5a1e57408fd546df71d500981c3fb2bd3274be22 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Thu, 5 Jan 2023 13:21:50 +0100
Subject: [PATCH 097/160] 97732 Fixed some display issues

---
 .../page-internal-server-error.component.html |  7 ++++++-
 .../context-help-wrapper.component.html       |  2 +-
 .../context-help-wrapper.component.scss       | 19 ++++++++++---------
 src/styles/_custom_variables.scss             |  1 +
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/app/page-internal-server-error/page-internal-server-error.component.html b/src/app/page-internal-server-error/page-internal-server-error.component.html
index bb43cdc678..a60624dbd5 100644
--- a/src/app/page-internal-server-error/page-internal-server-error.component.html
+++ b/src/app/page-internal-server-error/page-internal-server-error.component.html
@@ -1,6 +1,11 @@
 <div class="page-internal-server-error container">
   <h1>500</h1>
-  <h2><small *dsContextHelp="{content: 'context-help.multi-para.test', id: 'server-error'}">{{"500.page-internal-server-error" | translate}}</small></h2>
+  <h2><small *dsContextHelp="{content: 'context-help.multi-para.test',
+    id: 'server-error',
+    tooltipPlacement: 'bottom'}"
+  >
+    {{"500.page-internal-server-error" | translate}}
+  </small></h2>
   <br/>
   <p>{{"500.help" | translate}}</p>
   <br/>
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.html b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
index 03fc46c172..b031d0f42d 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
@@ -18,7 +18,7 @@
    [placement]="tooltipPlacement"
    autoClose="outside"
    triggers="manual"
-   container="'body'"
+   container="body"
    #tooltip="ngbTooltip"
    (click)="onClick()">
 </i>
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss b/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
index 3bf9c7bba8..d28883cae3 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
@@ -3,14 +3,14 @@
 }
 
 .ds-context-help-icon {
-  position: absolute;
-  top: 0;
-  cursor: pointer;
-  color: var(--bs-info);
-  background-color: var(--bs-white);
-  font-size: 16px; // not relative, because we don't want the icon to resize based on the container
-  line-height: 1;
-  border-radius: 50%;
+    position: absolute;
+    top: 0;
+    cursor: pointer;
+    color: var(--bs-info);
+    background-color: var(--bs-white);
+    font-size: 16px; // not relative, because we don't want the icon to resize based on the container
+    line-height: 1;
+    border-radius: 50%;
 }
 
 .ds-context-help-icon-left {
@@ -22,5 +22,6 @@
 }
 
 ::ng-deep .tooltip-inner {
-    width: 300px;
+    width: var(--ds-context-help-tooltip-width);
+    max-width: var(--ds-context-help-tooltip-width);
 }
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 2013562dec..4098bb6417 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -88,4 +88,5 @@
 
   --ds-context-x-offset: -16px;
   --ds-context-help-icon-size: 16px;
+  --ds-context-help-tooltip-width: 300px;
 }

From 84c053575f0a9c2eb019a9cab0332f861d94cec5 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Thu, 5 Jan 2023 14:50:25 +0100
Subject: [PATCH 098/160] 97732 Some example tooltips for the edit group page

---
 .../group-form/group-form.component.html             | 11 ++++++++++-
 .../members-list/members-list.component.html         | 12 ++++++++++--
 .../subgroup-list/subgroups-list.component.html      | 11 +++++++++--
 src/app/footer/footer.component.html                 |  7 +------
 .../top-level-community-list.component.html          |  5 +----
 .../page-internal-server-error.component.html        |  5 +----
 src/assets/i18n/en.json5                             |  6 ++++--
 7 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/src/app/access-control/group-registry/group-form/group-form.component.html b/src/app/access-control/group-registry/group-form/group-form.component.html
index 0fc5a574b7..c0bcc854e7 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.html
+++ b/src/app/access-control/group-registry/group-form/group-form.component.html
@@ -9,7 +9,16 @@
       </ng-template>
 
       <ng-template #editheader>
-        <h2 class="border-bottom pb-2">{{messagePrefix + '.head.edit' | translate}}</h2>
+        <h2 class="border-bottom pb-2"
+            *dsContextHelp="{
+              content: 'admin.access-control.groups.form.tooltip.editGroupPage',
+              id: 'edit-group-page',
+              iconPlacement: 'left',
+              tooltipPlacement: ['left', 'bottom']
+            }"
+        >
+          {{messagePrefix + '.head.edit' | translate}}
+        </h2>
       </ng-template>
 
       <ds-alert *ngIf="groupBeingEdited?.permanent" [type]="AlertTypeEnum.Warning"
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
index e5932edf05..80e13cfd5f 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
@@ -1,9 +1,17 @@
 <ng-container>
   <h3 class="border-bottom pb-2">{{messagePrefix + '.head' | translate}}</h3>
 
-  <h4 id="search" class="border-bottom pb-2">{{messagePrefix + '.search.head' | translate}}
-
+  <h4 id="search" class="border-bottom pb-2"
+      *dsContextHelp="{
+        content: 'admin.access-control.groups.form.tooltip.editGroup.addEpeople',
+        id: 'edit-group-add-epeople',
+        iconPlacement: 'left',
+        tooltipPlacement: ['left', 'top', 'bottom']
+      }"
+  >
+    {{messagePrefix + '.search.head' | translate}}
   </h4>
+
   <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
     <div>
       <select name="scope" id="scope" formControlName="scope" class="form-control" aria-label="Search scope">
diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
index e68612c317..438f3eed54 100644
--- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
+++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
@@ -1,8 +1,15 @@
 <ng-container>
   <h3 class="border-bottom pb-2">{{messagePrefix + '.head' | translate}}</h3>
 
-  <h4 id="search" class="border-bottom pb-2">{{messagePrefix + '.search.head' | translate}}
-
+  <h4 id="search" class="border-bottom pb-2"
+      *dsContextHelp="{
+        content: 'admin.access-control.groups.form.tooltip.editGroup.addSubgroups',
+        id: 'edit-group-add-subgroups',
+        iconPlacement: 'left',
+        tooltipPlacement: ['left', 'top', 'bottom']
+      }"
+  >
+    {{messagePrefix + '.search.head' | translate}}
   </h4>
   <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
     <div class="flex-grow-1 mr-3">
diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index 8f991b9e41..369cd6e432 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -64,12 +64,7 @@
       </p>
       <ul class="footer-info list-unstyled small d-flex justify-content-center mb-0">
         <li>
-            <a *dsContextHelp="{content: 'context-help.multi-para.test',
-                                id: 'show-cookie-settings',
-                                tooltipPlacement: 'top',
-                                iconPlacement: 'left'
-                               }"
-                class="text-white" href="javascript:void(0);"
+            <a class="text-white" href="javascript:void(0);"
              (click)="showCookieSettings()">{{ 'footer.link.cookies' | translate}}</a>
         </li>
         <li>
diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.html b/src/app/home-page/top-level-community-list/top-level-community-list.component.html
index 71ffee7dc6..899d33483d 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.html
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.html
@@ -1,10 +1,7 @@
 <ng-container *ngVar="(communitiesRD$ | async) as communitiesRD">
   <div *ngIf="communitiesRD?.hasSucceeded ">
     <h2>
-        <span *dsContextHelp="{content: 'context-help.multi-para.test',
-                               tooltipPlacement: 'top',
-                               iconPlacement: 'right'}">
-            {{'home.top-level-communities.head' | translate}}</span>
+      {{'home.top-level-communities.head' | translate}}
     </h2>
   <p class="lead">{{'home.top-level-communities.help' | translate}}</p>
   <ds-viewable-collection
diff --git a/src/app/page-internal-server-error/page-internal-server-error.component.html b/src/app/page-internal-server-error/page-internal-server-error.component.html
index a60624dbd5..96c00558ca 100644
--- a/src/app/page-internal-server-error/page-internal-server-error.component.html
+++ b/src/app/page-internal-server-error/page-internal-server-error.component.html
@@ -1,9 +1,6 @@
 <div class="page-internal-server-error container">
   <h1>500</h1>
-  <h2><small *dsContextHelp="{content: 'context-help.multi-para.test',
-    id: 'server-error',
-    tooltipPlacement: 'bottom'}"
-  >
+  <h2><small>
     {{"500.page-internal-server-error" | translate}}
   </small></h2>
   <br/>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 473dab6090..03596f2292 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -479,7 +479,11 @@
 
   "admin.access-control.groups.form.return": "Back",
 
+  "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.",
 
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
+
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for users. Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
 
   "admin.search.breadcrumbs": "Administrative Search",
 
@@ -4166,6 +4170,4 @@
 
   "idle-modal.extend-session": "Extend session",
 
-  "context-help.multi-para.test": "Lorem ipsum dolor [sit amet](https://google.com), consectetur adipiscing [elit](https://youtube.com). In facilisis ac metus ut tristique. Integer eros risus, efficitur non urna eu, ultrices mollis felis. Nullam mi sapien, mattis eu nunc in, rhoncus vulputate risus. \n\nDuis pharetra et nibh aliquam sodales. Integer ut rutrum dolor, ut maximus quam. Nunc sit amet maximus urna. In nec erat vulputate, facilisis nulla a, scelerisque orci. Ut pellentesque sapien et eros euismod scelerisque finibus at sem. Duis egestas convallis ligula nec laoreet. \n\nProin ut magna sit amet libero consequat ultrices et sed mi. Nam congue sed risus ac fringilla. Suspendisse potenti. Cras mattis, est non laoreet elementum, erat enim interdum tortor, eu placerat enim metus sit amet enim.",
-
 }

From 8850f005b4831642735b24ef603fef0ffb95ba22 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Thu, 5 Jan 2023 14:58:07 +0100
Subject: [PATCH 099/160] 97732 Fixed button hover color issue in header

---
 src/app/shared/lang-switch/lang-switch.component.scss | 2 +-
 src/styles/_custom_variables.scss                     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/lang-switch/lang-switch.component.scss b/src/app/shared/lang-switch/lang-switch.component.scss
index efa7a55c44..6d79e6ab25 100644
--- a/src/app/shared/lang-switch/lang-switch.component.scss
+++ b/src/app/shared/lang-switch/lang-switch.component.scss
@@ -4,7 +4,7 @@
 
 @media screen and (min-width: map-get($grid-breakpoints, md)) {
   .dropdown-toggle {
-    color: var(--ds-header-icon-color) !important;
+    color: var(--ds-header-icon-color);
 
     &:hover, &focus {
       color: var(--ds-header-icon-color-hover);
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 4098bb6417..e656972430 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -22,8 +22,8 @@
   --ds-header-bg: #{$white};
   --ds-header-logo-height: 50px;
   --ds-header-logo-height-xs: 50px;
-  --ds-header-icon-color: #{$cyan};
-  --ds-header-icon-color-hover: #{darken($white, 15%)};
+  --ds-header-icon-color: #{$link-color};
+  --ds-header-icon-color-hover: #{$link-hover-color};
   --ds-header-navbar-border-top-color: #{$white};
   --ds-header-navbar-border-bottom-color: #{$gray-400};
   --ds-navbar-link-color: #{$cyan};

From 68a3c8a4b2f4224021f4401eaedeb188fff66616 Mon Sep 17 00:00:00 2001
From: Ying Jin <yj4@rice.edu>
Date: Thu, 5 Jan 2023 16:31:42 -0600
Subject: [PATCH 100/160] change typo from minetype to mimetype

---
 src/app/core/shared/media-viewer-item.model.ts                  | 2 +-
 .../media-viewer-video/media-viewer-video.component.ts          | 2 +-
 src/app/item-page/media-viewer/media-viewer.component.ts        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/core/shared/media-viewer-item.model.ts b/src/app/core/shared/media-viewer-item.model.ts
index 38c53944d1..1cf4948408 100644
--- a/src/app/core/shared/media-viewer-item.model.ts
+++ b/src/app/core/shared/media-viewer-item.model.ts
@@ -17,7 +17,7 @@ export class MediaViewerItem {
   /**
    * Incoming Bitsream format mime type
    */
-  minetype: string;
+  mimetype: string;
 
   /**
    * Incoming Bitsream thumbnail
diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
index cc08d2b4a0..647bbacdc3 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
@@ -45,7 +45,7 @@ export class MediaViewerVideoComponent implements OnInit {
     let filteredCapMedias: MediaViewerItem[];
     let capInfos: CaptionInfo[] = [];
     filteredCapMedias = this.medias
-       .filter((media) => media.minetype === 'text/vtt')
+       .filter((media) => media.mimetype === 'text/vtt')
        .filter((media) => media.bitstream.name.substring(0, (media.bitstream.name.length - 7) ).toLowerCase() === name.toLowerCase());
 
     if (filteredCapMedias) {
diff --git a/src/app/item-page/media-viewer/media-viewer.component.ts b/src/app/item-page/media-viewer/media-viewer.component.ts
index 7ee60704eb..233ae0e6f6 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer.component.ts
@@ -108,7 +108,7 @@ export class MediaViewerComponent implements OnInit {
     const mediaItem = new MediaViewerItem();
     mediaItem.bitstream = original;
     mediaItem.format = format.mimetype.split('/')[0];
-    mediaItem.minetype = format.mimetype;
+    mediaItem.mimetype = format.mimetype;
     mediaItem.thumbnail = thumbnail ? thumbnail._links.content.href : null;
     return mediaItem;
   }

From 365b0208d9eba31107344207bc49ea8190b5e957 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Mon, 9 Jan 2023 11:37:29 +0100
Subject: [PATCH 101/160]  Tests for ContextHelpDirective

---
 .../context-help-wrapper.component.spec.ts    |  53 ++++++-
 .../context-help-wrapper.component.ts         |   4 +-
 src/app/shared/context-help.directive.spec.ts | 144 ++++++++++++++----
 src/app/shared/context-help.directive.ts      |   8 +-
 4 files changed, 165 insertions(+), 44 deletions(-)

diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
index aee7a0c696..a803f8ce41 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
@@ -1,21 +1,60 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { of as observableOf, Observable, BehaviorSubject } from 'rxjs';
 import { ContextHelpWrapperComponent } from './context-help-wrapper.component';
+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import { ContextHelpService } from '../context-help.service';
+import { ContextHelp } from '../context-help.model';
 
 describe('ContextHelpWrapperComponent', () => {
   let component: ContextHelpWrapperComponent;
   let fixture: ComponentFixture<ContextHelpWrapperComponent>;
+  let translateService: any;
+  let contextHelpService: any;
+  let getContextHelp$: BehaviorSubject<ContextHelp>;
+  let shouldShowIcons$: BehaviorSubject<boolean>;
 
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
+  const messages = {
+    lorem: 'lorem ipsum dolor sit amet',
+    linkTest: 'This is text, [this](https://dspace.lyrasis.org) is a link, and [so is this](https://google.com)'
+  };
+  function makeWrappedElement(): HTMLElement {
+    let el: HTMLElement = document.createElement('div')
+    el.innerHTML = 'example element';
+    return el;
+  }
+
+  beforeEach(waitForAsync( () => {
+    translateService = jasmine.createSpyObj('translateService', ['get']);
+    translateService.get.and.callFake((content) => messages[content]);
+
+    contextHelpService = jasmine.createSpyObj('contextHelpService', [
+      'shouldShowIcons$',
+      'getContextHelp$',
+      'add'
+    ])
+    TestBed.configureTestingModule({
+      imports: [ NgbTooltipModule ],
+      providers: [
+        { provide: TranslateService, useValue: translateService },
+        { provide: ContextHelpService, useValue: contextHelpService },
+      ],
       declarations: [ ContextHelpWrapperComponent ]
-    })
-    .compileComponents();
-  });
+    }).compileComponents();
+  }));
 
   beforeEach(() => {
+    contextHelpService.getContextHelp$.and.returnValue(getContextHelp$);
+    contextHelpService.shouldShowIcons$.and.returnValue(shouldShowIcons$);
+    getContextHelp$.next({
+      id: 'example-id',
+      isTooltipVisible: false
+    });
+    shouldShowIcons$.next(false);
+
     fixture = TestBed.createComponent(ContextHelpWrapperComponent);
     component = fixture.componentInstance;
+    component.templateRef
     fixture.detectChanges();
   });
 
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
index 68f2ac0002..41f63877cd 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
@@ -33,13 +33,13 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
   /**
    * Indicate where the tooltip should show up, relative to the info icon.
    */
-  @Input() tooltipPlacement?: PlacementArray;
+  @Input() tooltipPlacement?: PlacementArray = [];
 
   /**
    * Indicate whether the info icon should appear to the left or to
    * the right of the wrapped element.
    */
-  @Input() iconPlacement?: PlacementDir;
+  @Input() iconPlacement?: PlacementDir = 'left';
 
   /**
    * If true, don't process text to render links.
diff --git a/src/app/shared/context-help.directive.spec.ts b/src/app/shared/context-help.directive.spec.ts
index 35770b6038..cbe1fd94b7 100644
--- a/src/app/shared/context-help.directive.spec.ts
+++ b/src/app/shared/context-help.directive.spec.ts
@@ -1,65 +1,145 @@
 import { Component, DebugElement, Input } from '@angular/core';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
-import { of as observableOf, Observable } from 'rxjs';
+import { ComponentFixture, TestBed, getTestBed, waitForAsync } from '@angular/core/testing';
+import { of as observableOf, Observable, BehaviorSubject } from 'rxjs';
 import { ContextHelpDirective, ContextHelpDirectiveInput } from './context-help.directive';
 import { TranslateService } from '@ngx-translate/core';
 import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { ContextHelpService } from './context-help.service';
+import { ContextHelp } from './context-help.model';
+import { before } from 'lodash';
 
 @Component({
   template: `<div *dsContextHelp="contextHelpParams()">some text</div>`
 })
 class TestComponent {
   @Input() content = '';
+  @Input() id = '';
   contextHelpParams(): ContextHelpDirectiveInput {
     return {
-      content: this.content
+      content: this.content,
+      id: this.id,
+      iconPlacement: 'left',
+      tooltipPlacement: ['bottom']
     };
   }
 }
 
-// tslint:disable-next-line:max-classes-per-file
-class MockTranslateService {
-  messages: {[index: string]: string} = {
-    lorem: 'lorem ipsum dolor sit amet',
-    linkTest: 'This is text, [this](https://dspace.lyrasis.org) is a link, and [so is this](https://google.com)'
-  };
-
-  get(key: string): Observable<string> {
-    return observableOf(this.messages[key]);
-  }
-}
-
+const messages = {
+  lorem: 'lorem ipsum dolor sit amet',
+  linkTest: 'This is text, [this](https://dspace.lyrasis.org) is a link, and [so is this](https://google.com)'
+};
+const exampleContextHelp: ContextHelp = {
+  id: 'test-tooltip',
+  isTooltipVisible: false
+};
 describe('ContextHelpDirective', () => {
   let component: TestComponent;
   let fixture: ComponentFixture<TestComponent>;
   // let el: DebugElement;
-  // let translateService: TranslateService;
+  let translateService: any;
+  let contextHelpService: any;
+  let getContextHelp$: BehaviorSubject<ContextHelp>;
+  let shouldShowIcons$: BehaviorSubject<boolean>;
 
-  beforeEach(() => {
-    console.log('Anyone hear that?');
-    fixture = TestBed.configureTestingModule({
+  beforeEach(waitForAsync(() => {
+    translateService = jasmine.createSpyObj('translateService', ['get']);
+    contextHelpService = jasmine.createSpyObj('contextHelpService', [
+      'shouldShowIcons$',
+      'getContextHelp$',
+      'add',
+      'remove',
+      'toggleIcons',
+      'toggleTooltip',
+      'showTooltip',
+      'hideTooltip'
+    ]);
+
+    TestBed.configureTestingModule({
       imports: [NgbTooltipModule],
       providers: [
-        { provide: TranslateService, useClass: MockTranslateService }
+        { provide: TranslateService, useValue: translateService },
+        { provide: ContextHelpService, useValue: contextHelpService }
       ],
       declarations: [TestComponent, ContextHelpWrapperComponent, ContextHelpDirective]
-    }).createComponent(TestComponent);
+    }).compileComponents()
+  }));
+
+  beforeEach(() => {
+    // Set up service behavior.
+    getContextHelp$ = new BehaviorSubject<ContextHelp>(exampleContextHelp);
+    shouldShowIcons$ = new BehaviorSubject<boolean>(false);
+    contextHelpService.getContextHelp$.and.returnValue(getContextHelp$);
+    contextHelpService.shouldShowIcons$.and.returnValue(shouldShowIcons$);
+    translateService.get.and.callFake((content) => observableOf(messages[content]));
+
+    // Set up fixture and component.
+    fixture = TestBed.createComponent(TestComponent);
     component = fixture.componentInstance;
+    component.id = 'test-tooltip';
+    component.content = 'lorem';
+
   });
 
-  it('should add the tooltip icon', () => {
-    component.content = 'lorem';
+  it('should generate the context help wrapper component', (done) => {
     fixture.detectChanges();
+    fixture.whenStable().then(() => {
+      expect(fixture.nativeElement.children.length).toBe(1);
+      let [wrapper] = fixture.nativeElement.children;
+      expect(component).toBeDefined();
+      expect(wrapper.tagName).toBe('DS-CONTEXT-HELP-WRAPPER');
+      expect(contextHelpService.add).toHaveBeenCalledWith(exampleContextHelp)
+      done();
+    });
+  });
 
-    expect(component).toBeDefined();
-    const [wrapper] = fixture.nativeElement.children;
-    const [i, div] = wrapper.children;
-    expect(wrapper.tagName).toBe('DS-CONTEXT-HELP-WRAPPER');
-    expect(i.tagName).toBe('I');
-    expect(div.tagName).toBe('DIV');
-    expect(div.innerHTML).toBe('some text');
-    i.click(); // TODO: triggers a type error
+  it('should not show the context help button while icon visibility is not turned on', (done) => {
+    fixture.detectChanges();
+    fixture.whenStable().then(() => {
+      let wrapper = matchWrapper(fixture.nativeElement);
+      verifyNoButton(wrapper);
+      done();
+    });
+  });
+
+  describe('when icon visibility is toggled on', () => {
+    beforeEach(() => {
+      shouldShowIcons$.next(true);
+    });
+
+    it('should show the context help button', (done) => {
+      fixture.detectChanges();
+      fixture.whenStable().then(() => {
+        let wrapper = matchWrapper(fixture.nativeElement);
+        let i = verifyButton(wrapper);
+        i.click();
+        expect(contextHelpService.toggleTooltip).toHaveBeenCalledWith('test-tooltip');
+        getContextHelp$.next({id: 'test-tooltip', isTooltipVisible: true});
+        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+          expect(wrapper.parentElement.parentElement.querySelector('ngb-tooltip-window')).toBeTruthy();
+          done();
+        });
+      });
+    });
   });
 });
+
+function matchWrapper(el: HTMLElement): HTMLElement {
+  expect(el.children.length).toBe(1);
+  return el.children[0] as HTMLElement;
+}
+
+function verifyNoButton(wrapper: HTMLElement) {
+  expect(wrapper.children.length).toBe(1);
+  let [div] = wrapper.children;
+  expect(div.tagName).toBe('DIV');
+}
+
+function verifyButton(wrapper: Element): HTMLElement {
+  expect(wrapper.children.length).toBe(2);
+  let [i, div] = wrapper.children;
+  expect(i.tagName).toBe('I');
+  expect(div.tagName).toBe('DIV');
+  return i as HTMLElement;
+}
diff --git a/src/app/shared/context-help.directive.ts b/src/app/shared/context-help.directive.ts
index 56e7514b98..83c3908dcf 100644
--- a/src/app/shared/context-help.directive.ts
+++ b/src/app/shared/context-help.directive.ts
@@ -54,9 +54,11 @@ export class ContextHelpDirective implements OnChanges, OnDestroy {
     this.mostRecentId = this.dsContextHelp.id;
     this.contextHelpService.add({id: this.dsContextHelp.id, isTooltipVisible: false});
 
-    const factory
-      = this.componentFactoryResolver.resolveComponentFactory(ContextHelpWrapperComponent);
-    this.wrapper = this.viewContainerRef.createComponent(factory);
+    if (this.wrapper === undefined) {
+      const factory
+        = this.componentFactoryResolver.resolveComponentFactory(ContextHelpWrapperComponent);
+      this.wrapper = this.viewContainerRef.createComponent(factory);
+    }
     this.wrapper.instance.templateRef = this.templateRef;
     this.wrapper.instance.content = this.dsContextHelp.content;
     this.wrapper.instance.id = this.dsContextHelp.id;

From 1c11b9813c94f7030dd1106ec6b2f022d92c3485 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 9 Jan 2023 15:59:48 +0100
Subject: [PATCH 102/160] 97287: Fix GA page-view requests

---
 src/app/statistics/angulartics/dspace-provider.ts        | 2 +-
 .../angulartics/dspace/view-tracker.component.ts         | 2 +-
 src/app/statistics/google-analytics.service.ts           | 9 ++++++---
 src/modules/app/server-app.module.ts                     | 9 +++++++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/app/statistics/angulartics/dspace-provider.ts b/src/app/statistics/angulartics/dspace-provider.ts
index cd1aab94bd..6efa67f92a 100644
--- a/src/app/statistics/angulartics/dspace-provider.ts
+++ b/src/app/statistics/angulartics/dspace-provider.ts
@@ -24,7 +24,7 @@ export class Angulartics2DSpace {
   }
 
   private eventTrack(event) {
-    if (event.action === 'pageView') {
+    if (event.action === 'page_view') {
       this.statisticsService.trackViewEvent(event.properties.object);
     } else if (event.action === 'search') {
       this.statisticsService.trackSearchEvent(
diff --git a/src/app/statistics/angulartics/dspace/view-tracker.component.ts b/src/app/statistics/angulartics/dspace/view-tracker.component.ts
index 85588aeb97..d12b6c2f69 100644
--- a/src/app/statistics/angulartics/dspace/view-tracker.component.ts
+++ b/src/app/statistics/angulartics/dspace/view-tracker.component.ts
@@ -20,7 +20,7 @@ export class ViewTrackerComponent implements OnInit {
 
   ngOnInit(): void {
     this.angulartics2.eventTrack.next({
-      action: 'pageView',
+      action: 'page_view',
       properties: {object: this.object},
     });
   }
diff --git a/src/app/statistics/google-analytics.service.ts b/src/app/statistics/google-analytics.service.ts
index 9c5883d183..9d32a61093 100644
--- a/src/app/statistics/google-analytics.service.ts
+++ b/src/app/statistics/google-analytics.service.ts
@@ -1,7 +1,10 @@
 import { DOCUMENT } from '@angular/common';
 import { Inject, Injectable } from '@angular/core';
 
-import { Angulartics2GoogleAnalytics, Angulartics2GoogleTagManager } from 'angulartics2';
+import {
+  Angulartics2GoogleAnalytics,
+  Angulartics2GoogleGlobalSiteTag,
+} from 'angulartics2';
 import { combineLatest } from 'rxjs';
 
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
@@ -19,7 +22,7 @@ export class GoogleAnalyticsService {
 
   constructor(
     private googleAnalytics: Angulartics2GoogleAnalytics,
-    private googleTagManager: Angulartics2GoogleTagManager,
+    private googleGlobalSiteTag: Angulartics2GoogleGlobalSiteTag,
     private klaroService: KlaroService,
     private configService: ConfigurationDataService,
     @Inject(DOCUMENT) private document: any,
@@ -70,7 +73,7 @@ export class GoogleAnalyticsService {
           this.document.body.appendChild(libScript);
 
           // start tracking
-          this.googleTagManager.startTracking();
+          this.googleGlobalSiteTag.startTracking();
         } else {
           // add trackingId snippet to page
           const keyScript = this.document.createElement('script');
diff --git a/src/modules/app/server-app.module.ts b/src/modules/app/server-app.module.ts
index 17e394ede8..4b51a846f9 100644
--- a/src/modules/app/server-app.module.ts
+++ b/src/modules/app/server-app.module.ts
@@ -6,7 +6,12 @@ import { ServerModule, ServerTransferStateModule } from '@angular/platform-serve
 
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { Angulartics2, Angulartics2GoogleAnalytics, Angulartics2GoogleTagManager } from 'angulartics2';
+import {
+  Angulartics2,
+  Angulartics2GoogleAnalytics,
+  Angulartics2GoogleGlobalSiteTag,
+  Angulartics2GoogleTagManager
+} from 'angulartics2';
 
 import { AppComponent } from '../../app/app.component';
 
@@ -63,7 +68,7 @@ export function createTranslateLoader(transferState: TransferState) {
       useClass: AngularticsProviderMock
     },
     {
-      provide: Angulartics2GoogleTagManager,
+      provide: Angulartics2GoogleGlobalSiteTag,
       useClass: AngularticsProviderMock
     },
     {

From a7a6d1b27aef5054cd84d4f487945a2bd4a7978b Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Mon, 9 Jan 2023 16:47:05 +0100
Subject: [PATCH 103/160] Fix Klaro i18n issue

Caused by a merge mistake in https://github.com/DSpace/dspace-angular/pull/1975
---
 src/app/shared/cookies/browser-klaro.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/cookies/browser-klaro.service.ts b/src/app/shared/cookies/browser-klaro.service.ts
index 3e830811b3..4f3c8e00d5 100644
--- a/src/app/shared/cookies/browser-klaro.service.ts
+++ b/src/app/shared/cookies/browser-klaro.service.ts
@@ -49,7 +49,7 @@ const LAZY_KLARO = new InjectionToken<Promise<any>>(
   'Lazily loaded Klaro',
   {
     providedIn: 'root',
-    factory: async () => (await import('klaro')),
+    factory: async () => (await import('klaro/dist/klaro-no-translations')),
   }
 );
 

From 463bcb40e9af8295e7b674832036f46770ea6505 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Mon, 9 Jan 2023 16:47:24 +0100
Subject: [PATCH 104/160] Remove stray console.log

---
 src/app/shared/cookies/browser-klaro.service.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/shared/cookies/browser-klaro.service.ts b/src/app/shared/cookies/browser-klaro.service.ts
index 4f3c8e00d5..2b09c0bf15 100644
--- a/src/app/shared/cookies/browser-klaro.service.ts
+++ b/src/app/shared/cookies/browser-klaro.service.ts
@@ -115,7 +115,6 @@ export class BrowserKlaroService extends KlaroService {
         if (hideRegistrationVerification) {
           servicesToHideArray.push(CAPTCHA_NAME);
         }
-        console.log(servicesToHideArray);
         return servicesToHideArray;
       })
     );

From cad4f7417308a6a44f8863b92d7ac3247d699d45 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Mon, 9 Jan 2023 17:15:07 +0100
Subject: [PATCH 105/160]  Moved tests from ContextHelpDirective to
 ContextHelpWrapperComponent and added more tests

---
 .../context-help-wrapper.component.spec.ts    | 144 +++++++++++++++---
 .../context-help-wrapper.component.ts         |   1 +
 src/app/shared/context-help.directive.spec.ts |  54 +------
 src/app/shared/context-help.directive.ts      |   1 +
 4 files changed, 129 insertions(+), 71 deletions(-)

diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
index a803f8ce41..3ac27f7090 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
@@ -5,19 +5,51 @@ import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
 import { ContextHelpService } from '../context-help.service';
 import { ContextHelp } from '../context-help.model';
+import { Component, Input, ViewChild, DebugElement } from '@angular/core';
+import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
+import { PlacementDir } from './placement-dir.model';
+import { By } from '@angular/platform-browser';
+
+@Component({
+  template: `
+    <ng-template #div>template</ng-template>
+    <ds-context-help-wrapper
+      #chwrapper
+      [templateRef]="div"
+      [content]="content"
+      [id]="id"
+      [tooltipPlacement]="tooltipPlacement"
+      [iconPlacement]="iconPlacement"
+    >
+    </ds-context-help-wrapper>
+  `
+})
+class TemplateComponent {
+  @Input() content: string;
+  @Input() id: string;
+  @Input() tooltipPlacement?: PlacementArray;
+  @Input() iconPlacement?: PlacementDir;
+}
+
+const messages = {
+  lorem: 'lorem ipsum dolor sit amet',
+  linkTest: 'This is text, [this](https://dspace.lyrasis.org) is a link, and [so is this](https://google.com)'
+};
+const exampleContextHelp: ContextHelp = {
+  id: 'test-tooltip',
+  isTooltipVisible: false
+};
 
 describe('ContextHelpWrapperComponent', () => {
-  let component: ContextHelpWrapperComponent;
-  let fixture: ComponentFixture<ContextHelpWrapperComponent>;
+  let templateComponent: TemplateComponent;
+  let wrapperComponent: ContextHelpWrapperComponent;
+  let fixture: ComponentFixture<TemplateComponent>;
+  let el: DebugElement;
   let translateService: any;
   let contextHelpService: any;
   let getContextHelp$: BehaviorSubject<ContextHelp>;
   let shouldShowIcons$: BehaviorSubject<boolean>;
 
-  const messages = {
-    lorem: 'lorem ipsum dolor sit amet',
-    linkTest: 'This is text, [this](https://dspace.lyrasis.org) is a link, and [so is this](https://google.com)'
-  };
   function makeWrappedElement(): HTMLElement {
     let el: HTMLElement = document.createElement('div')
     el.innerHTML = 'example element';
@@ -26,39 +58,113 @@ describe('ContextHelpWrapperComponent', () => {
 
   beforeEach(waitForAsync( () => {
     translateService = jasmine.createSpyObj('translateService', ['get']);
-    translateService.get.and.callFake((content) => messages[content]);
-
     contextHelpService = jasmine.createSpyObj('contextHelpService', [
       'shouldShowIcons$',
       'getContextHelp$',
-      'add'
-    ])
+      'add',
+      'remove',
+      'toggleIcons',
+      'toggleTooltip',
+      'showTooltip',
+      'hideTooltip'
+    ]);
+
     TestBed.configureTestingModule({
       imports: [ NgbTooltipModule ],
       providers: [
         { provide: TranslateService, useValue: translateService },
         { provide: ContextHelpService, useValue: contextHelpService },
       ],
-      declarations: [ ContextHelpWrapperComponent ]
+      declarations: [ TemplateComponent, ContextHelpWrapperComponent ]
     }).compileComponents();
   }));
 
   beforeEach(() => {
+    // Initializing services.
+    getContextHelp$ = new BehaviorSubject<ContextHelp>(exampleContextHelp);
+    shouldShowIcons$ = new BehaviorSubject<boolean>(false);
     contextHelpService.getContextHelp$.and.returnValue(getContextHelp$);
     contextHelpService.shouldShowIcons$.and.returnValue(shouldShowIcons$);
-    getContextHelp$.next({
-      id: 'example-id',
-      isTooltipVisible: false
-    });
+    translateService.get.and.callFake((content) => observableOf(messages[content]));
+
+    getContextHelp$.next(exampleContextHelp);
     shouldShowIcons$.next(false);
 
-    fixture = TestBed.createComponent(ContextHelpWrapperComponent);
-    component = fixture.componentInstance;
-    component.templateRef
+    // Initializing components.
+    fixture = TestBed.createComponent(TemplateComponent);
+    el = fixture.debugElement;
+    templateComponent = fixture.componentInstance;
+    templateComponent.content = 'lorem'
+    templateComponent.id = 'test-tooltip'
+    templateComponent.tooltipPlacement = ['bottom'];
+    templateComponent.iconPlacement = 'left';
+    wrapperComponent = el.query(By.css('ds-context-help-wrapper')).componentInstance;
     fixture.detectChanges();
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    expect(templateComponent).toBeDefined();
+    expect(wrapperComponent).toBeDefined();
   });
+
+  it('should not show the context help icon while icon visibility is not turned on', (done) => {
+    fixture.whenStable().then(() => {
+      let wrapper = el.query(By.css('ds-context-help-wrapper')).nativeElement;
+      expect(wrapper.children.length).toBe(0);
+      done();
+    });
+  });
+
+  describe('when icon visibility is turned on', () => {
+    beforeEach(() => {
+      shouldShowIcons$.next(true);
+      fixture.detectChanges();
+      spyOn(wrapperComponent.tooltip, 'open').and.callThrough();
+      spyOn(wrapperComponent.tooltip, 'close').and.callThrough();
+    });
+
+    it('should show the context help button', (done) => {
+      fixture.whenStable().then(() => {
+        let wrapper = el.query(By.css('ds-context-help-wrapper')).nativeElement;
+        expect(wrapper.children.length).toBe(1);
+        let [i] = wrapper.children;
+        expect(i.tagName).toBe('I');
+        done();
+      });
+    });
+
+    describe('after the icon is clicked', () => {
+      let i;
+      beforeEach(() => {
+        i = el.query(By.css('.ds-context-help-icon')).nativeElement;
+        i.click();
+        fixture.detectChanges();
+      });
+
+      it('should display the tooltip', () => {
+        expect(contextHelpService.toggleTooltip).toHaveBeenCalledWith('test-tooltip');
+        getContextHelp$.next({...exampleContextHelp, isTooltipVisible: true});
+        fixture.detectChanges();
+        expect(wrapperComponent.tooltip.open).toHaveBeenCalled();
+        expect(wrapperComponent.tooltip.close).toHaveBeenCalledTimes(0);
+      });
+
+      describe('after the icon is clicked again', () => {
+        beforeEach(() => {
+          i.click();
+          fixture.detectChanges();
+          spyOn(wrapperComponent.tooltip, 'isOpen').and.returnValue(true);
+        });
+
+        it('should close the tooltip', () => {
+          expect(contextHelpService.toggleTooltip).toHaveBeenCalledWith('test-tooltip');
+          getContextHelp$.next({...exampleContextHelp, isTooltipVisible: false});
+          fixture.detectChanges();
+          expect(wrapperComponent.tooltip.close).toHaveBeenCalled();
+        });
+      });
+    });
+  });
+
+  // TODO: link parsing tests
 });
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
index 41f63877cd..260c2b05dd 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
@@ -81,6 +81,7 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
         this.contextHelpService.getContextHelp$(this.id)
           .pipe(hasValueOperator())
           .subscribe((ch: ContextHelp) => {
+
             if (ch.isTooltipVisible && !this.tooltip.isOpen()) {
               this.tooltip.open();
             } else if (!ch.isTooltipVisible && this.tooltip.isOpen()) {
diff --git a/src/app/shared/context-help.directive.spec.ts b/src/app/shared/context-help.directive.spec.ts
index cbe1fd94b7..70e27b658c 100644
--- a/src/app/shared/context-help.directive.spec.ts
+++ b/src/app/shared/context-help.directive.spec.ts
@@ -8,6 +8,7 @@ import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { ContextHelpService } from './context-help.service';
 import { ContextHelp } from './context-help.model';
 import { before } from 'lodash';
+import { By } from '@angular/platform-browser';
 
 @Component({
   template: `<div *dsContextHelp="contextHelpParams()">some text</div>`
@@ -36,7 +37,6 @@ const exampleContextHelp: ContextHelp = {
 describe('ContextHelpDirective', () => {
   let component: TestComponent;
   let fixture: ComponentFixture<TestComponent>;
-  // let el: DebugElement;
   let translateService: any;
   let contextHelpService: any;
   let getContextHelp$: BehaviorSubject<ContextHelp>;
@@ -79,10 +79,10 @@ describe('ContextHelpDirective', () => {
     component.id = 'test-tooltip';
     component.content = 'lorem';
 
+    fixture.detectChanges();
   });
 
   it('should generate the context help wrapper component', (done) => {
-    fixture.detectChanges();
     fixture.whenStable().then(() => {
       expect(fixture.nativeElement.children.length).toBe(1);
       let [wrapper] = fixture.nativeElement.children;
@@ -92,54 +92,4 @@ describe('ContextHelpDirective', () => {
       done();
     });
   });
-
-  it('should not show the context help button while icon visibility is not turned on', (done) => {
-    fixture.detectChanges();
-    fixture.whenStable().then(() => {
-      let wrapper = matchWrapper(fixture.nativeElement);
-      verifyNoButton(wrapper);
-      done();
-    });
-  });
-
-  describe('when icon visibility is toggled on', () => {
-    beforeEach(() => {
-      shouldShowIcons$.next(true);
-    });
-
-    it('should show the context help button', (done) => {
-      fixture.detectChanges();
-      fixture.whenStable().then(() => {
-        let wrapper = matchWrapper(fixture.nativeElement);
-        let i = verifyButton(wrapper);
-        i.click();
-        expect(contextHelpService.toggleTooltip).toHaveBeenCalledWith('test-tooltip');
-        getContextHelp$.next({id: 'test-tooltip', isTooltipVisible: true});
-        fixture.detectChanges();
-        fixture.whenStable().then(() => {
-          expect(wrapper.parentElement.parentElement.querySelector('ngb-tooltip-window')).toBeTruthy();
-          done();
-        });
-      });
-    });
-  });
 });
-
-function matchWrapper(el: HTMLElement): HTMLElement {
-  expect(el.children.length).toBe(1);
-  return el.children[0] as HTMLElement;
-}
-
-function verifyNoButton(wrapper: HTMLElement) {
-  expect(wrapper.children.length).toBe(1);
-  let [div] = wrapper.children;
-  expect(div.tagName).toBe('DIV');
-}
-
-function verifyButton(wrapper: Element): HTMLElement {
-  expect(wrapper.children.length).toBe(2);
-  let [i, div] = wrapper.children;
-  expect(i.tagName).toBe('I');
-  expect(div.tagName).toBe('DIV');
-  return i as HTMLElement;
-}
diff --git a/src/app/shared/context-help.directive.ts b/src/app/shared/context-help.directive.ts
index 83c3908dcf..20dd48424a 100644
--- a/src/app/shared/context-help.directive.ts
+++ b/src/app/shared/context-help.directive.ts
@@ -59,6 +59,7 @@ export class ContextHelpDirective implements OnChanges, OnDestroy {
         = this.componentFactoryResolver.resolveComponentFactory(ContextHelpWrapperComponent);
       this.wrapper = this.viewContainerRef.createComponent(factory);
     }
+    console.log(this.templateRef);
     this.wrapper.instance.templateRef = this.templateRef;
     this.wrapper.instance.content = this.dsContextHelp.content;
     this.wrapper.instance.id = this.dsContextHelp.id;

From f9f3ad32c78040521b950752eccfbd9dc9840305 Mon Sep 17 00:00:00 2001
From: Nikunj Sharma <nikunj.sharma@4science.com>
Date: Tue, 10 Jan 2023 19:37:06 +0530
Subject: [PATCH 106/160] [CST-7604] added hithighlight for person and orgunit

---
 src/app/core/breadcrumbs/dso-name.service.ts  | 42 +++++++++++++++++++
 src/app/shared/mocks/dso-name.service.mock.ts | 11 +++++
 ...em-search-result-grid-element.component.ts |  3 +-
 .../item-list-preview.component.ts            |  2 +-
 ...arch-result-list-element.component.spec.ts |  5 ++-
 .../search-result-list-element.component.ts   |  2 +-
 6 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/src/app/core/breadcrumbs/dso-name.service.ts b/src/app/core/breadcrumbs/dso-name.service.ts
index d56f4a00eb..64f37baa65 100644
--- a/src/app/core/breadcrumbs/dso-name.service.ts
+++ b/src/app/core/breadcrumbs/dso-name.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import { hasValue, isEmpty } from '../../shared/empty.util';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { TranslateService } from '@ngx-translate/core';
+import { Metadata } from '../shared/metadata.utils';
 
 /**
  * Returns a name for a {@link DSpaceObject} based
@@ -67,4 +68,45 @@ export class DSONameService {
     return name;
   }
 
+  /**
+   * Gets the Hit highlight
+   *
+   * @param object
+   * @param dso
+   *
+   * @returns {string} html embedded hit highlight.
+   */
+  getHitHighlights(object: any, dso: DSpaceObject): string {
+    const types = dso.getRenderTypes();
+    const entityType = types
+      .filter((type) => typeof type === 'string')
+      .find((type: string) => (['Person', 'OrgUnit']).includes(type)) as string;
+    if (entityType === 'Person') {
+      const familyName = this.firstMetadataValue(object, dso, 'person.familyName');
+      const givenName = this.firstMetadataValue(object, dso, 'person.givenName');
+      if (isEmpty(familyName) && isEmpty(givenName)) {
+        return this.firstMetadataValue(object, dso, 'dc.title') || dso.name;
+      } else if (isEmpty(familyName) || isEmpty(givenName)) {
+        return familyName || givenName;
+      }
+      return `${familyName}, ${givenName}`;
+    } else if (entityType === 'OrgUnit') {
+      return this.firstMetadataValue(object, dso, 'organization.legalName');
+    }
+    return this.firstMetadataValue(object, dso, 'dc.title') || dso.name || this.translateService.instant('dso.name.untitled');
+  }
+
+  /**
+   * Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights.
+   *
+   * @param object
+   * @param dso
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+   *
+   * @returns {string} the first matching string value, or `undefined`.
+   */
+  firstMetadataValue(object: any, dso: DSpaceObject, keyOrKeys: string | string[]): string {
+    return Metadata.firstValue([object.hitHighlights, dso.metadata], keyOrKeys);
+  }
+
 }
diff --git a/src/app/shared/mocks/dso-name.service.mock.ts b/src/app/shared/mocks/dso-name.service.mock.ts
index f4947cc860..1e3280ce8d 100644
--- a/src/app/shared/mocks/dso-name.service.mock.ts
+++ b/src/app/shared/mocks/dso-name.service.mock.ts
@@ -6,4 +6,15 @@ export class DSONameServiceMock {
   public getName(dso: DSpaceObject) {
     return UNDEFINED_NAME;
   }
+
+  public getHitHighlights(object: any, dso: DSpaceObject) {
+    if (object.hitHighlights && object.hitHighlights['dc.title']) {
+      return object.hitHighlights['dc.title'][0];
+    } else if (object.hitHighlights && object.hitHighlights['organization.legalName']) {
+      return object.hitHighlights['organization.legalName'][0];
+    } else if (object.hitHighlights && (object.hitHighlights['person.familyName'] || object.hitHighlights['person.givenName'])) {
+      return `${object.hitHighlights['person.familyName'][0] || ''}, ${object.hitHighlights['person.givenName'][0] || ''}`;
+    }
+    return UNDEFINED_NAME;
+  }
 }
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
index fc24d5450b..303e4681a2 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
@@ -42,7 +42,6 @@ export class ItemSearchResultGridElementComponent extends SearchResultGridElemen
   ngOnInit(): void {
     super.ngOnInit();
     this.itemPageRoute = getItemPageRoute(this.dso);
-    this.dsoTitle = this.firstMetadataValue('dc.title') ??
-      (this.dso ? this.dsoNameService.getName(this.dso) : undefined);
+    this.dsoTitle = this.dsoNameService.getHitHighlights(this.object, this.dso);
   }
 }
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
index 04f1e24d7b..6b40678ded 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
@@ -55,7 +55,7 @@ export class ItemListPreviewComponent implements OnInit {
 
   ngOnInit(): void {
     this.showThumbnails = this.appConfig.browseBy.showThumbnails;
-    this.dsoTitle = this.dsoNameService.getName(this.item);
+    this.dsoTitle = this.dsoNameService.getHitHighlights(this.object, this.item);
   }
 
 
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
index 660377746a..0d7c2cbc58 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
@@ -15,6 +15,9 @@ let publicationListElementComponent: ItemSearchResultListElementComponent;
 let fixture: ComponentFixture<ItemSearchResultListElementComponent>;
 const dcTitle = 'This is just another <em>title</em>';
 const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResult(), {
+  hitHighlights: {
+    'dc.title': [dcTitle],
+  },
   indexableObject:
     Object.assign(new Item(), {
       bundles: observableOf({}),
@@ -22,7 +25,7 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResul
         'dc.title': [
           {
             language: 'en_US',
-            value: dcTitle
+            value: 'This is just another title'
           }
         ],
         'dc.contributor.author': [
diff --git a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
index c69044e907..e56b7e970a 100644
--- a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
@@ -33,7 +33,7 @@ export class SearchResultListElementComponent<T extends SearchResult<K>, K exten
   ngOnInit(): void {
     if (hasValue(this.object)) {
       this.dso = this.object.indexableObject;
-      this.dsoTitle = this.firstMetadataValue('dc.title') ?? this.dsoNameService.getName(this.dso);
+      this.dsoTitle = this.dsoNameService.getHitHighlights(this.object, this.dso);
     }
   }
 

From b7b2803f6ebb6e86f2c38cceb5168a80ceeefe0c Mon Sep 17 00:00:00 2001
From: Nikunj Sharma <nikunj.sharma@4science.com>
Date: Tue, 10 Jan 2023 19:37:06 +0530
Subject: [PATCH 107/160] [CST-7604] added hithighlight for person and orgunit

---
 src/app/core/breadcrumbs/dso-name.service.ts  | 42 +++++++++++++++++++
 src/app/shared/mocks/dso-name.service.mock.ts | 11 +++++
 ...arch-result-grid-element.component.spec.ts |  3 ++
 ...em-search-result-grid-element.component.ts |  3 +-
 .../item-list-preview.component.ts            |  2 +-
 ...arch-result-list-element.component.spec.ts |  5 ++-
 .../search-result-list-element.component.ts   |  2 +-
 7 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/src/app/core/breadcrumbs/dso-name.service.ts b/src/app/core/breadcrumbs/dso-name.service.ts
index d56f4a00eb..64f37baa65 100644
--- a/src/app/core/breadcrumbs/dso-name.service.ts
+++ b/src/app/core/breadcrumbs/dso-name.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import { hasValue, isEmpty } from '../../shared/empty.util';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { TranslateService } from '@ngx-translate/core';
+import { Metadata } from '../shared/metadata.utils';
 
 /**
  * Returns a name for a {@link DSpaceObject} based
@@ -67,4 +68,45 @@ export class DSONameService {
     return name;
   }
 
+  /**
+   * Gets the Hit highlight
+   *
+   * @param object
+   * @param dso
+   *
+   * @returns {string} html embedded hit highlight.
+   */
+  getHitHighlights(object: any, dso: DSpaceObject): string {
+    const types = dso.getRenderTypes();
+    const entityType = types
+      .filter((type) => typeof type === 'string')
+      .find((type: string) => (['Person', 'OrgUnit']).includes(type)) as string;
+    if (entityType === 'Person') {
+      const familyName = this.firstMetadataValue(object, dso, 'person.familyName');
+      const givenName = this.firstMetadataValue(object, dso, 'person.givenName');
+      if (isEmpty(familyName) && isEmpty(givenName)) {
+        return this.firstMetadataValue(object, dso, 'dc.title') || dso.name;
+      } else if (isEmpty(familyName) || isEmpty(givenName)) {
+        return familyName || givenName;
+      }
+      return `${familyName}, ${givenName}`;
+    } else if (entityType === 'OrgUnit') {
+      return this.firstMetadataValue(object, dso, 'organization.legalName');
+    }
+    return this.firstMetadataValue(object, dso, 'dc.title') || dso.name || this.translateService.instant('dso.name.untitled');
+  }
+
+  /**
+   * Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights.
+   *
+   * @param object
+   * @param dso
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+   *
+   * @returns {string} the first matching string value, or `undefined`.
+   */
+  firstMetadataValue(object: any, dso: DSpaceObject, keyOrKeys: string | string[]): string {
+    return Metadata.firstValue([object.hitHighlights, dso.metadata], keyOrKeys);
+  }
+
 }
diff --git a/src/app/shared/mocks/dso-name.service.mock.ts b/src/app/shared/mocks/dso-name.service.mock.ts
index f4947cc860..1e3280ce8d 100644
--- a/src/app/shared/mocks/dso-name.service.mock.ts
+++ b/src/app/shared/mocks/dso-name.service.mock.ts
@@ -6,4 +6,15 @@ export class DSONameServiceMock {
   public getName(dso: DSpaceObject) {
     return UNDEFINED_NAME;
   }
+
+  public getHitHighlights(object: any, dso: DSpaceObject) {
+    if (object.hitHighlights && object.hitHighlights['dc.title']) {
+      return object.hitHighlights['dc.title'][0];
+    } else if (object.hitHighlights && object.hitHighlights['organization.legalName']) {
+      return object.hitHighlights['organization.legalName'][0];
+    } else if (object.hitHighlights && (object.hitHighlights['person.familyName'] || object.hitHighlights['person.givenName'])) {
+      return `${object.hitHighlights['person.familyName'][0] || ''}, ${object.hitHighlights['person.givenName'][0] || ''}`;
+    }
+    return UNDEFINED_NAME;
+  }
 }
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts
index 97dda155c5..f25937df34 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts
@@ -30,6 +30,9 @@ const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
 const dcTitle = 'This is just another <em>title</em>';
 mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
+  hitHighlights: {
+    'dc.title': [dcTitle],
+  },
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
index fc24d5450b..303e4681a2 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
@@ -42,7 +42,6 @@ export class ItemSearchResultGridElementComponent extends SearchResultGridElemen
   ngOnInit(): void {
     super.ngOnInit();
     this.itemPageRoute = getItemPageRoute(this.dso);
-    this.dsoTitle = this.firstMetadataValue('dc.title') ??
-      (this.dso ? this.dsoNameService.getName(this.dso) : undefined);
+    this.dsoTitle = this.dsoNameService.getHitHighlights(this.object, this.dso);
   }
 }
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
index 04f1e24d7b..6b40678ded 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
@@ -55,7 +55,7 @@ export class ItemListPreviewComponent implements OnInit {
 
   ngOnInit(): void {
     this.showThumbnails = this.appConfig.browseBy.showThumbnails;
-    this.dsoTitle = this.dsoNameService.getName(this.item);
+    this.dsoTitle = this.dsoNameService.getHitHighlights(this.object, this.item);
   }
 
 
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
index 660377746a..0d7c2cbc58 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
@@ -15,6 +15,9 @@ let publicationListElementComponent: ItemSearchResultListElementComponent;
 let fixture: ComponentFixture<ItemSearchResultListElementComponent>;
 const dcTitle = 'This is just another <em>title</em>';
 const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResult(), {
+  hitHighlights: {
+    'dc.title': [dcTitle],
+  },
   indexableObject:
     Object.assign(new Item(), {
       bundles: observableOf({}),
@@ -22,7 +25,7 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResul
         'dc.title': [
           {
             language: 'en_US',
-            value: dcTitle
+            value: 'This is just another title'
           }
         ],
         'dc.contributor.author': [
diff --git a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
index c69044e907..e56b7e970a 100644
--- a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
@@ -33,7 +33,7 @@ export class SearchResultListElementComponent<T extends SearchResult<K>, K exten
   ngOnInit(): void {
     if (hasValue(this.object)) {
       this.dso = this.object.indexableObject;
-      this.dsoTitle = this.firstMetadataValue('dc.title') ?? this.dsoNameService.getName(this.dso);
+      this.dsoTitle = this.dsoNameService.getHitHighlights(this.object, this.dso);
     }
   }
 

From 5660e7dc701a575cb0f4df5c732d6ce1ee92bb06 Mon Sep 17 00:00:00 2001
From: Nikunj Sharma <nikunj.sharma@4science.com>
Date: Wed, 11 Jan 2023 02:46:20 +0530
Subject: [PATCH 108/160] [CST-7604] test cases update

---
 src/app/shared/mocks/dso-name.service.mock.ts |  14 +-
 ...arch-result-grid-element.component.spec.ts | 136 ++++++++++++++++-
 ...arch-result-list-element.component.spec.ts | 139 +++++++++++++++++-
 3 files changed, 282 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/mocks/dso-name.service.mock.ts b/src/app/shared/mocks/dso-name.service.mock.ts
index 1e3280ce8d..cf3cf5466b 100644
--- a/src/app/shared/mocks/dso-name.service.mock.ts
+++ b/src/app/shared/mocks/dso-name.service.mock.ts
@@ -9,11 +9,19 @@ export class DSONameServiceMock {
 
   public getHitHighlights(object: any, dso: DSpaceObject) {
     if (object.hitHighlights && object.hitHighlights['dc.title']) {
-      return object.hitHighlights['dc.title'][0];
+      return object.hitHighlights['dc.title'][0].value;
     } else if (object.hitHighlights && object.hitHighlights['organization.legalName']) {
-      return object.hitHighlights['organization.legalName'][0];
+      return object.hitHighlights['organization.legalName'][0].value;
     } else if (object.hitHighlights && (object.hitHighlights['person.familyName'] || object.hitHighlights['person.givenName'])) {
-      return `${object.hitHighlights['person.familyName'][0] || ''}, ${object.hitHighlights['person.givenName'][0] || ''}`;
+      if (object.hitHighlights['person.familyName'] && object.hitHighlights['person.givenName']) {
+        return `${object.hitHighlights['person.familyName'][0].value}, ${object.hitHighlights['person.givenName'][0].value}`;
+      }
+      if (object.hitHighlights['person.familyName']) {
+        return `${object.hitHighlights['person.familyName'][0].value}`;
+      }
+      if (object.hitHighlights['person.givenName']) {
+        return `${object.hitHighlights['person.givenName'][0].value}`;
+      }
     }
     return UNDEFINED_NAME;
   }
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts
index f25937df34..dc42b033d8 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts
@@ -31,7 +31,9 @@ mockItemWithMetadata.hitHighlights = {};
 const dcTitle = 'This is just another <em>title</em>';
 mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
   hitHighlights: {
-    'dc.title': [dcTitle],
+    'dc.title': [{
+      value: dcTitle
+    }],
   },
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
@@ -61,6 +63,114 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
     ]
   }
 });
+const mockPerson: ItemSearchResult = Object.assign(new ItemSearchResult(), {
+  hitHighlights: {
+    'person.familyName': [{
+      value: '<em>Michel</em>'
+    }],
+  },
+  indexableObject:
+    Object.assign(new Item(), {
+      bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
+      entityType: 'Person',
+      metadata: {
+        'dc.title': [
+          {
+            language: 'en_US',
+            value: 'This is just another title'
+          }
+        ],
+        'dc.contributor.author': [
+          {
+            language: 'en_US',
+            value: 'Smith, Donald'
+          }
+        ],
+        'dc.publisher': [
+          {
+            language: 'en_US',
+            value: 'a publisher'
+          }
+        ],
+        'dc.date.issued': [
+          {
+            language: 'en_US',
+            value: '2015-06-26'
+          }
+        ],
+        'dc.description.abstract': [
+          {
+            language: 'en_US',
+            value: 'This is the abstract'
+          }
+        ],
+        'dspace.entity.type': [
+          {
+            value: 'Person'
+          }
+        ],
+        'person.familyName': [
+          {
+            value: 'Michel'
+          }
+        ]
+      }
+    })
+});
+const mockOrgUnit: ItemSearchResult = Object.assign(new ItemSearchResult(), {
+  hitHighlights: {
+    'organization.legalName': [{
+      value: '<em>Science</em>'
+    }],
+  },
+  indexableObject:
+    Object.assign(new Item(), {
+      bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
+      entityType: 'OrgUnit',
+      metadata: {
+        'dc.title': [
+          {
+            language: 'en_US',
+            value: 'This is just another title'
+          }
+        ],
+        'dc.contributor.author': [
+          {
+            language: 'en_US',
+            value: 'Smith, Donald'
+          }
+        ],
+        'dc.publisher': [
+          {
+            language: 'en_US',
+            value: 'a publisher'
+          }
+        ],
+        'dc.date.issued': [
+          {
+            language: 'en_US',
+            value: '2015-06-26'
+          }
+        ],
+        'dc.description.abstract': [
+          {
+            language: 'en_US',
+            value: 'This is the abstract'
+          }
+        ],
+        'organization.legalName': [
+          {
+            value: 'Science'
+          }
+        ],
+        'dspace.entity.type': [
+          {
+            value: 'OrgUnit'
+          }
+        ]
+      }
+    })
+});
 
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithoutMetadata.hitHighlights = {};
@@ -169,6 +279,30 @@ export function getEntityGridElementTestComponent(component, searchResultWithMet
           expect(titleField.nativeNode.innerHTML).toEqual(dcTitle);
         });
       });
+
+      describe('When the item is Person and has title', () => {
+        beforeEach(() => {
+          comp.object = mockPerson;
+          fixture.detectChanges();
+        });
+
+        it('should show highlighted title', () => {
+          const titleField = fixture.debugElement.query(By.css('.card-title'));
+          expect(titleField.nativeNode.innerHTML).toEqual('<em>Michel</em>');
+        });
+      });
+
+      describe('When the item is orgUnit and has title', () => {
+        beforeEach(() => {
+          comp.object = mockOrgUnit;
+          fixture.detectChanges();
+        });
+
+        it('should show highlighted title', () => {
+          const titleField = fixture.debugElement.query(By.css('.card-title'));
+          expect(titleField.nativeNode.innerHTML).toEqual('<em>Science</em>');
+        });
+      });
     });
   };
 }
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
index 0d7c2cbc58..7665b7d64e 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
@@ -16,7 +16,9 @@ let fixture: ComponentFixture<ItemSearchResultListElementComponent>;
 const dcTitle = 'This is just another <em>title</em>';
 const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResult(), {
   hitHighlights: {
-    'dc.title': [dcTitle],
+    'dc.title': [{
+      value: dcTitle
+    }],
   },
   indexableObject:
     Object.assign(new Item(), {
@@ -25,7 +27,7 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResul
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
+            value: dcTitle
           }
         ],
         'dc.contributor.author': [
@@ -62,7 +64,114 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(new ItemSearchRe
       metadata: {}
     })
 });
-
+const mockPerson: ItemSearchResult = Object.assign(new ItemSearchResult(), {
+  hitHighlights: {
+    'person.familyName': [{
+      value: '<em>Michel</em>'
+    }],
+  },
+  indexableObject:
+    Object.assign(new Item(), {
+      bundles: observableOf({}),
+      entityType: 'Person',
+      metadata: {
+        'dc.title': [
+          {
+            language: 'en_US',
+            value: 'This is just another title'
+          }
+        ],
+        'dc.contributor.author': [
+          {
+            language: 'en_US',
+            value: 'Smith, Donald'
+          }
+        ],
+        'dc.publisher': [
+          {
+            language: 'en_US',
+            value: 'a publisher'
+          }
+        ],
+        'dc.date.issued': [
+          {
+            language: 'en_US',
+            value: '2015-06-26'
+          }
+        ],
+        'dc.description.abstract': [
+          {
+            language: 'en_US',
+            value: 'This is the abstract'
+          }
+        ],
+        'person.familyName': [
+          {
+            value: 'Michel'
+          }
+        ],
+        'dspace.entity.type': [
+          {
+            value: 'Person'
+          }
+        ]
+      }
+    })
+});
+const mockOrgUnit: ItemSearchResult = Object.assign(new ItemSearchResult(), {
+  hitHighlights: {
+    'organization.legalName': [{
+      value: '<em>Science</em>'
+    }],
+  },
+  indexableObject:
+    Object.assign(new Item(), {
+      bundles: observableOf({}),
+      entityType: 'OrgUnit',
+      metadata: {
+        'dc.title': [
+          {
+            language: 'en_US',
+            value: 'This is just another title'
+          }
+        ],
+        'dc.contributor.author': [
+          {
+            language: 'en_US',
+            value: 'Smith, Donald'
+          }
+        ],
+        'dc.publisher': [
+          {
+            language: 'en_US',
+            value: 'a publisher'
+          }
+        ],
+        'dc.date.issued': [
+          {
+            language: 'en_US',
+            value: '2015-06-26'
+          }
+        ],
+        'dc.description.abstract': [
+          {
+            language: 'en_US',
+            value: 'This is the abstract'
+          }
+        ],
+        'organization.legalName': [
+          {
+            value: 'Science'
+          }
+        ],
+        'dspace.entity.type': [
+          {
+            value: 'OrgUnit'
+          }
+        ]
+      }
+    })
+});
 const environmentUseThumbs = {
   browseBy: {
     showThumbnails: true
@@ -220,6 +329,30 @@ describe('ItemSearchResultListElementComponent', () => {
     });
   });
 
+  describe('When the item is Person and has title', () => {
+    beforeEach(() => {
+      publicationListElementComponent.object = mockPerson;
+      fixture.detectChanges();
+    });
+
+    it('should show highlighted title', () => {
+      const titleField = fixture.debugElement.query(By.css('.item-list-title'));
+      expect(titleField.nativeNode.innerHTML).toEqual('<em>Michel</em>');
+    });
+  });
+
+  describe('When the item is orgUnit and has title', () => {
+    beforeEach(() => {
+      publicationListElementComponent.object = mockOrgUnit;
+      fixture.detectChanges();
+    });
+
+    it('should show highlighted title', () => {
+      const titleField = fixture.debugElement.query(By.css('.item-list-title'));
+      expect(titleField.nativeNode.innerHTML).toEqual('<em>Science</em>');
+    });
+  });
+
   describe('When the item has no title', () => {
     beforeEach(() => {
       publicationListElementComponent.object = mockItemWithoutMetadata;

From 6396e6a585b964d3c8ce0f111c9a7be3512be797 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 11 Jan 2023 12:33:26 -0600
Subject: [PATCH 109/160] Add DataCite to i18n list of sources

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

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index d043d61ae5..d2bd425df0 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3836,6 +3836,8 @@
 
   "submission.import-external.source.crossref": "CrossRef",
 
+  "submission.import-external.source.datacite": "DataCite",
+
   "submission.import-external.source.scielo": "SciELO",
 
   "submission.import-external.source.scopus": "Scopus",

From 357525e68ac830b33062c70a73db28fc1478ab42 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Mon, 9 Jan 2023 10:32:49 -0800
Subject: [PATCH 110/160] Ignore IP authentication method in login component.

lint fix

using enum

Simplified assignment.
---
 src/app/shared/log-in/log-in.component.html |  2 +-
 src/app/shared/log-in/log-in.component.ts   | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html
index 6e4685a07b..36f7034f4d 100644
--- a/src/app/shared/log-in/log-in.component.html
+++ b/src/app/shared/log-in/log-in.component.html
@@ -1,6 +1,6 @@
 <ds-themed-loading *ngIf="(loading | async) || (isAuthenticated | async)" class="m-5"></ds-themed-loading>
 <div *ngIf="!(loading | async) && !(isAuthenticated | async)" class="px-4 py-3 login-container">
-  <ng-container *ngFor="let authMethod of (authMethods | async); let i = index">
+  <ng-container *ngFor="let authMethod of (authMethods); let i = index">
     <div *ngIf="i === 1" class="text-center mt-2">
       <span class="align-middle">{{"login.form.or-divider" | translate}}</span>
     </div>
diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts
index 120f3ac4fa..cb47d49f88 100644
--- a/src/app/shared/log-in/log-in.component.ts
+++ b/src/app/shared/log-in/log-in.component.ts
@@ -14,6 +14,7 @@ import { AuthService } from '../../core/auth/auth.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { CoreState } from '../../core/core-state.model';
+import { AuthMethodType } from '../../core/auth/models/auth.method-type';
 
 /**
  * /users/sign-in
@@ -36,7 +37,7 @@ export class LogInComponent implements OnInit {
    * The list of authentication methods available
    * @type {AuthMethod[]}
    */
-  public authMethods: Observable<AuthMethod[]>;
+  public authMethods: AuthMethod[];
 
   /**
    * Whether user is authenticated.
@@ -62,9 +63,12 @@ export class LogInComponent implements OnInit {
 
   ngOnInit(): void {
 
-    this.authMethods = this.store.pipe(
+    this.store.pipe(
       select(getAuthenticationMethods),
-    );
+    ).subscribe(methods => {
+      // ignore the ip authentication method when it's returned by the backend
+      this.authMethods = methods.filter(a => a.authMethodType !== AuthMethodType.Ip)
+    });
 
     // set loading
     this.loading = this.store.pipe(select(isAuthenticationLoading));

From 65af3973ba86bb4d4b300873784f84165c4b8c8a Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Wed, 11 Jan 2023 12:03:19 -0800
Subject: [PATCH 111/160] fixed lint error

---
 src/app/shared/log-in/log-in.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts
index cb47d49f88..e6b2ba9dcf 100644
--- a/src/app/shared/log-in/log-in.component.ts
+++ b/src/app/shared/log-in/log-in.component.ts
@@ -67,7 +67,7 @@ export class LogInComponent implements OnInit {
       select(getAuthenticationMethods),
     ).subscribe(methods => {
       // ignore the ip authentication method when it's returned by the backend
-      this.authMethods = methods.filter(a => a.authMethodType !== AuthMethodType.Ip)
+      this.authMethods = methods.filter(a => a.authMethodType !== AuthMethodType.Ip);
     });
 
     // set loading

From 0dd6333e05cf9db96334c55f83fdfdcb2045c0b2 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Wed, 12 Oct 2022 16:44:13 +0200
Subject: [PATCH 112/160] [CST-7392] [DSC-773] login menu refactoring

---
 .../log-in-external-provider.component.html   |   3 +
 .../log-in-external-provider.component.scss}  |   0
 ...og-in-external-provider.component.spec.ts} |  19 +--
 .../log-in-external-provider.component.ts     |  30 ++--
 .../methods/oidc/log-in-oidc.component.html   |   3 -
 .../oidc/log-in-oidc.component.spec.ts        | 155 ------------------
 .../methods/oidc/log-in-oidc.component.ts     |  21 ---
 .../methods/orcid/log-in-orcid.component.html |   3 -
 .../methods/orcid/log-in-orcid.component.ts   |  21 ---
 .../log-in-shibboleth.component.html          |   3 -
 .../log-in-shibboleth.component.spec.ts       | 155 ------------------
 .../shibboleth/log-in-shibboleth.component.ts |  23 ---
 src/app/shared/shared.module.ts               |   9 +-
 13 files changed, 34 insertions(+), 411 deletions(-)
 create mode 100644 src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html
 rename src/app/shared/log-in/methods/{shibboleth/log-in-shibboleth.component.scss => log-in-external-provider/log-in-external-provider.component.scss} (100%)
 rename src/app/shared/log-in/methods/{orcid/log-in-orcid.component.spec.ts => log-in-external-provider/log-in-external-provider.component.spec.ts} (88%)
 rename src/app/shared/log-in/methods/{ => log-in-external-provider}/log-in-external-provider.component.ts (73%)
 delete mode 100644 src/app/shared/log-in/methods/oidc/log-in-oidc.component.html
 delete mode 100644 src/app/shared/log-in/methods/oidc/log-in-oidc.component.spec.ts
 delete mode 100644 src/app/shared/log-in/methods/oidc/log-in-oidc.component.ts
 delete mode 100644 src/app/shared/log-in/methods/orcid/log-in-orcid.component.html
 delete mode 100644 src/app/shared/log-in/methods/orcid/log-in-orcid.component.ts
 delete mode 100644 src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.html
 delete mode 100644 src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.spec.ts
 delete mode 100644 src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.ts

diff --git a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html
new file mode 100644
index 0000000000..6046aec725
--- /dev/null
+++ b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html
@@ -0,0 +1,3 @@
+<button class="btn btn-lg btn-primary btn-block mt-2 text-white" (click)="redirectToExternalProvider()">
+  <i class="fas fa-sign-in-alt"></i> {{getButtonLabel() | translate}}
+</button>
diff --git a/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.scss b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.scss
similarity index 100%
rename from src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.scss
rename to src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.scss
diff --git a/src/app/shared/log-in/methods/orcid/log-in-orcid.component.spec.ts b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts
similarity index 88%
rename from src/app/shared/log-in/methods/orcid/log-in-orcid.component.spec.ts
rename to src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts
index 001f0a4959..de4f62eb9e 100644
--- a/src/app/shared/log-in/methods/orcid/log-in-orcid.component.spec.ts
+++ b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts
@@ -14,18 +14,17 @@ import { AuthServiceStub } from '../../../testing/auth-service.stub';
 import { storeModuleConfig } from '../../../../app.reducer';
 import { AuthMethod } from '../../../../core/auth/models/auth.method';
 import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
-import { LogInOrcidComponent } from './log-in-orcid.component';
+import { LogInExternalProviderComponent } from './log-in-external-provider.component';
 import { NativeWindowService } from '../../../../core/services/window.service';
 import { RouterStub } from '../../../testing/router.stub';
 import { ActivatedRouteStub } from '../../../testing/active-router.stub';
 import { NativeWindowMockFactory } from '../../../mocks/mock-native-window-ref';
 import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
 
+describe('LogInExternalProviderComponent', () => {
 
-describe('LogInOrcidComponent', () => {
-
-  let component: LogInOrcidComponent;
-  let fixture: ComponentFixture<LogInOrcidComponent>;
+  let component: LogInExternalProviderComponent;
+  let fixture: ComponentFixture<LogInExternalProviderComponent>;
   let page: Page;
   let user: EPerson;
   let componentAsAny: any;
@@ -66,7 +65,7 @@ describe('LogInOrcidComponent', () => {
         TranslateModule.forRoot()
       ],
       declarations: [
-        LogInOrcidComponent
+        LogInExternalProviderComponent
       ],
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
@@ -88,7 +87,7 @@ describe('LogInOrcidComponent', () => {
 
   beforeEach(() => {
     // create component and test fixture
-    fixture = TestBed.createComponent(LogInOrcidComponent);
+    fixture = TestBed.createComponent(LogInExternalProviderComponent);
 
     // get test component from the fixture
     component = fixture.componentInstance;
@@ -109,7 +108,7 @@ describe('LogInOrcidComponent', () => {
     expect(componentAsAny.injectedAuthMethodModel.location).toBe(location);
     expect(componentAsAny._window.nativeWindow.location.href).toBe(currentUrl);
 
-    component.redirectToOrcid();
+    component.redirectToExternalProvider();
 
     expect(setHrefSpy).toHaveBeenCalledWith(currentUrl);
 
@@ -124,7 +123,7 @@ describe('LogInOrcidComponent', () => {
     expect(componentAsAny.injectedAuthMethodModel.location).toBe(location);
     expect(componentAsAny._window.nativeWindow.location.href).toBe(currentUrl);
 
-    component.redirectToOrcid();
+    component.redirectToExternalProvider();
 
     expect(setHrefSpy).toHaveBeenCalledWith(currentUrl);
 
@@ -143,7 +142,7 @@ class Page {
   public navigateSpy: jasmine.Spy;
   public passwordInput: HTMLInputElement;
 
-  constructor(private component: LogInOrcidComponent, private fixture: ComponentFixture<LogInOrcidComponent>) {
+  constructor(private component: LogInExternalProviderComponent, private fixture: ComponentFixture<LogInExternalProviderComponent>) {
     // use injector to get services
     const injector = fixture.debugElement.injector;
     const store = injector.get(Store);
diff --git a/src/app/shared/log-in/methods/log-in-external-provider.component.ts b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts
similarity index 73%
rename from src/app/shared/log-in/methods/log-in-external-provider.component.ts
rename to src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts
index 037fc40e90..f182968457 100644
--- a/src/app/shared/log-in/methods/log-in-external-provider.component.ts
+++ b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts
@@ -4,22 +4,27 @@ import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { select, Store } from '@ngrx/store';
 
-import { AuthMethod } from '../../../core/auth/models/auth.method';
+import { AuthMethod } from '../../../../core/auth/models/auth.method';
 
-import { isAuthenticated, isAuthenticationLoading } from '../../../core/auth/selectors';
-import { NativeWindowRef, NativeWindowService } from '../../../core/services/window.service';
-import { isEmpty, isNotNull } from '../../empty.util';
-import { AuthService } from '../../../core/auth/auth.service';
-import { HardRedirectService } from '../../../core/services/hard-redirect.service';
-import { URLCombiner } from '../../../core/url-combiner/url-combiner';
-import { CoreState } from '../../../core/core-state.model';
+import { isAuthenticated, isAuthenticationLoading } from '../../../../core/auth/selectors';
+import { NativeWindowRef, NativeWindowService } from '../../../../core/services/window.service';
+import { isEmpty, isNotNull } from '../../../empty.util';
+import { AuthService } from '../../../../core/auth/auth.service';
+import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
+import { URLCombiner } from '../../../../core/url-combiner/url-combiner';
+import { CoreState } from '../../../../core/core-state.model';
+import { renderAuthMethodFor } from '../log-in.methods-decorator';
+import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
 
 @Component({
   selector: 'ds-log-in-external-provider',
-  template: ''
-
+  templateUrl: './log-in-external-provider.component.html',
+  styleUrls: ['./log-in-external-provider.component.scss']
 })
-export abstract class LogInExternalProviderComponent implements OnInit {
+@renderAuthMethodFor(AuthMethodType.Oidc)
+@renderAuthMethodFor(AuthMethodType.Shibboleth)
+@renderAuthMethodFor(AuthMethodType.Orcid)
+export class LogInExternalProviderComponent implements OnInit {
 
   /**
    * The authentication method data.
@@ -107,4 +112,7 @@ export abstract class LogInExternalProviderComponent implements OnInit {
 
   }
 
+  getButtonLabel() {
+    return `login.form.${this.authMethod.authMethodType}`;
+  }
 }
diff --git a/src/app/shared/log-in/methods/oidc/log-in-oidc.component.html b/src/app/shared/log-in/methods/oidc/log-in-oidc.component.html
deleted file mode 100644
index 7e78834305..0000000000
--- a/src/app/shared/log-in/methods/oidc/log-in-oidc.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<button class="btn btn-lg btn-primary btn-block mt-2 text-white" (click)="redirectToOidc()">
-  <i class="fas fa-sign-in-alt"></i> {{"login.form.oidc" | translate}}
-</button>
\ No newline at end of file
diff --git a/src/app/shared/log-in/methods/oidc/log-in-oidc.component.spec.ts b/src/app/shared/log-in/methods/oidc/log-in-oidc.component.spec.ts
deleted file mode 100644
index 078a58dd5a..0000000000
--- a/src/app/shared/log-in/methods/oidc/log-in-oidc.component.spec.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { provideMockStore } from '@ngrx/store/testing';
-import { Store, StoreModule } from '@ngrx/store';
-import { TranslateModule } from '@ngx-translate/core';
-
-import { EPerson } from '../../../../core/eperson/models/eperson.model';
-import { EPersonMock } from '../../../testing/eperson.mock';
-import { authReducer } from '../../../../core/auth/auth.reducer';
-import { AuthService } from '../../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../../testing/auth-service.stub';
-import { storeModuleConfig } from '../../../../app.reducer';
-import { AuthMethod } from '../../../../core/auth/models/auth.method';
-import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
-import { LogInOidcComponent } from './log-in-oidc.component';
-import { NativeWindowService } from '../../../../core/services/window.service';
-import { RouterStub } from '../../../testing/router.stub';
-import { ActivatedRouteStub } from '../../../testing/active-router.stub';
-import { NativeWindowMockFactory } from '../../../mocks/mock-native-window-ref';
-import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
-
-
-describe('LogInOidcComponent', () => {
-
-  let component: LogInOidcComponent;
-  let fixture: ComponentFixture<LogInOidcComponent>;
-  let page: Page;
-  let user: EPerson;
-  let componentAsAny: any;
-  let setHrefSpy;
-  let oidcBaseUrl;
-  let location;
-  let initialState: any;
-  let hardRedirectService: HardRedirectService;
-
-  beforeEach(() => {
-    user = EPersonMock;
-    oidcBaseUrl = 'dspace-rest.test/oidc?redirectUrl=';
-    location = oidcBaseUrl + 'http://dspace-angular.test/home';
-
-    hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
-      getCurrentRoute: {},
-      redirect: {}
-    });
-
-    initialState = {
-      core: {
-        auth: {
-          authenticated: false,
-          loaded: false,
-          blocking: false,
-          loading: false,
-          authMethods: []
-        }
-      }
-    };
-  });
-
-  beforeEach(waitForAsync(() => {
-    // refine the test module by declaring the test component
-    TestBed.configureTestingModule({
-      imports: [
-        StoreModule.forRoot({ auth: authReducer }, storeModuleConfig),
-        TranslateModule.forRoot()
-      ],
-      declarations: [
-        LogInOidcComponent
-      ],
-      providers: [
-        { provide: AuthService, useClass: AuthServiceStub },
-        { provide: 'authMethodProvider', useValue: new AuthMethod(AuthMethodType.Oidc, location) },
-        { provide: 'isStandalonePage', useValue: true },
-        { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
-        { provide: Router, useValue: new RouterStub() },
-        { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
-        { provide: HardRedirectService, useValue: hardRedirectService },
-        provideMockStore({ initialState }),
-      ],
-      schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
-    })
-      .compileComponents();
-
-  }));
-
-  beforeEach(() => {
-    // create component and test fixture
-    fixture = TestBed.createComponent(LogInOidcComponent);
-
-    // get test component from the fixture
-    component = fixture.componentInstance;
-    componentAsAny = component;
-
-    // create page
-    page = new Page(component, fixture);
-    setHrefSpy = spyOnProperty(componentAsAny._window.nativeWindow.location, 'href', 'set').and.callThrough();
-
-  });
-
-  it('should set the properly a new redirectUrl', () => {
-    const currentUrl = 'http://dspace-angular.test/collections/12345';
-    componentAsAny._window.nativeWindow.location.href = currentUrl;
-
-    fixture.detectChanges();
-
-    expect(componentAsAny.injectedAuthMethodModel.location).toBe(location);
-    expect(componentAsAny._window.nativeWindow.location.href).toBe(currentUrl);
-
-    component.redirectToOidc();
-
-    expect(setHrefSpy).toHaveBeenCalledWith(currentUrl);
-
-  });
-
-  it('should not set a new redirectUrl', () => {
-    const currentUrl = 'http://dspace-angular.test/home';
-    componentAsAny._window.nativeWindow.location.href = currentUrl;
-
-    fixture.detectChanges();
-
-    expect(componentAsAny.injectedAuthMethodModel.location).toBe(location);
-    expect(componentAsAny._window.nativeWindow.location.href).toBe(currentUrl);
-
-    component.redirectToOidc();
-
-    expect(setHrefSpy).toHaveBeenCalledWith(currentUrl);
-
-  });
-
-});
-
-/**
- * I represent the DOM elements and attach spies.
- *
- * @class Page
- */
-class Page {
-
-  public emailInput: HTMLInputElement;
-  public navigateSpy: jasmine.Spy;
-  public passwordInput: HTMLInputElement;
-
-  constructor(private component: LogInOidcComponent, private fixture: ComponentFixture<LogInOidcComponent>) {
-    // use injector to get services
-    const injector = fixture.debugElement.injector;
-    const store = injector.get(Store);
-
-    // add spies
-    this.navigateSpy = spyOn(store, 'dispatch');
-  }
-
-}
diff --git a/src/app/shared/log-in/methods/oidc/log-in-oidc.component.ts b/src/app/shared/log-in/methods/oidc/log-in-oidc.component.ts
deleted file mode 100644
index 882996b207..0000000000
--- a/src/app/shared/log-in/methods/oidc/log-in-oidc.component.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Component, } from '@angular/core';
-
-import { renderAuthMethodFor } from '../log-in.methods-decorator';
-import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
-import { LogInExternalProviderComponent } from '../log-in-external-provider.component';
-
-@Component({
-  selector: 'ds-log-in-oidc',
-  templateUrl: './log-in-oidc.component.html',
-})
-@renderAuthMethodFor(AuthMethodType.Oidc)
-export class LogInOidcComponent extends LogInExternalProviderComponent {
-
-  /**
-   * Redirect to orcid authentication url
-   */
-  redirectToOidc() {
-    this.redirectToExternalProvider();
-  }
-
-}
diff --git a/src/app/shared/log-in/methods/orcid/log-in-orcid.component.html b/src/app/shared/log-in/methods/orcid/log-in-orcid.component.html
deleted file mode 100644
index 6f5453fd60..0000000000
--- a/src/app/shared/log-in/methods/orcid/log-in-orcid.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<button class="btn btn-lg btn-primary btn-block mt-2 text-white" (click)="redirectToOrcid()">
-  <i class="fas fa-sign-in-alt"></i> {{"login.form.orcid" | translate}}
-</button>
\ No newline at end of file
diff --git a/src/app/shared/log-in/methods/orcid/log-in-orcid.component.ts b/src/app/shared/log-in/methods/orcid/log-in-orcid.component.ts
deleted file mode 100644
index e0b1da3db5..0000000000
--- a/src/app/shared/log-in/methods/orcid/log-in-orcid.component.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Component, } from '@angular/core';
-
-import { renderAuthMethodFor } from '../log-in.methods-decorator';
-import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
-import { LogInExternalProviderComponent } from '../log-in-external-provider.component';
-
-@Component({
-  selector: 'ds-log-in-orcid',
-  templateUrl: './log-in-orcid.component.html',
-})
-@renderAuthMethodFor(AuthMethodType.Orcid)
-export class LogInOrcidComponent extends LogInExternalProviderComponent {
-
-  /**
-   * Redirect to orcid authentication url
-   */
-  redirectToOrcid() {
-    this.redirectToExternalProvider();
-  }
-
-}
diff --git a/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.html b/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.html
deleted file mode 100644
index 3a3b935cfa..0000000000
--- a/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<button class="btn btn-lg btn-primary btn-block mt-2 text-white" (click)="redirectToShibboleth()">
-  <i class="fas fa-sign-in-alt"></i> {{"login.form.shibboleth" | translate}}
-</button>
diff --git a/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.spec.ts b/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.spec.ts
deleted file mode 100644
index 075d33d98e..0000000000
--- a/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.spec.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { provideMockStore } from '@ngrx/store/testing';
-import { Store, StoreModule } from '@ngrx/store';
-import { TranslateModule } from '@ngx-translate/core';
-
-import { EPerson } from '../../../../core/eperson/models/eperson.model';
-import { EPersonMock } from '../../../testing/eperson.mock';
-import { authReducer } from '../../../../core/auth/auth.reducer';
-import { AuthService } from '../../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../../testing/auth-service.stub';
-import { storeModuleConfig } from '../../../../app.reducer';
-import { AuthMethod } from '../../../../core/auth/models/auth.method';
-import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
-import { LogInShibbolethComponent } from './log-in-shibboleth.component';
-import { NativeWindowService } from '../../../../core/services/window.service';
-import { RouterStub } from '../../../testing/router.stub';
-import { ActivatedRouteStub } from '../../../testing/active-router.stub';
-import { NativeWindowMockFactory } from '../../../mocks/mock-native-window-ref';
-import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
-
-
-describe('LogInShibbolethComponent', () => {
-
-  let component: LogInShibbolethComponent;
-  let fixture: ComponentFixture<LogInShibbolethComponent>;
-  let page: Page;
-  let user: EPerson;
-  let componentAsAny: any;
-  let setHrefSpy;
-  let shibbolethBaseUrl;
-  let location;
-  let initialState: any;
-  let hardRedirectService: HardRedirectService;
-
-  beforeEach(() => {
-    user = EPersonMock;
-    shibbolethBaseUrl = 'dspace-rest.test/shibboleth?redirectUrl=';
-    location = shibbolethBaseUrl + 'http://dspace-angular.test/home';
-
-    hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
-      getCurrentRoute: {},
-      redirect: {}
-    });
-
-    initialState = {
-      core: {
-        auth: {
-          authenticated: false,
-          loaded: false,
-          blocking: false,
-          loading: false,
-          authMethods: []
-        }
-      }
-    };
-  });
-
-  beforeEach(waitForAsync(() => {
-    // refine the test module by declaring the test component
-    TestBed.configureTestingModule({
-      imports: [
-        StoreModule.forRoot({ auth: authReducer }, storeModuleConfig),
-        TranslateModule.forRoot()
-      ],
-      declarations: [
-        LogInShibbolethComponent
-      ],
-      providers: [
-        { provide: AuthService, useClass: AuthServiceStub },
-        { provide: 'authMethodProvider', useValue: new AuthMethod(AuthMethodType.Shibboleth, location) },
-        { provide: 'isStandalonePage', useValue: true },
-        { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
-        { provide: Router, useValue: new RouterStub() },
-        { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
-        { provide: HardRedirectService, useValue: hardRedirectService },
-        provideMockStore({ initialState }),
-      ],
-      schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
-    })
-      .compileComponents();
-
-  }));
-
-  beforeEach(() => {
-    // create component and test fixture
-    fixture = TestBed.createComponent(LogInShibbolethComponent);
-
-    // get test component from the fixture
-    component = fixture.componentInstance;
-    componentAsAny = component;
-
-    // create page
-    page = new Page(component, fixture);
-    setHrefSpy = spyOnProperty(componentAsAny._window.nativeWindow.location, 'href', 'set').and.callThrough();
-
-  });
-
-  it('should set the properly a new redirectUrl', () => {
-    const currentUrl = 'http://dspace-angular.test/collections/12345';
-    componentAsAny._window.nativeWindow.location.href = currentUrl;
-
-    fixture.detectChanges();
-
-    expect(componentAsAny.injectedAuthMethodModel.location).toBe(location);
-    expect(componentAsAny._window.nativeWindow.location.href).toBe(currentUrl);
-
-    component.redirectToShibboleth();
-
-    expect(setHrefSpy).toHaveBeenCalledWith(currentUrl);
-
-  });
-
-  it('should not set a new redirectUrl', () => {
-    const currentUrl = 'http://dspace-angular.test/home';
-    componentAsAny._window.nativeWindow.location.href = currentUrl;
-
-    fixture.detectChanges();
-
-    expect(componentAsAny.injectedAuthMethodModel.location).toBe(location);
-    expect(componentAsAny._window.nativeWindow.location.href).toBe(currentUrl);
-
-    component.redirectToShibboleth();
-
-    expect(setHrefSpy).toHaveBeenCalledWith(currentUrl);
-
-  });
-
-});
-
-/**
- * I represent the DOM elements and attach spies.
- *
- * @class Page
- */
-class Page {
-
-  public emailInput: HTMLInputElement;
-  public navigateSpy: jasmine.Spy;
-  public passwordInput: HTMLInputElement;
-
-  constructor(private component: LogInShibbolethComponent, private fixture: ComponentFixture<LogInShibbolethComponent>) {
-    // use injector to get services
-    const injector = fixture.debugElement.injector;
-    const store = injector.get(Store);
-
-    // add spies
-    this.navigateSpy = spyOn(store, 'dispatch');
-  }
-
-}
diff --git a/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.ts b/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.ts
deleted file mode 100644
index dcfb3ccfc3..0000000000
--- a/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Component, } from '@angular/core';
-
-import { renderAuthMethodFor } from '../log-in.methods-decorator';
-import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
-import { LogInExternalProviderComponent } from '../log-in-external-provider.component';
-
-@Component({
-  selector: 'ds-log-in-shibboleth',
-  templateUrl: './log-in-shibboleth.component.html',
-  styleUrls: ['./log-in-shibboleth.component.scss'],
-
-})
-@renderAuthMethodFor(AuthMethodType.Shibboleth)
-export class LogInShibbolethComponent extends LogInExternalProviderComponent {
-
-  /**
-   * Redirect to shibboleth authentication url
-   */
-  redirectToShibboleth() {
-    this.redirectToExternalProvider();
-  }
-
-}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index e4abf0d907..777ad03c1d 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -186,7 +186,6 @@ import {
   ImportableListItemControlComponent
 } from './object-collection/shared/importable-list-item-control/importable-list-item-control.component';
 import { LogInContainerComponent } from './log-in/container/log-in-container.component';
-import { LogInShibbolethComponent } from './log-in/methods/shibboleth/log-in-shibboleth.component';
 import { LogInPasswordComponent } from './log-in/methods/password/log-in-password.component';
 import { LogInComponent } from './log-in/log-in.component';
 import { MissingTranslationHelper } from './translate/missing-translation.helper';
@@ -229,9 +228,7 @@ import { SearchNavbarComponent } from '../search-navbar/search-navbar.component'
 import { ThemedSearchNavbarComponent } from '../search-navbar/themed-search-navbar.component';
 import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/scope-selector-modal.component';
 import { DsSelectComponent } from './ds-select/ds-select.component';
-import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component';
 import { RSSComponent } from './rss-feed/rss.component';
-import { LogInOrcidComponent } from './log-in/methods/orcid/log-in-orcid.component';
 import { BrowserOnlyPipe } from './utils/browser-only.pipe';
 import { ThemedLoadingComponent } from './loading/themed-loading.component';
 import { SearchExportCsvComponent } from './search/search-export-csv/search-export-csv.component';
@@ -246,6 +243,8 @@ import {
 } from './object-list/listable-notification-object/listable-notification-object.component';
 import { ThemedCollectionDropdownComponent } from './collection-dropdown/themed-collection-dropdown.component';
 import { MetadataFieldWrapperComponent } from './metadata-field-wrapper/metadata-field-wrapper.component';
+import { LogInExternalProviderComponent } from './log-in/methods/log-in-external-provider/log-in-external-provider.component';
+
 
 const MODULES = [
   CommonModule,
@@ -386,9 +385,7 @@ const ENTRY_COMPONENTS = [
   MetadataRepresentationListElementComponent,
   ItemMetadataRepresentationListElementComponent,
   LogInPasswordComponent,
-  LogInShibbolethComponent,
-  LogInOidcComponent,
-  LogInOrcidComponent,
+  LogInExternalProviderComponent,
   CollectionDropdownComponent,
   ThemedCollectionDropdownComponent,
   FileDownloadLinkComponent,

From 1062dc4341c9878ccc64c5b64b999d3f32d8694a Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 12 Jan 2023 17:06:15 +0100
Subject: [PATCH 113/160] 97287: Remove unused import

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

diff --git a/src/modules/app/server-app.module.ts b/src/modules/app/server-app.module.ts
index 4b51a846f9..81426e7fcc 100644
--- a/src/modules/app/server-app.module.ts
+++ b/src/modules/app/server-app.module.ts
@@ -9,8 +9,7 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import {
   Angulartics2,
   Angulartics2GoogleAnalytics,
-  Angulartics2GoogleGlobalSiteTag,
-  Angulartics2GoogleTagManager
+  Angulartics2GoogleGlobalSiteTag
 } from 'angulartics2';
 
 import { AppComponent } from '../../app/app.component';

From 0fe966502663b18924e2fba55573b937736dbf39 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Thu, 12 Jan 2023 18:42:59 -0800
Subject: [PATCH 114/160] removed code repetition

---
 .../journal-issue.component.html              |  7 +-
 .../journal-issue.component.scss              |  3 -
 .../journal-volume.component.html             |  7 +-
 .../journal-volume.component.scss             |  4 -
 .../item-pages/journal/journal.component.html |  7 +-
 .../item-pages/journal/journal.component.scss |  4 -
 .../org-unit/org-unit.component.html          |  7 +-
 .../org-unit/org-unit.component.scss          |  4 -
 .../item-pages/person/person.component.html   |  7 +-
 .../item-pages/person/person.component.scss   |  4 -
 .../item-pages/project/project.component.html |  7 +-
 .../item-pages/project/project.component.scss |  4 -
 .../publication/publication.component.html    |  7 +-
 .../publication/publication.component.scss    |  3 -
 .../item-types/shared/item.component.spec.ts  | 78 -------------------
 .../item-types/shared/item.component.ts       |  8 --
 .../untyped-item/untyped-item.component.html  |  7 +-
 .../untyped-item/untyped-item.component.scss  |  4 +-
 .../shared/browse-by/browse-by.component.html |  4 +-
 .../results-back-button.component.html        |  3 +-
 .../results-back-button.component.scss        |  4 -
 .../results-back-button.component.spec.ts     | 55 +++++++++++--
 .../results-back-button.component.ts          | 14 +++-
 .../themed-results-back-button.component.ts   |  9 ++-
 24 files changed, 82 insertions(+), 179 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
index db3d3f8bd1..11d722f317 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
@@ -1,9 +1,4 @@
-<div class="row" *ngIf="showBackButton | async">
-  <div class="col-12">
-    <ds-themed-results-back-button></ds-themed-results-back-button>
-  </div>
-</div>
-
+<ds-themed-results-back-button></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss
index b596e76018..b810d2ddd4 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss
@@ -1,5 +1,2 @@
 @import '../../../../../styles/variables.scss';
 
-button.back-btn {
-  margin-bottom: 10px;
-}
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
index 957d409ed0..4475fbec8a 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -1,9 +1,4 @@
-<div class="row" *ngIf="showBackButton | async">
-  <div class="col-12">
-    <ds-themed-results-back-button></ds-themed-results-back-button>
-  </div>
-</div>
-
+<ds-themed-results-back-button></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss
index b596e76018..3575cae797 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss
@@ -1,5 +1 @@
 @import '../../../../../styles/variables.scss';
-
-button.back-btn {
-  margin-bottom: 10px;
-}
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index c6ad79628d..1c079ed36f 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -1,9 +1,4 @@
-<div class="row" *ngIf="showBackButton | async">
-  <div class="col-12">
-    <ds-themed-results-back-button></ds-themed-results-back-button>
-  </div>
-</div>
-
+<ds-themed-results-back-button></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss
index b596e76018..3575cae797 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss
@@ -1,5 +1 @@
 @import '../../../../../styles/variables.scss';
-
-button.back-btn {
-  margin-bottom: 10px;
-}
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
index 06d6ba5b1d..87c9cc2fa1 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -1,9 +1,4 @@
-<div class="row" *ngIf="showBackButton | async">
-  <div class="col-12">
-    <ds-themed-results-back-button></ds-themed-results-back-button>
-  </div>
-</div>
-
+<ds-themed-results-back-button></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss
index b596e76018..3575cae797 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss
@@ -1,5 +1 @@
 @import '../../../../../styles/variables.scss';
-
-button.back-btn {
-  margin-bottom: 10px;
-}
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
index d02ffeaf55..34c23ebf12 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -1,9 +1,4 @@
-<div class="row" *ngIf="showBackButton | async">
-  <div class="col-12">
-    <ds-themed-results-back-button></ds-themed-results-back-button>
-  </div>
-</div>
-
+<ds-themed-results-back-button></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-item-page-title-field class="mr-auto" [item]="object">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.scss b/src/app/entity-groups/research-entities/item-pages/person/person.component.scss
index b596e76018..3575cae797 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.scss
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.scss
@@ -1,5 +1 @@
 @import '../../../../../styles/variables.scss';
-
-button.back-btn {
-  margin-bottom: 10px;
-}
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
index f1fea10e33..bb49dc507a 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
@@ -1,9 +1,4 @@
-<div class="row" *ngIf="showBackButton | async">
-  <div class="col-12">
-    <ds-themed-results-back-button></ds-themed-results-back-button>
-  </div>
-</div>
-
+<ds-themed-results-back-button></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.scss b/src/app/entity-groups/research-entities/item-pages/project/project.component.scss
index b596e76018..3575cae797 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.scss
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.scss
@@ -1,5 +1 @@
 @import '../../../../../styles/variables.scss';
-
-button.back-btn {
-  margin-bottom: 10px;
-}
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html
index 92da2f14ca..f418f5691e 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/item-page/simple/item-types/publication/publication.component.html
@@ -1,9 +1,4 @@
-<div class="row" *ngIf="showBackButton | async">
-  <div class="col-12">
-    <ds-themed-results-back-button></ds-themed-results-back-button>
-  </div>
-</div>
-
+<ds-themed-results-back-button></ds-themed-results-back-button>
 <div class="row" *ngIf="iiifEnabled">
   <div class="col-12">
     <ds-mirador-viewer  id="iiif-viewer"
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.scss b/src/app/item-page/simple/item-types/publication/publication.component.scss
index b596e76018..b810d2ddd4 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.scss
+++ b/src/app/item-page/simple/item-types/publication/publication.component.scss
@@ -1,5 +1,2 @@
 @import '../../../../../styles/variables.scss';
 
-button.back-btn {
-  margin-bottom: 10px;
-}
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 e08c651f7c..d775a907b2 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
@@ -38,12 +38,9 @@ import { VersionHistoryDataService } from '../../../../core/data/version-history
 import { RouterTestingModule } from '@angular/router/testing';
 import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
 import { ResearcherProfileDataService } from '../../../../core/profile/researcher-profile-data.service';
-import { Router } from '@angular/router';
 
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
-import { ItemComponent } from './item.component';
-import { ItemVersionsSharedService } from '../../../../shared/item/item-versions/item-versions-shared.service';
 
 export function getIIIFSearchEnabled(enabled: boolean): MetadataValue {
   return Object.assign(new MetadataValue(), {
@@ -404,79 +401,4 @@ describe('ItemComponent', () => {
     },
   });
 
-  describe('back to results', () => {
-    let comp: ItemComponent;
-    let fixture: ComponentFixture<any>;
-    let router: Router;
-
-    const searchUrl = '/search?query=test&spc.page=2';
-    const browseUrl = '/browse/title?scope=0cc&bbm.page=3';
-    const recentSubmissionsUrl = '/collections/be7b8430-77a5-4016-91c9-90863e50583a?cp.page=3';
-
-    beforeEach(waitForAsync(() => {
-      TestBed.configureTestingModule({
-        imports: [
-          TranslateModule.forRoot({
-            loader: {
-              provide: TranslateLoader,
-              useClass: TranslateLoaderMock
-            }
-          }),
-          RouterTestingModule,
-        ],
-        declarations: [ItemComponent, GenericItemPageFieldComponent, TruncatePipe ],
-        providers: [
-          { provide: ItemDataService, useValue: {} },
-          { provide: TruncatableService, useValue: {} },
-          { provide: RelationshipDataService, useValue: {} },
-          { provide: ObjectCacheService, useValue: {} },
-          { provide: UUIDService, useValue: {} },
-          { provide: Store, useValue: {} },
-          { provide: RemoteDataBuildService, useValue: {} },
-          { provide: CommunityDataService, useValue: {} },
-          { provide: HALEndpointService, useValue: {} },
-          { provide: NotificationsService, useValue: {} },
-          { provide: HttpClient, useValue: {} },
-          { provide: DSOChangeAnalyzer, useValue: {} },
-          { provide: DefaultChangeAnalyzer, useValue: {} },
-          { provide: VersionHistoryDataService, useValue: {} },
-          { provide: VersionDataService, useValue: {} },
-          { provide: BitstreamDataService, useValue: {} },
-          { provide: WorkspaceitemDataService, useValue: {} },
-          { provide: SearchService, useValue: {} },
-          { provide: ItemDataService, useValue: {} },
-          { provide: ItemVersionsSharedService, useValue: {} },
-          { provide: RouteService, useValue: mockRouteService }
-        ],
-        schemas: [NO_ERRORS_SCHEMA]
-      }).overrideComponent(ItemComponent, {
-        set: {changeDetection: ChangeDetectionStrategy.Default}
-      });
-    }));
-
-    beforeEach(waitForAsync(() => {
-      router = TestBed.inject(Router);
-      spyOn(router, 'navigateByUrl');
-      TestBed.compileComponents();
-      fixture = TestBed.createComponent(ItemComponent);
-      comp = fixture.componentInstance;
-      comp.object = mockItem;
-      fixture.detectChanges();
-    }));
-
-    it('should hide back button',() => {
-      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(''));
-      comp.showBackButton.subscribe((val) => {
-        expect(val).toBeFalse();
-      });
-    });
-    it('should show back button', () => {
-      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(searchUrl));
-      comp.ngOnInit();
-      comp.showBackButton.subscribe((val) => {
-        expect(val).toBeTrue();
-      });
-    });
-  });
-
 });
diff --git a/src/app/item-page/simple/item-types/shared/item.component.ts b/src/app/item-page/simple/item-types/shared/item.component.ts
index 8479bd541a..77da752196 100644
--- a/src/app/item-page/simple/item-types/shared/item.component.ts
+++ b/src/app/item-page/simple/item-types/shared/item.component.ts
@@ -5,7 +5,6 @@ import { getItemPageRoute } from '../../../item-page-routing-paths';
 import { RouteService } from '../../../../core/services/route.service';
 import { Observable } from 'rxjs';
 import { getDSpaceQuery, isIiifEnabled, isIiifSearchEnabled } from './item-iiif-utils';
-import { filter, map, take } from 'rxjs/operators';
 
 @Component({
   selector: 'ds-item',
@@ -55,12 +54,5 @@ export class ItemComponent implements OnInit {
     if (this.iiifSearchEnabled) {
       this.iiifQuery$ = getDSpaceQuery(this.object, this.routeService);
     }
-    // Show the back to results button when the previous context was search, browse,
-    // or recent submissions pagination.
-    this.showBackButton = this.routeService.getPreviousUrl().pipe(
-      filter(url => /^(\/search|\/browse|\/collections|\/admin\/search|\/mydspace)/.test(url)),
-      take(1),
-      map(() => true)
-    );
   }
 }
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
index 9ca50cc2ee..ef96eef620 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -1,9 +1,4 @@
-<div class="row" *ngIf="showBackButton | async">
-  <div class="col-12">
-    <ds-themed-results-back-button></ds-themed-results-back-button>
-  </div>
-</div>
-
+<ds-themed-results-back-button></ds-themed-results-back-button>
 <div class="row" *ngIf="iiifEnabled">
   <div class="col-12">
     <ds-mirador-viewer id="iiif-viewer"
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss
index efbfe5c4f9..b810d2ddd4 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss
@@ -1,4 +1,2 @@
 @import '../../../../../styles/variables.scss';
-button.back-btn {
-  margin-bottom: 10px;
-}
+
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index a4f473f583..bbf7c28395 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -3,7 +3,7 @@
   <ng-container *ngComponentOutlet="getStartsWithComponent(); injector: objectInjector;"></ng-container>
   <div *ngIf="objects?.hasSucceeded && !objects?.isLoading && objects?.payload?.page.length > 0" @fadeIn>
       <div *ngIf="shouldDisplayResetButton$ |async" class="mb-2 reset">
-        <ds-results-back-button [paginationConfig]="paginationConfig" [previousPage$]="previousPage$"></ds-results-back-button>
+        <ds-themed-results-back-button [paginationConfig]="paginationConfig" [previousPage$]="previousPage$"></ds-themed-results-back-button>
       </div>
     <ds-viewable-collection
       [config]="paginationConfig"
@@ -18,7 +18,7 @@
   <ds-error *ngIf="objects?.hasFailed" message="{{'error.browse-by' | translate}}"></ds-error>
   <div *ngIf="!objects?.isLoading && objects?.payload?.page.length === 0">
     <div *ngIf="shouldDisplayResetButton$ |async" class="d-inline-block mb-4 reset">
-      <ds-results-back-button [paginationConfig]="paginationConfig" [previousPage$]="previousPage$" ></ds-results-back-button>
+      <ds-themed-results-back-button [paginationConfig]="paginationConfig" [previousPage$]="previousPage$" ></ds-themed-results-back-button>
     </div>
     <div class="alert alert-info w-100" role="alert">
       {{'browse.empty' | translate}}
diff --git a/src/app/shared/results-back-button/results-back-button.component.html b/src/app/shared/results-back-button/results-back-button.component.html
index 0205d9e80f..f1387c3284 100644
--- a/src/app/shared/results-back-button/results-back-button.component.html
+++ b/src/app/shared/results-back-button/results-back-button.component.html
@@ -1,4 +1,5 @@
-<button class="btn btn-secondary btn-sm back-btn ng-tns-c242-28" (click)="back()">
+<button *ngIf="showBackButton | async" class="btn btn-secondary btn-sm mb-2 ng-tns-c242-28" (click)="back()">
   <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
   {{this.buttonLabel | async}}
 </button>
+
diff --git a/src/app/shared/results-back-button/results-back-button.component.scss b/src/app/shared/results-back-button/results-back-button.component.scss
index 57d3445d89..e69de29bb2 100644
--- a/src/app/shared/results-back-button/results-back-button.component.scss
+++ b/src/app/shared/results-back-button/results-back-button.component.scss
@@ -1,4 +0,0 @@
-
-button.back-btn {
-  margin-bottom: 10px;
-}
diff --git a/src/app/shared/results-back-button/results-back-button.component.spec.ts b/src/app/shared/results-back-button/results-back-button.component.spec.ts
index 8906712b4e..15cefa79a2 100644
--- a/src/app/shared/results-back-button/results-back-button.component.spec.ts
+++ b/src/app/shared/results-back-button/results-back-button.component.spec.ts
@@ -9,6 +9,7 @@ import { Router } from '@angular/router';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../testing/pagination-service.stub';
+import { By } from '@angular/platform-browser';
 
 describe('ResultsBackButtonComponent', () => {
 
@@ -23,12 +24,15 @@ describe('ResultsBackButtonComponent', () => {
   });
 
   const searchUrl = '/search?query=test&spc.page=2';
+  const nonSearchUrl = '/item';
 
-  const mockRouteService = {
-    getPreviousUrl(): Observable<string> {
-      return of(searchUrl);
-    }
-  };
+  function getMockRouteService(url) {
+    return {
+      getPreviousUrl(): Observable < string > {
+        return of(url);
+      }
+    };
+  }
 
   router = jasmine.createSpyObj('router', {
     navigateByUrl: jasmine.createSpy('navigateByUrl')
@@ -40,6 +44,8 @@ describe('ResultsBackButtonComponent', () => {
 
   describe('back to results', () => {
 
+    const mockRouteService = getMockRouteService(searchUrl);
+
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
         declarations: [ResultsBackButtonComponent],
@@ -73,7 +79,7 @@ describe('ResultsBackButtonComponent', () => {
 
       it('should navigate to previous pagination', () => {
         component.back();
-        expect(mockRouteService.getPreviousUrl).not.toHaveBeenCalled();
+        expect(mockRouteService.getPreviousUrl).toHaveBeenCalled();
         expect(paginationService.updateRoute).toHaveBeenCalled();
       });
 
@@ -97,7 +103,44 @@ describe('ResultsBackButtonComponent', () => {
         expect(router.navigateByUrl).toHaveBeenCalledWith(searchUrl);
       });
     });
+
   });
 
+  describe('back to results', () => {
+
+    const mockRouteService = getMockRouteService(nonSearchUrl);
+
+    beforeEach(waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [ResultsBackButtonComponent],
+        imports: [TranslateModule.forRoot(),
+          RouterTestingModule.withRoutes([])
+        ],
+        providers: [
+          {provide: RouteService, useValue: mockRouteService},
+          {provide: PaginationService, useValue: paginationService},
+          {provide: Router, useValue: router},
+          {provide: TranslateService, useValue: translate}
+        ],
+        schemas: [NO_ERRORS_SCHEMA]
+      }).compileComponents();
+      spyOn(mockRouteService, 'getPreviousUrl').and.callThrough();
+    }));
+
+    describe('previous route not search or browse list', () => {
+      beforeEach(waitForAsync(() => {
+        fixture = TestBed.createComponent(ResultsBackButtonComponent);
+        component = fixture.componentInstance;
+        component.ngOnInit();
+        fixture.detectChanges();
+      }));
+
+      it('should hide back button', () => {
+        let button = fixture.debugElement.query(By.css('button'));
+        expect(button).toBeNull();
+      });
+    });
+
+  });
 });
 
diff --git a/src/app/shared/results-back-button/results-back-button.component.ts b/src/app/shared/results-back-button/results-back-button.component.ts
index c7f1bb3244..69ce31c41e 100644
--- a/src/app/shared/results-back-button/results-back-button.component.ts
+++ b/src/app/shared/results-back-button/results-back-button.component.ts
@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { take } from 'rxjs/operators';
+import { filter, map, take } from 'rxjs/operators';
 import { RouteService } from '../../core/services/route.service';
 import { Router } from '@angular/router';
 import { PaginationService } from '../../core/pagination/pagination.service';
@@ -29,6 +29,11 @@ export class ResultsBackButtonComponent {
    */
   @Input() paginationConfig?: PaginationComponentOptions;
 
+  /**
+   * Used to configure search in mirador.
+   */
+  showBackButton: Observable<boolean>;
+
   /**
    * The button text
    */
@@ -47,13 +52,18 @@ export class ResultsBackButtonComponent {
     } else {
       this.buttonLabel = this.translateService.get('search.browse.item-back');
     }
+    // Show the back to results button when the previous context was a search or browse list.
+    this.showBackButton = this.routeService.getPreviousUrl().pipe(
+      filter(url => /^(\/search|\/browse|\/collections|\/admin\/search|\/mydspace)/.test(url)),
+      take(1),
+      map(() => true)
+    );
   }
 
   /**
    * Navigate back from the item to the previous pagination list.
    */
   public back() {
-
     if (isNotEmpty(this.paginationConfig) && isNotEmpty(this.previousPage$)) {
       // if pagination configuration is provided use it to update the route to the previous browse page.
       const page = +this.previousPage$.value > 1 ? +this.previousPage$.value : 1;
diff --git a/src/app/shared/results-back-button/themed-results-back-button.component.ts b/src/app/shared/results-back-button/themed-results-back-button.component.ts
index fcbb5471fd..cdfa37aaf0 100644
--- a/src/app/shared/results-back-button/themed-results-back-button.component.ts
+++ b/src/app/shared/results-back-button/themed-results-back-button.component.ts
@@ -1,6 +1,8 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { ThemedComponent } from '../theme-support/themed.component';
 import { ResultsBackButtonComponent } from './results-back-button.component';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { BehaviorSubject } from 'rxjs';
 
 @Component({
   selector: 'ds-themed-results-back-button',
@@ -8,6 +10,11 @@ import { ResultsBackButtonComponent } from './results-back-button.component';
   templateUrl: '../theme-support/themed.component.html',
 })
 export class ThemedResultsBackButtonComponent extends ThemedComponent<ResultsBackButtonComponent> {
+
+  @Input() previousPage$?: BehaviorSubject<string>;
+
+  @Input() paginationConfig?: PaginationComponentOptions;
+
   protected getComponentName(): string {
     return 'ResultsBackButtonComponent';
   }

From 99ada45288a0b251f6d5505171b1d70c26fd60ed Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Thu, 12 Jan 2023 18:46:57 -0800
Subject: [PATCH 115/160] removed unused property

---
 src/app/item-page/simple/item-types/shared/item.component.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/app/item-page/simple/item-types/shared/item.component.ts b/src/app/item-page/simple/item-types/shared/item.component.ts
index 77da752196..5d11dda8e9 100644
--- a/src/app/item-page/simple/item-types/shared/item.component.ts
+++ b/src/app/item-page/simple/item-types/shared/item.component.ts
@@ -36,11 +36,6 @@ export class ItemComponent implements OnInit {
    */
   iiifQuery$: Observable<string>;
 
-  /**
-   * Used to configure search in mirador.
-   */
-  showBackButton: Observable<boolean>;
-
   mediaViewer;
 
   constructor(protected routeService: RouteService) {

From e0cadec2c21b44587945edd08e17c3fda1532ed0 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Fri, 13 Jan 2023 12:14:43 +0100
Subject: [PATCH 116/160] 97049: Group keys together

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

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 94fa99455e..584cb6d53f 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3640,6 +3640,7 @@
 
   "search.filters.filter.submitter.label": "Search submitter",
 
+  "search.filters.filter.show-tree": "Browse {{ name }} tree",
 
 
   "search.filters.entityType.JournalIssue": "Journal Issue",
@@ -4514,7 +4515,7 @@
 
   "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
 
-
+  "vocabulary-treeview.info": "Select a subject to add as search filter",
 
   "uploader.browse": "browse",
 
@@ -4841,8 +4842,4 @@
   "home.recent-submissions.head": "Recent Submissions",
 
   "listable-notification-object.default-message": "This object couldn't be retrieved",
-
-  "search.filters.filter.show-tree": "Browse {{ name }} tree",
-
-  "vocabulary-treeview.info": "Select a subject to add as search filter"
 }

From f7787d74bc72fde275bc7e31825962448768f77b Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Fri, 13 Jan 2023 12:28:41 +0100
Subject: [PATCH 117/160] 97732 Tests for ContextHelpService

---
 src/app/shared/context-help.directive.ts    |  1 -
 src/app/shared/context-help.service.spec.ts | 65 ++++++++++++++++++++-
 2 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/context-help.directive.ts b/src/app/shared/context-help.directive.ts
index 20dd48424a..83c3908dcf 100644
--- a/src/app/shared/context-help.directive.ts
+++ b/src/app/shared/context-help.directive.ts
@@ -59,7 +59,6 @@ export class ContextHelpDirective implements OnChanges, OnDestroy {
         = this.componentFactoryResolver.resolveComponentFactory(ContextHelpWrapperComponent);
       this.wrapper = this.viewContainerRef.createComponent(factory);
     }
-    console.log(this.templateRef);
     this.wrapper.instance.templateRef = this.templateRef;
     this.wrapper.instance.content = this.dsContextHelp.content;
     this.wrapper.instance.id = this.dsContextHelp.id;
diff --git a/src/app/shared/context-help.service.spec.ts b/src/app/shared/context-help.service.spec.ts
index d2d29121b0..96b81ee8e1 100644
--- a/src/app/shared/context-help.service.spec.ts
+++ b/src/app/shared/context-help.service.spec.ts
@@ -1,16 +1,77 @@
 import { TestBed } from '@angular/core/testing';
 
 import { ContextHelpService } from './context-help.service';
+import { StoreModule, Store } from '@ngrx/store';
+import { appReducers, storeModuleConfig } from '../app.reducer';
+import { TestScheduler } from 'rxjs/testing';
 
 describe('ContextHelpService', () => {
   let service: ContextHelpService;
+  let store;
+  let initialState;
+  let testScheduler;
+  const booleans = { f: false, t: true };
+  const mkContextHelp = (id: string) => ({ 0: {id, isTooltipVisible: false}, 1: {id, isTooltipVisible: true} })
+
+  beforeEach(async () => {
+    TestBed.configureTestingModule({
+      imports: [
+        StoreModule.forRoot(appReducers, storeModuleConfig)
+      ]
+    });
+  });
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(ContextHelpService);
+    store = TestBed.inject(Store);
+    service = new ContextHelpService(store);
+    testScheduler = new TestScheduler((actual, expected) => expect(actual).toEqual(expected));
   });
 
   it('should be created', () => {
     expect(service).toBeTruthy();
   });
+
+  it('toggleIcons calls should be observable in shouldShowIcons$', () => {
+    testScheduler.run(({cold, expectObservable}) => {
+      const toggles = cold('-xxxxx');
+      toggles.subscribe((_) => service.toggleIcons());
+      expectObservable(service.shouldShowIcons$()).toBe('ftftft', booleans);
+    });
+  });
+
+  it('add and remove calls should be observable in getContextHelp$', () => {
+    testScheduler.run(({cold, expectObservable}) => {
+      const modifications = cold('-abAcCB', {
+        a: () => service.add({id: 'a'}), b: () => service.add({id: 'b'}), c: () => service.add({id: 'c'}),
+        A: () => service.remove('a'), B: () => service.remove('b'), C: () => service.remove('c'),
+      })
+      modifications.subscribe(mod => mod());
+      const match = (id) => ({ 0: undefined, 1: {id} });
+      expectObservable(service.getContextHelp$('a')).toBe('01-0---', match('a'));
+      expectObservable(service.getContextHelp$('b')).toBe('0-1---0', match('b'));
+      expectObservable(service.getContextHelp$('c')).toBe('0---10-', match('c'));
+    });
+  });
+
+  it('toggleTooltip calls should be observable in getContextHelp$', () => {
+    service.add({id: 'a', isTooltipVisible: false});
+    service.add({id: 'b', isTooltipVisible: false});
+    testScheduler.run(({cold, expectObservable}) => {
+      const toggles = cold('-aaababbabba');
+      toggles.subscribe(id => service.toggleTooltip(id));
+      expectObservable(service.getContextHelp$('a')).toBe('0101-0--1--0', mkContextHelp('a'));
+      expectObservable(service.getContextHelp$('b')).toBe('0---1-01-01-', mkContextHelp('b'));
+    });
+  });
+
+  it('hideTooltip and showTooltip calls should be observable in getContextHelp$', () => {
+    service.add({id: 'a', isTooltipVisible: false});
+    testScheduler.run(({cold, expectObservable}) => {
+      const hideShowCalls = cold('-shssshhs', {
+        s: () => service.showTooltip('a'), h: () => service.hideTooltip('a')
+      });
+      hideShowCalls.subscribe(fn => fn());
+      expectObservable(service.getContextHelp$('a')).toBe('010111001', mkContextHelp('a'));
+    });
+  });
 });

From 84c8b7690ac1d95bdbae1a032b161af97719b0cf Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Fri, 13 Jan 2023 14:05:33 +0100
Subject: [PATCH 118/160] 97732 ContextHelpToggleComponent tests

---
 .../context-help-toggle.component.spec.ts      | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
index 16d82f1a0a..93a141cfb2 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
@@ -1,14 +1,25 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ContextHelpToggleComponent } from './context-help-toggle.component';
+import { TranslateService, TranslateModule } from '@ngx-translate/core';
+import { ContextHelpService } from '../../shared/context-help.service';
+import { of as observableOf } from 'rxjs';
+import { By } from '@angular/platform-browser';
 
 describe('ContextHelpToggleComponent', () => {
   let component: ContextHelpToggleComponent;
   let fixture: ComponentFixture<ContextHelpToggleComponent>;
+  let contextHelpService;
 
   beforeEach(async () => {
+    contextHelpService = jasmine.createSpyObj('contextHelpService',
+      ['toggleIcons']);
     await TestBed.configureTestingModule({
-      declarations: [ ContextHelpToggleComponent ]
+      declarations: [ ContextHelpToggleComponent ],
+      providers: [
+        { provide: ContextHelpService, useValue: contextHelpService },
+      ],
+      imports: [ TranslateModule.forRoot() ]
     })
     .compileComponents();
   });
@@ -22,4 +33,9 @@ describe('ContextHelpToggleComponent', () => {
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  it('clicking the button should toggle context help icon visibility', () => {
+    fixture.debugElement.query(By.css('a')).nativeElement.click();
+    expect(contextHelpService.toggleIcons).toHaveBeenCalled();
+  });
 });

From 6bee69bc3f4f5bcb77ac48a0a3ada91228ce3a04 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Fri, 13 Jan 2023 15:45:54 +0100
Subject: [PATCH 119/160] 97732 Completed ContextHelpWrapper tests

---
 .../context-help-wrapper.component.spec.ts    | 57 +++++++++++++++++--
 .../context-help-wrapper.component.ts         | 35 +++++++-----
 2 files changed, 75 insertions(+), 17 deletions(-)

diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
index 3ac27f7090..c0c7f9a821 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf, Observable, BehaviorSubject } from 'rxjs';
+import { of as observableOf, BehaviorSubject } from 'rxjs';
 import { ContextHelpWrapperComponent } from './context-help-wrapper.component';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
@@ -20,6 +20,7 @@ import { By } from '@angular/platform-browser';
       [id]="id"
       [tooltipPlacement]="tooltipPlacement"
       [iconPlacement]="iconPlacement"
+      [dontParseLinks]="dontParseLinks"
     >
     </ds-context-help-wrapper>
   `
@@ -29,11 +30,12 @@ class TemplateComponent {
   @Input() id: string;
   @Input() tooltipPlacement?: PlacementArray;
   @Input() iconPlacement?: PlacementDir;
+  @Input() dontParseLinks?: boolean;
 }
 
 const messages = {
   lorem: 'lorem ipsum dolor sit amet',
-  linkTest: 'This is text, [this](https://dspace.lyrasis.org) is a link, and [so is this](https://google.com)'
+  linkTest: 'This is text, [this](https://dspace.lyrasis.org/) is a link, and [so is this](https://google.com/)'
 };
 const exampleContextHelp: ContextHelp = {
   id: 'test-tooltip',
@@ -147,6 +149,55 @@ describe('ContextHelpWrapperComponent', () => {
         fixture.detectChanges();
         expect(wrapperComponent.tooltip.open).toHaveBeenCalled();
         expect(wrapperComponent.tooltip.close).toHaveBeenCalledTimes(0);
+        expect(fixture.debugElement.query(By.css('.ds-context-help-content')).nativeElement.textContent)
+          .toMatch(/\s*lorem ipsum dolor sit amet\s*/);
+      });
+
+      it('should correctly display links', () => {
+        templateComponent.content = 'linkTest';
+        getContextHelp$.next({...exampleContextHelp, isTooltipVisible: true});
+        fixture.detectChanges();
+        const nodeList: NodeList = fixture.debugElement.query(By.css('.ds-context-help-content'))
+          .nativeElement
+          .childNodes;
+        const relevantNodes = Array.from(nodeList).filter(node => node.nodeType != Node.COMMENT_NODE);
+        expect(relevantNodes.length).toBe(4);
+
+        const [text1, link1, text2, link2] = relevantNodes;
+
+        expect(text1.nodeType).toBe(Node.TEXT_NODE);
+        expect(text1.nodeValue).toMatch(/\s* This is text, \s*/);
+
+        expect(link1.nodeName).toBe('A');
+        expect((link1 as any).href).toBe('https://dspace.lyrasis.org/');
+        expect(link1.textContent).toBe('this');
+
+        expect(text2.nodeType).toBe(Node.TEXT_NODE);
+        expect(text2.nodeValue).toMatch(/\s* is a link, and \s*/);
+
+        expect(link2.nodeName).toBe('A');
+        expect((link2 as any).href).toBe('https://google.com/');
+        expect(link2.textContent).toBe('so is this');
+      });
+
+      it('should not display links if specified not to', () => {
+        templateComponent.dontParseLinks = true;
+        templateComponent.content = 'linkTest';
+        getContextHelp$.next({...exampleContextHelp, isTooltipVisible: true});
+        fixture.detectChanges();
+
+
+        const nodeList: NodeList = fixture.debugElement.query(By.css('.ds-context-help-content'))
+          .nativeElement
+          .childNodes;
+        const relevantNodes = Array.from(nodeList).filter(node => node.nodeType != Node.COMMENT_NODE);
+        expect(relevantNodes.length).toBe(1);
+
+        const [text] = relevantNodes;
+
+        expect(text.nodeType).toBe(Node.TEXT_NODE);
+        expect(text.nodeValue).toMatch(
+          /\s* This is text, \[this\]\(https:\/\/dspace.lyrasis.org\/\) is a link, and \[so is this\]\(https:\/\/google.com\/\) \s*/);
       });
 
       describe('after the icon is clicked again', () => {
@@ -165,6 +216,4 @@ describe('ContextHelpWrapperComponent', () => {
       });
     });
   });
-
-  // TODO: link parsing tests
 });
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
index 260c2b05dd..1bf3dc1ce0 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input, OnInit, TemplateRef, OnDestroy, AfterViewInit, ViewChild } from '@angular/core';
 import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Observable, of as observableOf, Subscription, BehaviorSubject, combineLatest } from 'rxjs';
+import { map, distinctUntilChanged, mergeMap } from 'rxjs/operators';
 import { PlacementDir } from './placement-dir.model';
 import content from '*.scss';
 import { ContextHelpService } from '../context-help.service';
@@ -10,6 +10,8 @@ import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import { hasValueOperator } from '../empty.util';
 import { ContextHelp } from '../context-help.model';
 
+type ParsedContent = (string | {href: string, text: string})[];
+
 /**
  * This component renders an info icon next to the wrapped element which
  * produces a tooltip when clicked.
@@ -44,21 +46,21 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
   /**
    * If true, don't process text to render links.
    */
-  @Input() dontParseLinks?: boolean;
+  @Input() set dontParseLinks(dont: boolean) {
+    this.dontParseLinks$.next(dont);
+  }
+  private dontParseLinks$: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
   shouldShowIcon$: Observable<boolean>;
 
   tooltip: NgbTooltip;
 
-  // TODO: dependent on evaluation order of input setters?
-  parsedContent$: Observable<(string | {href: string, text: string})[]> = observableOf([]);
   @Input() set content(content : string) {
-    this.parsedContent$ = this.translateService.get(content).pipe(
-      map(this.dontParseLinks
-        ? ((text: string) => [text])
-        : this.parseLinks)
-    );
+    this.content$.next(content);
   }
+  private content$: BehaviorSubject<string | undefined> = new BehaviorSubject(undefined);
+
+  parsedContent$: Observable<ParsedContent>;
 
   private subs: {always: Subscription[], tooltipBound: Subscription[]}
     = {always: [], tooltipBound: []};
@@ -69,8 +71,15 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
   ) { }
 
   ngOnInit() {
+    this.parsedContent$ = combineLatest([
+      this.content$.pipe(distinctUntilChanged(), mergeMap(content => this.translateService.get(content))),
+      this.dontParseLinks$.pipe(distinctUntilChanged())
+    ]).pipe(
+      map(([content, dontParseLinks]) =>
+        dontParseLinks ? [content] : this.parseLinks(content))
+    );
     this.shouldShowIcon$ = this.contextHelpService.shouldShowIcons$();
-    this.subs.always = [this.shouldShowIcon$.subscribe()];
+    this.subs.always = [this.parsedContent$.subscribe(), this.shouldShowIcon$.subscribe()];
   }
 
   @ViewChild('tooltip', { static: false }) set setTooltip(tooltip: NgbTooltip) {
@@ -127,8 +136,8 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
    *   {href: "https://youtube.com", text: "so is this"}
    * ]
    */
-  private parseLinks(content: string): (string | {href: string, text: string})[] {
-    // Implementation note: due to unavailability of `matchAll` method on strings,
+  private parseLinks(content: string): ParsedContent {
+    // Implementation note: due to `matchAll` method on strings not being available for all versions,
     // separate "split" and "parse" steps are needed.
 
     // We use splitRegexp (the outer `match` call) to split the text

From bcbfafcb324a5e6e201467ff6c383aec5ad02f74 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Mon, 16 Jan 2023 09:36:57 +0100
Subject: [PATCH 120/160] 97732 Context help button now disabled when there are
 no tooltips available on the page

---
 .../group-form/group-form.component.html      | 12 ++++---
 .../members-list/members-list.component.html  | 12 ++++---
 .../subgroups-list.component.html             | 20 ++++++------
 .../context-help-toggle.component.html        |  8 +++--
 .../context-help-toggle.component.scss        |  7 +++-
 .../context-help-toggle.component.spec.ts     | 32 ++++++++++++++++---
 .../context-help-toggle.component.ts          | 23 +++++++++++--
 src/app/shared/context-help.service.ts        | 15 ++++++++-
 src/assets/i18n/en.json5                      |  2 ++
 9 files changed, 99 insertions(+), 32 deletions(-)

diff --git a/src/app/access-control/group-registry/group-form/group-form.component.html b/src/app/access-control/group-registry/group-form/group-form.component.html
index c0bcc854e7..d86adc674b 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.html
+++ b/src/app/access-control/group-registry/group-form/group-form.component.html
@@ -9,15 +9,17 @@
       </ng-template>
 
       <ng-template #editheader>
-        <h2 class="border-bottom pb-2"
+        <h2 class="border-bottom pb-2">
+          <span
             *dsContextHelp="{
               content: 'admin.access-control.groups.form.tooltip.editGroupPage',
               id: 'edit-group-page',
-              iconPlacement: 'left',
-              tooltipPlacement: ['left', 'bottom']
+              iconPlacement: 'right',
+              tooltipPlacement: ['right', 'bottom']
             }"
-        >
-          {{messagePrefix + '.head.edit' | translate}}
+          >
+            {{messagePrefix + '.head.edit' | translate}}
+          </span>
         </h2>
       </ng-template>
 
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
index 80e13cfd5f..8b0ae35bd4 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
@@ -1,15 +1,17 @@
 <ng-container>
   <h3 class="border-bottom pb-2">{{messagePrefix + '.head' | translate}}</h3>
 
-  <h4 id="search" class="border-bottom pb-2"
+  <h4 id="search" class="border-bottom pb-2">
+    <span
       *dsContextHelp="{
         content: 'admin.access-control.groups.form.tooltip.editGroup.addEpeople',
         id: 'edit-group-add-epeople',
-        iconPlacement: 'left',
-        tooltipPlacement: ['left', 'top', 'bottom']
+        iconPlacement: 'right',
+        tooltipPlacement: ['top', 'right', 'bottom']
       }"
-  >
-    {{messagePrefix + '.search.head' | translate}}
+    >
+      {{messagePrefix + '.search.head' | translate}}
+    </span>
   </h4>
 
   <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
index 438f3eed54..3be45c4452 100644
--- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
+++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
@@ -1,15 +1,17 @@
 <ng-container>
   <h3 class="border-bottom pb-2">{{messagePrefix + '.head' | translate}}</h3>
 
-  <h4 id="search" class="border-bottom pb-2"
-      *dsContextHelp="{
-        content: 'admin.access-control.groups.form.tooltip.editGroup.addSubgroups',
-        id: 'edit-group-add-subgroups',
-        iconPlacement: 'left',
-        tooltipPlacement: ['left', 'top', 'bottom']
-      }"
-  >
-    {{messagePrefix + '.search.head' | translate}}
+  <h4 id="search" class="border-bottom pb-2">
+    <span *dsContextHelp="{
+            content: 'admin.access-control.groups.form.tooltip.editGroup.addSubgroups',
+            id: 'edit-group-add-subgroups',
+            iconPlacement: 'right',
+            tooltipPlacement: ['top', 'right', 'bottom']
+          }"
+    >
+      {{messagePrefix + '.search.head' | translate}}
+    </span>
+
   </h4>
   <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
     <div class="flex-grow-1 mr-3">
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.html b/src/app/header/context-help-toggle/context-help-toggle.component.html
index 9fba8fa032..523874d461 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.html
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.html
@@ -2,9 +2,11 @@
   <a href="javascript:void(0);"
      role="button"
      (click)="onClick()"
-     [attr.aria-label]="'nav.context-help-toggle' | translate"
-     [title]="'nav.context-help-toggle' | translate"
+     [attr.aria-label]="((buttonDisabled$ | async) ? 'nav.context-help-toggle-disabled' : 'nav.context-help-toggle') | translate"
+     [title]="((buttonDisabled$ | async) ? 'nav.context-help-toggle-disabled' : 'nav.context-help-toggle') | translate"
   >
-    <i class="fas fa-lg fa-fw fa-question-circle ds-context-help-toggle"></i>
+    <i class="fas fa-lg fa-fw fa-question-circle"
+       [class]="(buttonDisabled$ | async) ? 'ds-context-help-toggle-disabled' : 'ds-context-help-toggle-enabled'"
+    ></i>
   </a>
 </div>
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.scss b/src/app/header/context-help-toggle/context-help-toggle.component.scss
index 89f0c65bd8..af233dd7b5 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.scss
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.scss
@@ -1,4 +1,4 @@
-.ds-context-help-toggle {
+.ds-context-help-toggle-enabled {
   color: var(--ds-header-icon-color);
   background-color: var(--ds-header-bg);
 
@@ -6,3 +6,8 @@
     color: var(--ds-header-icon-color-hover);
   }
 }
+
+.ds-context-help-toggle-disabled {
+  color: grey;
+  background-color: var(--ds-header-bg);
+}
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
index 93a141cfb2..8f98aaaabc 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
@@ -3,17 +3,19 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ContextHelpToggleComponent } from './context-help-toggle.component';
 import { TranslateService, TranslateModule } from '@ngx-translate/core';
 import { ContextHelpService } from '../../shared/context-help.service';
-import { of as observableOf } from 'rxjs';
+import { of as observableOf, BehaviorSubject } from 'rxjs';
 import { By } from '@angular/platform-browser';
 
 describe('ContextHelpToggleComponent', () => {
   let component: ContextHelpToggleComponent;
   let fixture: ComponentFixture<ContextHelpToggleComponent>;
   let contextHelpService;
+  let contextHelpEmpty$ = new BehaviorSubject(true);
 
   beforeEach(async () => {
     contextHelpService = jasmine.createSpyObj('contextHelpService',
-      ['toggleIcons']);
+      ['toggleIcons', 'contextHelpEmpty$']);
+    contextHelpService.contextHelpEmpty$.and.returnValue(contextHelpEmpty$);
     await TestBed.configureTestingModule({
       declarations: [ ContextHelpToggleComponent ],
       providers: [
@@ -34,8 +36,28 @@ describe('ContextHelpToggleComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  it('clicking the button should toggle context help icon visibility', () => {
-    fixture.debugElement.query(By.css('a')).nativeElement.click();
-    expect(contextHelpService.toggleIcons).toHaveBeenCalled();
+  describe('if there are elements on the page with a tooltip', () => {
+    beforeEach(() => {
+      contextHelpEmpty$.next(false);
+      fixture.detectChanges();
+    });
+
+    it('clicking the button should toggle context help icon visibility', () => {
+      fixture.whenStable().then((done) => {
+        fixture.debugElement.query(By.css('a')).nativeElement.click();
+        expect(contextHelpService.toggleIcons).toHaveBeenCalled();
+        done();
+      });
+    });
+  });
+
+  describe('if there are no elements on the page with a tooltip', () => {
+    it('clicking the button does not toggle context help icon visibility', () => {
+      fixture.whenStable().then((done) => {
+        fixture.debugElement.query(By.css('a')).nativeElement.click();
+        expect(contextHelpService.toggleIcons).toHaveBeenCalledTimes(0);
+        done();
+      });
+    });
   });
 });
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.ts b/src/app/header/context-help-toggle/context-help-toggle.component.ts
index 2956d3ef4c..6804836246 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.ts
@@ -1,23 +1,40 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
 import { ContextHelpService } from '../../shared/context-help.service';
 import { TranslateService } from '@ngx-translate/core';
+import { Observable, Subscription, BehaviorSubject } from 'rxjs';
+import { combineLatest } from 'rxjs';
 
 @Component({
   selector: 'ds-context-help-toggle',
   templateUrl: './context-help-toggle.component.html',
   styleUrls: ['./context-help-toggle.component.scss']
 })
-export class ContextHelpToggleComponent implements OnInit {
+export class ContextHelpToggleComponent implements OnInit, OnDestroy {
+  buttonDisabled$: Observable<boolean>;
 
   constructor(
     private contextHelpService: ContextHelpService,
     private translateService: TranslateService
   ) { }
 
+  private clickEvents: BehaviorSubject<null> = new BehaviorSubject(null);
+  private subs: Subscription[];
+
   ngOnInit(): void {
+    this.buttonDisabled$ = this.contextHelpService.contextHelpEmpty$();
+    this.subs = [
+      this.buttonDisabled$.subscribe(),
+      combineLatest([this.clickEvents, this.buttonDisabled$])
+        .subscribe(([_, disabled]) =>
+          disabled ? null : this.contextHelpService.toggleIcons())
+    ];
+  }
+
+  ngOnDestroy() {
+    this.subs.forEach(sub => sub.unsubscribe());
   }
 
   onClick() {
-    this.contextHelpService.toggleIcons();
+    this.clickEvents.next(null);
   }
 }
diff --git a/src/app/shared/context-help.service.ts b/src/app/shared/context-help.service.ts
index 7bbd1216e1..68f6cfd92c 100644
--- a/src/app/shared/context-help.service.ts
+++ b/src/app/shared/context-help.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { ContextHelp } from './context-help.model';
 import { Store, createFeatureSelector, createSelector, select, MemoizedSelector } from '@ngrx/store';
-import { ContextHelpState } from './context-help.reducer';
+import { ContextHelpState, ContextHelpModels } from './context-help.reducer';
 import {
   ContextHelpToggleIconsAction,
   ContextHelpAddAction,
@@ -11,6 +11,7 @@ import {
   ContextHelpToggleTooltipAction
 } from './context-help.actions';
 import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 const contextHelpStateSelector =
   createFeatureSelector<ContextHelpState>('contextHelp');
@@ -23,6 +24,10 @@ const contextHelpSelector =
     contextHelpStateSelector,
     (state: ContextHelpState) => state.models[id]
   );
+const allContextHelpSelector = createSelector(
+  contextHelpStateSelector,
+  ((state: ContextHelpState) => state.models)
+);
 
 @Injectable({
   providedIn: 'root'
@@ -46,6 +51,14 @@ export class ContextHelpService {
     return this.store.pipe(select(contextHelpSelector(id)));
   }
 
+  /**
+   * Observable that yields true iff there are currently no context help entries in the store.
+   */
+  contextHelpEmpty$(): Observable<boolean> {
+    return this.store.pipe(select(allContextHelpSelector))
+      .pipe(map((models: ContextHelpModels) => Object.keys(models).length === 0));
+  }
+
   /**
    * Toggles the visibility of all context help icons.
    */
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 03596f2292..5a8c27da0d 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2680,6 +2680,8 @@
 
   "nav.context-help-toggle": "Toggle context help",
 
+  "nav.context-help-toggle-disabled": "No context help available on this page",
+
   "nav.language": "Language switch",
 
   "nav.login": "Log In",

From e40cd202878d9ae8dfd1645f1ecf015263dabf14 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 16 Jan 2023 09:55:52 +0100
Subject: [PATCH 121/160] 97049: Disable the vocabulary by default

---
 src/config/default-app-config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index aab5b9df4e..d7b3efc2ed 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -394,7 +394,7 @@ export class DefaultAppConfig implements AppConfig {
     {
       filter: 'subject',
       vocabulary: 'srsc',
-      enabled: true
+      enabled: false
     }
     ];
 }

From 7812eecb53668a202abfe115c93384279e346efc Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Mon, 16 Jan 2023 11:07:47 +0100
Subject: [PATCH 122/160] 97732 Fix linter issues

---
 .../context-help-toggle.component.spec.ts     |  2 +-
 .../context-help-wrapper.component.spec.ts    | 20 +++++++++----------
 .../context-help-wrapper.component.ts         | 14 ++++++-------
 src/app/shared/context-help.actions.ts        |  2 ++
 src/app/shared/context-help.directive.spec.ts |  6 +++---
 src/app/shared/context-help.directive.ts      |  2 +-
 src/app/shared/context-help.model.ts          |  2 +-
 src/app/shared/context-help.reducer.ts        |  4 ++--
 src/app/shared/context-help.service.spec.ts   | 11 +++++-----
 9 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
index 8f98aaaabc..1df646f8aa 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
@@ -10,7 +10,7 @@ describe('ContextHelpToggleComponent', () => {
   let component: ContextHelpToggleComponent;
   let fixture: ComponentFixture<ContextHelpToggleComponent>;
   let contextHelpService;
-  let contextHelpEmpty$ = new BehaviorSubject(true);
+  const contextHelpEmpty$ = new BehaviorSubject(true);
 
   beforeEach(async () => {
     contextHelpService = jasmine.createSpyObj('contextHelpService',
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
index c0c7f9a821..e9ff9b0856 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
@@ -53,9 +53,9 @@ describe('ContextHelpWrapperComponent', () => {
   let shouldShowIcons$: BehaviorSubject<boolean>;
 
   function makeWrappedElement(): HTMLElement {
-    let el: HTMLElement = document.createElement('div')
-    el.innerHTML = 'example element';
-    return el;
+    const wrapped: HTMLElement = document.createElement('div');
+    wrapped.innerHTML = 'example element';
+    return wrapped;
   }
 
   beforeEach(waitForAsync( () => {
@@ -96,8 +96,8 @@ describe('ContextHelpWrapperComponent', () => {
     fixture = TestBed.createComponent(TemplateComponent);
     el = fixture.debugElement;
     templateComponent = fixture.componentInstance;
-    templateComponent.content = 'lorem'
-    templateComponent.id = 'test-tooltip'
+    templateComponent.content = 'lorem';
+    templateComponent.id = 'test-tooltip';
     templateComponent.tooltipPlacement = ['bottom'];
     templateComponent.iconPlacement = 'left';
     wrapperComponent = el.query(By.css('ds-context-help-wrapper')).componentInstance;
@@ -111,7 +111,7 @@ describe('ContextHelpWrapperComponent', () => {
 
   it('should not show the context help icon while icon visibility is not turned on', (done) => {
     fixture.whenStable().then(() => {
-      let wrapper = el.query(By.css('ds-context-help-wrapper')).nativeElement;
+      const wrapper = el.query(By.css('ds-context-help-wrapper')).nativeElement;
       expect(wrapper.children.length).toBe(0);
       done();
     });
@@ -127,9 +127,9 @@ describe('ContextHelpWrapperComponent', () => {
 
     it('should show the context help button', (done) => {
       fixture.whenStable().then(() => {
-        let wrapper = el.query(By.css('ds-context-help-wrapper')).nativeElement;
+        const wrapper = el.query(By.css('ds-context-help-wrapper')).nativeElement;
         expect(wrapper.children.length).toBe(1);
-        let [i] = wrapper.children;
+        const [i] = wrapper.children;
         expect(i.tagName).toBe('I');
         done();
       });
@@ -160,7 +160,7 @@ describe('ContextHelpWrapperComponent', () => {
         const nodeList: NodeList = fixture.debugElement.query(By.css('.ds-context-help-content'))
           .nativeElement
           .childNodes;
-        const relevantNodes = Array.from(nodeList).filter(node => node.nodeType != Node.COMMENT_NODE);
+        const relevantNodes = Array.from(nodeList).filter(node => node.nodeType !== Node.COMMENT_NODE);
         expect(relevantNodes.length).toBe(4);
 
         const [text1, link1, text2, link2] = relevantNodes;
@@ -190,7 +190,7 @@ describe('ContextHelpWrapperComponent', () => {
         const nodeList: NodeList = fixture.debugElement.query(By.css('.ds-context-help-content'))
           .nativeElement
           .childNodes;
-        const relevantNodes = Array.from(nodeList).filter(node => node.nodeType != Node.COMMENT_NODE);
+        const relevantNodes = Array.from(nodeList).filter(node => node.nodeType !== Node.COMMENT_NODE);
         expect(relevantNodes.length).toBe(1);
 
         const [text] = relevantNodes;
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
index 1bf3dc1ce0..51bb9531cd 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
@@ -55,8 +55,8 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
 
   tooltip: NgbTooltip;
 
-  @Input() set content(content : string) {
-    this.content$.next(content);
+  @Input() set content(translateKey: string) {
+    this.content$.next(translateKey);
   }
   private content$: BehaviorSubject<string | undefined> = new BehaviorSubject(undefined);
 
@@ -72,11 +72,11 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.parsedContent$ = combineLatest([
-      this.content$.pipe(distinctUntilChanged(), mergeMap(content => this.translateService.get(content))),
+      this.content$.pipe(distinctUntilChanged(), mergeMap(translateKey => this.translateService.get(translateKey))),
       this.dontParseLinks$.pipe(distinctUntilChanged())
     ]).pipe(
-      map(([content, dontParseLinks]) =>
-        dontParseLinks ? [content] : this.parseLinks(content))
+      map(([text, dontParseLinks]) =>
+        dontParseLinks ? [text] : this.parseLinks(text))
     );
     this.shouldShowIcon$ = this.contextHelpService.shouldShowIcons$();
     this.subs.always = [this.parsedContent$.subscribe(), this.shouldShowIcon$.subscribe()];
@@ -136,7 +136,7 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
    *   {href: "https://youtube.com", text: "so is this"}
    * ]
    */
-  private parseLinks(content: string): ParsedContent {
+  private parseLinks(text: string): ParsedContent {
     // Implementation note: due to `matchAll` method on strings not being available for all versions,
     // separate "split" and "parse" steps are needed.
 
@@ -152,7 +152,7 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
     // {href: string, text: string} objects.
     const parseRegexp = /^\[([^\]]*)\]\(([^\)]*)\)$/;
 
-    return content.match(splitRegexp).map((substring: string) => {
+    return text.match(splitRegexp).map((substring: string) => {
       const match = substring.match(parseRegexp);
       return match === null
         ? substring
diff --git a/src/app/shared/context-help.actions.ts b/src/app/shared/context-help.actions.ts
index 5f985c2f73..fa602b6bcf 100644
--- a/src/app/shared/context-help.actions.ts
+++ b/src/app/shared/context-help.actions.ts
@@ -11,6 +11,8 @@ export const ContextHelpActionTypes = {
   'CONTEXT_HELP_HIDE_TOOLTIP' : type('dspace/context-help/CONTEXT_HELP_HIDE_TOOLTIP'),
 };
 
+/* tslint:disable:max-classes-per-file */
+
 /**
  * Toggles the visibility of all context help icons.
  */
diff --git a/src/app/shared/context-help.directive.spec.ts b/src/app/shared/context-help.directive.spec.ts
index 70e27b658c..8fb03061fc 100644
--- a/src/app/shared/context-help.directive.spec.ts
+++ b/src/app/shared/context-help.directive.spec.ts
@@ -62,7 +62,7 @@ describe('ContextHelpDirective', () => {
         { provide: ContextHelpService, useValue: contextHelpService }
       ],
       declarations: [TestComponent, ContextHelpWrapperComponent, ContextHelpDirective]
-    }).compileComponents()
+    }).compileComponents();
   }));
 
   beforeEach(() => {
@@ -85,10 +85,10 @@ describe('ContextHelpDirective', () => {
   it('should generate the context help wrapper component', (done) => {
     fixture.whenStable().then(() => {
       expect(fixture.nativeElement.children.length).toBe(1);
-      let [wrapper] = fixture.nativeElement.children;
+      const [wrapper] = fixture.nativeElement.children;
       expect(component).toBeDefined();
       expect(wrapper.tagName).toBe('DS-CONTEXT-HELP-WRAPPER');
-      expect(contextHelpService.add).toHaveBeenCalledWith(exampleContextHelp)
+      expect(contextHelpService.add).toHaveBeenCalledWith(exampleContextHelp);
       done();
     });
   });
diff --git a/src/app/shared/context-help.directive.ts b/src/app/shared/context-help.directive.ts
index 83c3908dcf..22005cc066 100644
--- a/src/app/shared/context-help.directive.ts
+++ b/src/app/shared/context-help.directive.ts
@@ -47,7 +47,7 @@ export class ContextHelpDirective implements OnChanges, OnDestroy {
     private viewContainerRef: ViewContainerRef,
     private componentFactoryResolver: ComponentFactoryResolver,
     private contextHelpService: ContextHelpService
-  ){}
+  ) {}
 
   ngOnChanges() {
     this.clearMostRecentId();
diff --git a/src/app/shared/context-help.model.ts b/src/app/shared/context-help.model.ts
index 9c024dbf1f..ea6fd036cf 100644
--- a/src/app/shared/context-help.model.ts
+++ b/src/app/shared/context-help.model.ts
@@ -1,4 +1,4 @@
 export class ContextHelp {
   id: string;
-  isTooltipVisible?: boolean = false;
+  isTooltipVisible = false;
 }
diff --git a/src/app/shared/context-help.reducer.ts b/src/app/shared/context-help.reducer.ts
index 13e9488dfd..9ff8a06989 100644
--- a/src/app/shared/context-help.reducer.ts
+++ b/src/app/shared/context-help.reducer.ts
@@ -1,9 +1,9 @@
 import { ContextHelp } from './context-help.model';
 import { ContextHelpAction, ContextHelpActionTypes } from './context-help.actions';
 
-export type ContextHelpModels = {
+export interface ContextHelpModels {
   [id: string]: ContextHelp;
-};
+}
 
 export interface ContextHelpState {
   allIconsVisible: boolean;
diff --git a/src/app/shared/context-help.service.spec.ts b/src/app/shared/context-help.service.spec.ts
index 96b81ee8e1..f06e700210 100644
--- a/src/app/shared/context-help.service.spec.ts
+++ b/src/app/shared/context-help.service.spec.ts
@@ -8,10 +8,9 @@ import { TestScheduler } from 'rxjs/testing';
 describe('ContextHelpService', () => {
   let service: ContextHelpService;
   let store;
-  let initialState;
   let testScheduler;
   const booleans = { f: false, t: true };
-  const mkContextHelp = (id: string) => ({ 0: {id, isTooltipVisible: false}, 1: {id, isTooltipVisible: true} })
+  const mkContextHelp = (id: string) => ({ 0: {id, isTooltipVisible: false}, 1: {id, isTooltipVisible: true} });
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
@@ -42,11 +41,13 @@ describe('ContextHelpService', () => {
   it('add and remove calls should be observable in getContextHelp$', () => {
     testScheduler.run(({cold, expectObservable}) => {
       const modifications = cold('-abAcCB', {
-        a: () => service.add({id: 'a'}), b: () => service.add({id: 'b'}), c: () => service.add({id: 'c'}),
+        a: () => service.add({id: 'a', isTooltipVisible: false}),
+        b: () => service.add({id: 'b', isTooltipVisible: false}),
+        c: () => service.add({id: 'c', isTooltipVisible: false}),
         A: () => service.remove('a'), B: () => service.remove('b'), C: () => service.remove('c'),
-      })
+      });
       modifications.subscribe(mod => mod());
-      const match = (id) => ({ 0: undefined, 1: {id} });
+      const match = (id) => ({ 0: undefined, 1: {id, isTooltipVisible: false} });
       expectObservable(service.getContextHelp$('a')).toBe('01-0---', match('a'));
       expectObservable(service.getContextHelp$('b')).toBe('0-1---0', match('b'));
       expectObservable(service.getContextHelp$('c')).toBe('0---10-', match('c'));

From bed14c6b061c979db402ea38c87cb8bb0c5d409a Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Mon, 16 Jan 2023 12:23:12 +0100
Subject: [PATCH 123/160] 97732 ContextHelpWrapper: changed tooltip link color

---
 .../context-help-wrapper/context-help-wrapper.component.scss  | 4 ++++
 src/styles/_custom_variables.scss                             | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss b/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
index d28883cae3..71be81ec97 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
@@ -24,4 +24,8 @@
 ::ng-deep .tooltip-inner {
     width: var(--ds-context-help-tooltip-width);
     max-width: var(--ds-context-help-tooltip-width);
+    a {
+      color: var(--ds-context-help-tooltip-link-color);
+      text-decoration: underline;
+    }
 }
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index e656972430..97c6ef83b2 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -89,4 +89,5 @@
   --ds-context-x-offset: -16px;
   --ds-context-help-icon-size: 16px;
   --ds-context-help-tooltip-width: 300px;
+  --ds-context-help-tooltip-link-color: $white;
 }

From b38e1e0367b56133b04e93de71c360d829df1b45 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Mon, 16 Jan 2023 14:13:01 +0100
Subject: [PATCH 124/160] 97732 Fix flaky test for ContextHelpToggleComponent

---
 .../context-help-toggle.component.spec.ts                  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
index 3581a28400..54e0b396fb 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
@@ -13,8 +13,9 @@ describe('ContextHelpToggleComponent', () => {
   const contextHelpEmpty$ = new BehaviorSubject(true);
 
   beforeEach(async () => {
-    contextHelpService = jasmine.createSpyObj('contextHelpService',
-      ['toggleIcons', 'contextHelpEmpty$']);
+    contextHelpService = jasmine.createSpyObj('contextHelpService', [
+      'contextHelpEmpty$', 'toggleIcons'
+    ]);
     contextHelpService.contextHelpEmpty$.and.returnValue(contextHelpEmpty$);
     await TestBed.configureTestingModule({
       declarations: [ ContextHelpToggleComponent ],
@@ -44,6 +45,7 @@ describe('ContextHelpToggleComponent', () => {
 
     it('clicking the button should toggle context help icon visibility', () => {
       fixture.whenStable().then((done) => {
+        spyOn(contextHelpService, 'toggleIcons');
         fixture.debugElement.query(By.css('a')).nativeElement.click();
         expect(contextHelpService.toggleIcons).toHaveBeenCalled();
         done();
@@ -54,6 +56,7 @@ describe('ContextHelpToggleComponent', () => {
   describe('if there are no elements on the page with a tooltip', () => {
     it('clicking the button does not toggle context help icon visibility', () => {
       fixture.whenStable().then((done) => {
+        spyOn(contextHelpService, 'toggleIcons');
         fixture.debugElement.query(By.css('a')).nativeElement.click();
         expect(contextHelpService.toggleIcons).toHaveBeenCalledTimes(0);
         done();

From 950952383ce5921d345346de401d0d59f22d4efa Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Mon, 16 Jan 2023 14:13:01 +0100
Subject: [PATCH 125/160] 97732 Fix flaky test for ContextHelpToggleComponent

---
 .../context-help-toggle.component.spec.ts                  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
index 1df646f8aa..d1aadc3fe9 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
@@ -13,8 +13,9 @@ describe('ContextHelpToggleComponent', () => {
   const contextHelpEmpty$ = new BehaviorSubject(true);
 
   beforeEach(async () => {
-    contextHelpService = jasmine.createSpyObj('contextHelpService',
-      ['toggleIcons', 'contextHelpEmpty$']);
+    contextHelpService = jasmine.createSpyObj('contextHelpService', [
+      'contextHelpEmpty$', 'toggleIcons'
+    ]);
     contextHelpService.contextHelpEmpty$.and.returnValue(contextHelpEmpty$);
     await TestBed.configureTestingModule({
       declarations: [ ContextHelpToggleComponent ],
@@ -44,6 +45,7 @@ describe('ContextHelpToggleComponent', () => {
 
     it('clicking the button should toggle context help icon visibility', () => {
       fixture.whenStable().then((done) => {
+        spyOn(contextHelpService, 'toggleIcons');
         fixture.debugElement.query(By.css('a')).nativeElement.click();
         expect(contextHelpService.toggleIcons).toHaveBeenCalled();
         done();
@@ -54,6 +56,7 @@ describe('ContextHelpToggleComponent', () => {
   describe('if there are no elements on the page with a tooltip', () => {
     it('clicking the button does not toggle context help icon visibility', () => {
       fixture.whenStable().then((done) => {
+        spyOn(contextHelpService, 'toggleIcons');
         fixture.debugElement.query(By.css('a')).nativeElement.click();
         expect(contextHelpService.toggleIcons).toHaveBeenCalledTimes(0);
         done();

From e5cc565327f7dfa84681d020e014cb1899273f72 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Mon, 16 Jan 2023 14:13:01 +0100
Subject: [PATCH 126/160] 97732 Fix flaky test for ContextHelpToggleComponent

---
 .../context-help-toggle.component.spec.ts                  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
index 1df646f8aa..d1aadc3fe9 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
@@ -13,8 +13,9 @@ describe('ContextHelpToggleComponent', () => {
   const contextHelpEmpty$ = new BehaviorSubject(true);
 
   beforeEach(async () => {
-    contextHelpService = jasmine.createSpyObj('contextHelpService',
-      ['toggleIcons', 'contextHelpEmpty$']);
+    contextHelpService = jasmine.createSpyObj('contextHelpService', [
+      'contextHelpEmpty$', 'toggleIcons'
+    ]);
     contextHelpService.contextHelpEmpty$.and.returnValue(contextHelpEmpty$);
     await TestBed.configureTestingModule({
       declarations: [ ContextHelpToggleComponent ],
@@ -44,6 +45,7 @@ describe('ContextHelpToggleComponent', () => {
 
     it('clicking the button should toggle context help icon visibility', () => {
       fixture.whenStable().then((done) => {
+        spyOn(contextHelpService, 'toggleIcons');
         fixture.debugElement.query(By.css('a')).nativeElement.click();
         expect(contextHelpService.toggleIcons).toHaveBeenCalled();
         done();
@@ -54,6 +56,7 @@ describe('ContextHelpToggleComponent', () => {
   describe('if there are no elements on the page with a tooltip', () => {
     it('clicking the button does not toggle context help icon visibility', () => {
       fixture.whenStable().then((done) => {
+        spyOn(contextHelpService, 'toggleIcons');
         fixture.debugElement.query(By.css('a')).nativeElement.click();
         expect(contextHelpService.toggleIcons).toHaveBeenCalledTimes(0);
         done();

From 2ff8664b0f92fc236cb911ace7acbb596954ac79 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Mon, 16 Jan 2023 17:56:09 +0100
Subject: [PATCH 127/160] 97732 Fix linter issues

---
 .../context-help-toggle/context-help-toggle.component.spec.ts  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
index 2c3d39054c..164ce7d984 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
@@ -3,9 +3,8 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin
 import { ContextHelpToggleComponent } from './context-help-toggle.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { ContextHelpService } from '../../shared/context-help.service';
-import { BehaviorSubject, of as observableOf } from 'rxjs';
+import { of as observableOf } from 'rxjs';
 import { By } from '@angular/platform-browser';
-import { tap } from 'rxjs/operators';
 
 describe('ContextHelpToggleComponent', () => {
   let component: ContextHelpToggleComponent;

From 711e2e1e7ce6671a7e222da7c58f8d14528f54e9 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Mon, 16 Jan 2023 18:07:39 +0100
Subject: [PATCH 128/160] 97732 Fix linter issues

---
 .../context-help-toggle.component.spec.ts     | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
index d1aadc3fe9..93421b58eb 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
@@ -1,22 +1,21 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 
 import { ContextHelpToggleComponent } from './context-help-toggle.component';
-import { TranslateService, TranslateModule } from '@ngx-translate/core';
+import { TranslateModule } from '@ngx-translate/core';
 import { ContextHelpService } from '../../shared/context-help.service';
-import { of as observableOf, BehaviorSubject } from 'rxjs';
+import { of as observableOf } from 'rxjs';
 import { By } from '@angular/platform-browser';
 
 describe('ContextHelpToggleComponent', () => {
   let component: ContextHelpToggleComponent;
   let fixture: ComponentFixture<ContextHelpToggleComponent>;
   let contextHelpService;
-  const contextHelpEmpty$ = new BehaviorSubject(true);
 
   beforeEach(async () => {
     contextHelpService = jasmine.createSpyObj('contextHelpService', [
       'contextHelpEmpty$', 'toggleIcons'
     ]);
-    contextHelpService.contextHelpEmpty$.and.returnValue(contextHelpEmpty$);
+    contextHelpService.contextHelpEmpty$.and.returnValue(observableOf(true));
     await TestBed.configureTestingModule({
       declarations: [ ContextHelpToggleComponent ],
       providers: [
@@ -24,43 +23,43 @@ describe('ContextHelpToggleComponent', () => {
       ],
       imports: [ TranslateModule.forRoot() ]
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ContextHelpToggleComponent);
     component = fixture.componentInstance;
-    fixture.detectChanges();
   });
 
   it('should create', () => {
+    fixture.detectChanges();
     expect(component).toBeTruthy();
   });
 
+  describe('if there are no elements on the page with a tooltip', () => {
+    it('clicking the button does not toggle context help icon visibility', fakeAsync(() => {
+      fixture.detectChanges();
+      fixture.whenStable().then(() => {
+        fixture.debugElement.query(By.css('a')).nativeElement.click();
+        tick();
+        expect(contextHelpService.toggleIcons).toHaveBeenCalledTimes(0);
+      });
+    }));
+  });
+
   describe('if there are elements on the page with a tooltip', () => {
     beforeEach(() => {
-      contextHelpEmpty$.next(false);
+      contextHelpService.contextHelpEmpty$.and.returnValue(observableOf(false));
       fixture.detectChanges();
     });
 
-    it('clicking the button should toggle context help icon visibility', () => {
-      fixture.whenStable().then((done) => {
-        spyOn(contextHelpService, 'toggleIcons');
+    it('clicking the button should toggle context help icon visibility', fakeAsync(() => {
+      fixture.whenStable().then(() => {
         fixture.debugElement.query(By.css('a')).nativeElement.click();
+        tick();
         expect(contextHelpService.toggleIcons).toHaveBeenCalled();
-        done();
       });
-    });
+    }));
   });
 
-  describe('if there are no elements on the page with a tooltip', () => {
-    it('clicking the button does not toggle context help icon visibility', () => {
-      fixture.whenStable().then((done) => {
-        spyOn(contextHelpService, 'toggleIcons');
-        fixture.debugElement.query(By.css('a')).nativeElement.click();
-        expect(contextHelpService.toggleIcons).toHaveBeenCalledTimes(0);
-        done();
-      });
-    });
-  });
 });

From f13b67e8ad940f302745e8c5a6f58b32863c06ea Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Mon, 16 Jan 2023 18:11:40 +0100
Subject: [PATCH 129/160] 97732 Fix linter issues

---
 .../context-help-toggle.component.spec.ts     | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
index d1aadc3fe9..93421b58eb 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
@@ -1,22 +1,21 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 
 import { ContextHelpToggleComponent } from './context-help-toggle.component';
-import { TranslateService, TranslateModule } from '@ngx-translate/core';
+import { TranslateModule } from '@ngx-translate/core';
 import { ContextHelpService } from '../../shared/context-help.service';
-import { of as observableOf, BehaviorSubject } from 'rxjs';
+import { of as observableOf } from 'rxjs';
 import { By } from '@angular/platform-browser';
 
 describe('ContextHelpToggleComponent', () => {
   let component: ContextHelpToggleComponent;
   let fixture: ComponentFixture<ContextHelpToggleComponent>;
   let contextHelpService;
-  const contextHelpEmpty$ = new BehaviorSubject(true);
 
   beforeEach(async () => {
     contextHelpService = jasmine.createSpyObj('contextHelpService', [
       'contextHelpEmpty$', 'toggleIcons'
     ]);
-    contextHelpService.contextHelpEmpty$.and.returnValue(contextHelpEmpty$);
+    contextHelpService.contextHelpEmpty$.and.returnValue(observableOf(true));
     await TestBed.configureTestingModule({
       declarations: [ ContextHelpToggleComponent ],
       providers: [
@@ -24,43 +23,43 @@ describe('ContextHelpToggleComponent', () => {
       ],
       imports: [ TranslateModule.forRoot() ]
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ContextHelpToggleComponent);
     component = fixture.componentInstance;
-    fixture.detectChanges();
   });
 
   it('should create', () => {
+    fixture.detectChanges();
     expect(component).toBeTruthy();
   });
 
+  describe('if there are no elements on the page with a tooltip', () => {
+    it('clicking the button does not toggle context help icon visibility', fakeAsync(() => {
+      fixture.detectChanges();
+      fixture.whenStable().then(() => {
+        fixture.debugElement.query(By.css('a')).nativeElement.click();
+        tick();
+        expect(contextHelpService.toggleIcons).toHaveBeenCalledTimes(0);
+      });
+    }));
+  });
+
   describe('if there are elements on the page with a tooltip', () => {
     beforeEach(() => {
-      contextHelpEmpty$.next(false);
+      contextHelpService.contextHelpEmpty$.and.returnValue(observableOf(false));
       fixture.detectChanges();
     });
 
-    it('clicking the button should toggle context help icon visibility', () => {
-      fixture.whenStable().then((done) => {
-        spyOn(contextHelpService, 'toggleIcons');
+    it('clicking the button should toggle context help icon visibility', fakeAsync(() => {
+      fixture.whenStable().then(() => {
         fixture.debugElement.query(By.css('a')).nativeElement.click();
+        tick();
         expect(contextHelpService.toggleIcons).toHaveBeenCalled();
-        done();
       });
-    });
+    }));
   });
 
-  describe('if there are no elements on the page with a tooltip', () => {
-    it('clicking the button does not toggle context help icon visibility', () => {
-      fixture.whenStable().then((done) => {
-        spyOn(contextHelpService, 'toggleIcons');
-        fixture.debugElement.query(By.css('a')).nativeElement.click();
-        expect(contextHelpService.toggleIcons).toHaveBeenCalledTimes(0);
-        done();
-      });
-    });
-  });
 });

From ace396a31fc0f8c294fffbe8589b0c5a1d893363 Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Tue, 17 Jan 2023 17:23:29 +0100
Subject: [PATCH 130/160] add yarn clean script for the .angular/cache folder

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

diff --git a/package.json b/package.json
index 1b1c7a4b00..c6b4817525 100644
--- a/package.json
+++ b/package.json
@@ -30,8 +30,9 @@
     "clean:log": "rimraf *.log*",
     "clean:json": "rimraf *.records.json",
     "clean:node": "rimraf node_modules",
+    "clean:cli": "rimraf .angular/cache",
     "clean:prod": "yarn run clean:dist && yarn run clean:log && yarn run clean:doc && yarn run clean:coverage && yarn run clean:json",
-    "clean": "yarn run clean:prod && yarn run clean:dev:config && yarn run clean:node",
+    "clean": "yarn run clean:prod && yarn run clean:dev:config && yarn run clean:cli && yarn run clean:node",
     "sync-i18n": "ts-node --project ./tsconfig.ts-node.json scripts/sync-i18n-files.ts",
     "build:mirador": "webpack --config webpack/webpack.mirador.config.ts",
     "merge-i18n": "ts-node --project ./tsconfig.ts-node.json scripts/merge-i18n-files.ts",

From d852ca0816199e8af502e5a6a1e2e5a20f6eb9b0 Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Wed, 18 Jan 2023 09:58:33 +0100
Subject: [PATCH 131/160] CST-8165 show logo when browsing collections

---
 .../browse-by-date-page.component.ts          |  1 +
 .../browse-by-metadata-page.component.html    |  5 +++
 .../browse-by-metadata-page.component.spec.ts |  7 ++++
 .../browse-by-metadata-page.component.ts      | 33 +++++++++++++++++--
 .../browse-by-title-page.component.ts         |  1 +
 5 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
index c4a67349a5..ffa7e882af 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
@@ -65,6 +65,7 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
         const searchOptions = browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.fetchThumbnails);
         this.updatePageWithItems(searchOptions, this.value, undefined);
         this.updateParent(params.scope);
+        this.updateLogo();
         this.updateStartsWithOptions(this.browseId, metadataKeys, params.scope);
       }));
   }
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
index 227fa8aa78..b68f498771 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
@@ -5,6 +5,11 @@
         <!-- Parent Name -->
         <ds-comcol-page-header [name]="parentContext.name">
         </ds-comcol-page-header>
+      <!-- Collection logo -->
+        <ds-comcol-page-logo *ngIf="logo$"
+                             [logo]="(logo$ | async)?.payload"
+                             [alternateText]="'Community or Collection Logo'">
+        </ds-comcol-page-logo>
         <!-- Handle -->
         <ds-themed-comcol-page-handle
             [content]="parentContext.handle"
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
index 2984642b73..a5beeb8a45 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
@@ -144,6 +144,9 @@ describe('BrowseByMetadataPageComponent', () => {
 
       route.params = observableOf(paramsWithValue);
       comp.ngOnInit();
+      comp.updateParent('fake-scope');
+      comp.updateLogo();
+      fixture.detectChanges();
     });
 
     it('should fetch items', () => {
@@ -151,6 +154,10 @@ describe('BrowseByMetadataPageComponent', () => {
         expect(result.payload.page).toEqual(mockItems);
       });
     });
+
+    it('should fetch the logo', () => {
+      expect(comp.logo$).toBeTruthy();
+    });
   });
 
   describe('when calling browseParamsToOptions', () => {
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
index 4cfe332da1..5de6c7d856 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -15,7 +15,11 @@ import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.serv
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
 import { PaginationService } from '../../core/pagination/pagination.service';
-import { map } from 'rxjs/operators';
+import { filter, map, mergeMap } from 'rxjs/operators';
+import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { Collection } from '../../core/shared/collection.model';
+import { Community } from '../../core/shared/community.model';
 import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 
 export const BBM_PAGINATION_ID = 'bbm';
@@ -48,6 +52,11 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    */
   parent$: Observable<RemoteData<DSpaceObject>>;
 
+  /**
+   * The logo of the current Community or Collection
+   */
+  logo$: Observable<RemoteData<Bitstream>>;
+
   /**
    * The pagination config used to display the values
    */
@@ -151,6 +160,7 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
             this.updatePage(browseParamsToOptions(params, currentPage, currentSort, this.browseId, false));
           }
           this.updateParent(params.scope);
+          this.updateLogo();
         }));
     this.updateStartsWithTextOptions();
 
@@ -196,12 +206,31 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    */
   updateParent(scope: string) {
     if (hasValue(scope)) {
-      this.parent$ = this.dsoService.findById(scope).pipe(
+      const linksToFollow = () => {
+        return [followLink('logo')];
+      };
+      this.parent$ = this.dsoService.findById(scope,
+        true,
+        true,
+        ...linksToFollow() as FollowLinkConfig<DSpaceObject>[]).pipe(
         getFirstSucceededRemoteData()
       );
     }
   }
 
+  /**
+   * Update the parent Community or Collection logo
+   */
+  updateLogo() {
+    if (hasValue(this.parent$)) {
+      this.logo$ = this.parent$.pipe(
+        map((rd: RemoteData<Collection | Community>) => rd.payload),
+        filter((collectionOrCommunity: Collection | Community) => hasValue(collectionOrCommunity.logo)),
+        mergeMap((collectionOrCommunity: Collection | Community) => collectionOrCommunity.logo)
+      );
+    }
+  }
+
   /**
    * Navigate to the previous page
    */
diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
index 5320d7bb48..3e9af2197c 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
@@ -49,6 +49,7 @@ export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
         this.browseId = params.id || this.defaultBrowseId;
         this.updatePageWithItems(browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.fetchThumbnails), undefined, undefined);
         this.updateParent(params.scope);
+        this.updateLogo();
       }));
     this.updateStartsWithTextOptions();
   }

From 853d4e4d3c4a87d5166138f375c70f939c52652b Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 19 Jan 2023 17:48:01 +0100
Subject: [PATCH 132/160] 97287: Test fix

---
 src/app/statistics/angulartics/dspace-provider.spec.ts | 2 +-
 src/app/statistics/google-analytics.service.spec.ts    | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/statistics/angulartics/dspace-provider.spec.ts b/src/app/statistics/angulartics/dspace-provider.spec.ts
index 8491d8e80c..73c2419ce6 100644
--- a/src/app/statistics/angulartics/dspace-provider.spec.ts
+++ b/src/app/statistics/angulartics/dspace-provider.spec.ts
@@ -11,7 +11,7 @@ describe('Angulartics2DSpace', () => {
 
   beforeEach(() => {
     angulartics2 = {
-      eventTrack: observableOf({action: 'pageView', properties: {object: 'mock-object'}}),
+      eventTrack: observableOf({action: 'page_view', properties: {object: 'mock-object'}}),
       filterDeveloperMode: () => filter(() => true)
     } as any;
     statisticsService = jasmine.createSpyObj('statisticsService', {trackViewEvent: null});
diff --git a/src/app/statistics/google-analytics.service.spec.ts b/src/app/statistics/google-analytics.service.spec.ts
index 9e2b1c7edf..2465e4db0e 100644
--- a/src/app/statistics/google-analytics.service.spec.ts
+++ b/src/app/statistics/google-analytics.service.spec.ts
@@ -1,4 +1,7 @@
-import { Angulartics2GoogleAnalytics, Angulartics2GoogleTagManager } from 'angulartics2';
+import {
+  Angulartics2GoogleAnalytics,
+  Angulartics2GoogleGlobalSiteTag,
+} from 'angulartics2';
 import { of } from 'rxjs';
 
 import { GoogleAnalyticsService } from './google-analytics.service';
@@ -16,7 +19,7 @@ describe('GoogleAnalyticsService', () => {
   const srcTestValue = 'mock-script-src';
   let service: GoogleAnalyticsService;
   let googleAnalyticsSpy: Angulartics2GoogleAnalytics;
-  let googleTagManagerSpy: Angulartics2GoogleTagManager;
+  let googleTagManagerSpy: Angulartics2GoogleGlobalSiteTag;
   let configSpy: ConfigurationDataService;
   let klaroServiceSpy: jasmine.SpyObj<KlaroService>;
   let scriptElementMock: any;
@@ -37,7 +40,7 @@ describe('GoogleAnalyticsService', () => {
     googleAnalyticsSpy = jasmine.createSpyObj('Angulartics2GoogleAnalytics', [
       'startTracking',
     ]);
-    googleTagManagerSpy = jasmine.createSpyObj('Angulartics2GoogleTagManager', [
+    googleTagManagerSpy = jasmine.createSpyObj('Angulartics2GoogleGlobalSiteTag', [
       'startTracking',
     ]);
 

From 40de69dfec0ee96372b764f84e03466ab115a66e Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Fri, 20 Jan 2023 14:33:00 +0100
Subject: [PATCH 133/160] 97732 ContextHelpToggleComponent: added typedoc and
 removed unnecessary dependency

---
 .../context-help-toggle/context-help-toggle.component.ts    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.ts b/src/app/header/context-help-toggle/context-help-toggle.component.ts
index 6804836246..7adaffa1c0 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.ts
@@ -1,9 +1,12 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
 import { ContextHelpService } from '../../shared/context-help.service';
-import { TranslateService } from '@ngx-translate/core';
 import { Observable, Subscription, BehaviorSubject } from 'rxjs';
 import { combineLatest } from 'rxjs';
 
+/**
+ * Renders a "context help toggle" button that toggles the visibility of tooltip buttons on the page.
+ * If there are no tooltip buttons available on the current page, the toggle is unclickable.
+ */
 @Component({
   selector: 'ds-context-help-toggle',
   templateUrl: './context-help-toggle.component.html',
@@ -14,7 +17,6 @@ export class ContextHelpToggleComponent implements OnInit, OnDestroy {
 
   constructor(
     private contextHelpService: ContextHelpService,
-    private translateService: TranslateService
   ) { }
 
   private clickEvents: BehaviorSubject<null> = new BehaviorSubject(null);

From f8d0dab747c96b209da21d2adfaff817d2c0f406 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Fri, 20 Jan 2023 11:34:26 -0800
Subject: [PATCH 134/160] fixed issue with browse back button

---
 .../shared/browse-by/browse-by.component.html |  8 +++-
 .../results-back-button.component.html        |  2 +-
 .../results-back-button.component.ts          | 37 ++++++++++++++-----
 .../themed-results-back-button.component.ts   |  4 --
 src/themes/custom/eager-theme.module.ts       | 28 +++++++-------
 5 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index bbf7c28395..9a6780db8a 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -3,7 +3,9 @@
   <ng-container *ngComponentOutlet="getStartsWithComponent(); injector: objectInjector;"></ng-container>
   <div *ngIf="objects?.hasSucceeded && !objects?.isLoading && objects?.payload?.page.length > 0" @fadeIn>
       <div *ngIf="shouldDisplayResetButton$ |async" class="mb-2 reset">
-        <ds-themed-results-back-button [paginationConfig]="paginationConfig" [previousPage$]="previousPage$"></ds-themed-results-back-button>
+        <ds-results-back-button [paginationConfig]="paginationConfig"
+                                [previousPage$]="previousPage$"
+                                [alwaysShowButton]=true></ds-results-back-button>
       </div>
     <ds-viewable-collection
       [config]="paginationConfig"
@@ -18,7 +20,9 @@
   <ds-error *ngIf="objects?.hasFailed" message="{{'error.browse-by' | translate}}"></ds-error>
   <div *ngIf="!objects?.isLoading && objects?.payload?.page.length === 0">
     <div *ngIf="shouldDisplayResetButton$ |async" class="d-inline-block mb-4 reset">
-      <ds-themed-results-back-button [paginationConfig]="paginationConfig" [previousPage$]="previousPage$" ></ds-themed-results-back-button>
+      <ds-results-back-button [paginationConfig]="paginationConfig"
+                              [previousPage$]="previousPage$"
+                              [alwaysShowButton]=true></ds-results-back-button>
     </div>
     <div class="alert alert-info w-100" role="alert">
       {{'browse.empty' | translate}}
diff --git a/src/app/shared/results-back-button/results-back-button.component.html b/src/app/shared/results-back-button/results-back-button.component.html
index f1387c3284..0381c06610 100644
--- a/src/app/shared/results-back-button/results-back-button.component.html
+++ b/src/app/shared/results-back-button/results-back-button.component.html
@@ -1,4 +1,4 @@
-<button *ngIf="showBackButton | async" class="btn btn-secondary btn-sm mb-2 ng-tns-c242-28" (click)="back()">
+<button *ngIf="showBackButton" class="btn btn-secondary btn-sm mb-2 ng-tns-c242-28" (click)="back()">
   <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
   {{this.buttonLabel | async}}
 </button>
diff --git a/src/app/shared/results-back-button/results-back-button.component.ts b/src/app/shared/results-back-button/results-back-button.component.ts
index 69ce31c41e..3f2493d449 100644
--- a/src/app/shared/results-back-button/results-back-button.component.ts
+++ b/src/app/shared/results-back-button/results-back-button.component.ts
@@ -30,9 +30,17 @@ export class ResultsBackButtonComponent {
   @Input() paginationConfig?: PaginationComponentOptions;
 
   /**
-   * Used to configure search in mirador.
+   * Tells component to always show the back button.
+   * When not true the button is displayed based on
+   * the previous route.
    */
-  showBackButton: Observable<boolean>;
+  @Input() alwaysShowButton?: boolean;
+
+  /**
+   * Always show back button when true regardless of
+   * previous route.
+   */
+  showBackButton: boolean;
 
   /**
    * The button text
@@ -52,12 +60,21 @@ export class ResultsBackButtonComponent {
     } else {
       this.buttonLabel = this.translateService.get('search.browse.item-back');
     }
-    // Show the back to results button when the previous context was a search or browse list.
-    this.showBackButton = this.routeService.getPreviousUrl().pipe(
-      filter(url => /^(\/search|\/browse|\/collections|\/admin\/search|\/mydspace)/.test(url)),
-      take(1),
-      map(() => true)
-    );
+
+    if(this.alwaysShowButton) {
+      this.showBackButton = true;
+    }
+    else {
+      // Show the back button when the previous route was a search or browse list.
+      // Include the button for admin search results and MyDspace.
+      this.routeService.getPreviousUrl().pipe(
+        filter(url => /^(\/search|\/browse|\/collections|\/admin\/search|\/mydspace)/.test(url)),
+        take(1),
+        map(() => true)
+      ).subscribe(showButton => {
+        this.showBackButton = showButton;
+      });
+    }
   }
 
   /**
@@ -72,7 +89,9 @@ export class ResultsBackButtonComponent {
       this.routeService.getPreviousUrl().pipe(
         take(1)
       ).subscribe(
-        (url => this.router.navigateByUrl(url))
+        (url => {
+          this.router.navigateByUrl(url)
+        })
       );
     }
   }
diff --git a/src/app/shared/results-back-button/themed-results-back-button.component.ts b/src/app/shared/results-back-button/themed-results-back-button.component.ts
index cdfa37aaf0..ac539e5cac 100644
--- a/src/app/shared/results-back-button/themed-results-back-button.component.ts
+++ b/src/app/shared/results-back-button/themed-results-back-button.component.ts
@@ -11,10 +11,6 @@ import { BehaviorSubject } from 'rxjs';
 })
 export class ThemedResultsBackButtonComponent extends ThemedComponent<ResultsBackButtonComponent> {
 
-  @Input() previousPage$?: BehaviorSubject<string>;
-
-  @Input() paginationConfig?: PaginationComponentOptions;
-
   protected getComponentName(): string {
     return 'ResultsBackButtonComponent';
   }
diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts
index 19ed5faf56..2cc69edda0 100644
--- a/src/themes/custom/eager-theme.module.ts
+++ b/src/themes/custom/eager-theme.module.ts
@@ -81,20 +81,20 @@ const DECLARATIONS = [
 ];
 
 @NgModule({
-  imports: [
-    CommonModule,
-    SharedModule,
-    RootModule,
-    NavbarModule,
-    SharedBrowseByModule,
-    ResultsBackButtonModule,
-    ItemPageModule,
-    ItemSharedModule,
-  ],
-  declarations: DECLARATIONS,
-  providers: [
-    ...ENTRY_COMPONENTS.map((component) => ({ provide: component }))
-  ],
+    imports: [
+        CommonModule,
+        SharedModule,
+        RootModule,
+        NavbarModule,
+        SharedBrowseByModule,
+        ResultsBackButtonModule,
+        ItemPageModule,
+        ItemSharedModule,
+    ],
+    declarations: DECLARATIONS,
+    providers: [
+        ...ENTRY_COMPONENTS.map((component) => ({provide: component}))
+    ],
 })
 /**
  * This module is included in the main bundle that gets downloaded at first page load. So it should

From 00bf90d8ea111ccec09be8c495d2ca837dc3cadd Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Fri, 20 Jan 2023 11:52:17 -0800
Subject: [PATCH 135/160] lint fix

---
 .../results-back-button.component.ts                  | 11 +++++------
 .../themed-results-back-button.component.ts           |  4 +---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/app/shared/results-back-button/results-back-button.component.ts b/src/app/shared/results-back-button/results-back-button.component.ts
index 3f2493d449..aaac6eafb3 100644
--- a/src/app/shared/results-back-button/results-back-button.component.ts
+++ b/src/app/shared/results-back-button/results-back-button.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
 import { filter, map, take } from 'rxjs/operators';
 import { RouteService } from '../../core/services/route.service';
 import { Router } from '@angular/router';
@@ -17,7 +17,7 @@ import { isNotEmpty } from '../empty.util';
 /**
  * Component to add back to result list button to item.
  */
-export class ResultsBackButtonComponent {
+export class ResultsBackButtonComponent implements OnInit {
 
   /**
    * Page number of the previous page
@@ -61,10 +61,9 @@ export class ResultsBackButtonComponent {
       this.buttonLabel = this.translateService.get('search.browse.item-back');
     }
 
-    if(this.alwaysShowButton) {
+    if (this.alwaysShowButton) {
       this.showBackButton = true;
-    }
-    else {
+    } else {
       // Show the back button when the previous route was a search or browse list.
       // Include the button for admin search results and MyDspace.
       this.routeService.getPreviousUrl().pipe(
@@ -90,7 +89,7 @@ export class ResultsBackButtonComponent {
         take(1)
       ).subscribe(
         (url => {
-          this.router.navigateByUrl(url)
+          this.router.navigateByUrl(url);
         })
       );
     }
diff --git a/src/app/shared/results-back-button/themed-results-back-button.component.ts b/src/app/shared/results-back-button/themed-results-back-button.component.ts
index ac539e5cac..45ac86a605 100644
--- a/src/app/shared/results-back-button/themed-results-back-button.component.ts
+++ b/src/app/shared/results-back-button/themed-results-back-button.component.ts
@@ -1,8 +1,6 @@
-import { Component, Input } from '@angular/core';
+import { Component } from '@angular/core';
 import { ThemedComponent } from '../theme-support/themed.component';
 import { ResultsBackButtonComponent } from './results-back-button.component';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { BehaviorSubject } from 'rxjs';
 
 @Component({
   selector: 'ds-themed-results-back-button',

From 6e052af1f0bbb9d80670a20f5aa33e62bd69f2b4 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Fri, 20 Jan 2023 16:11:56 -0800
Subject: [PATCH 136/160] moved view logic back to ItemComponent

---
 .../journal-issue.component.html              |  2 +-
 .../journal-volume.component.html             |  2 +-
 .../item-pages/journal/journal.component.html |  2 +-
 .../org-unit/org-unit.component.html          |  2 +-
 .../item-pages/person/person.component.html   |  2 +-
 .../item-pages/project/project.component.html |  2 +-
 .../publication/publication.component.html    |  2 +-
 .../item-types/shared/item.component.spec.ts  | 90 +++++++++++++++++++
 .../item-types/shared/item.component.ts       | 12 +++
 .../untyped-item/untyped-item.component.html  |  2 +-
 .../shared/browse-by/browse-by.component.html |  6 +-
 .../results-back-button.component.html        |  2 +-
 .../results-back-button.component.spec.ts     | 43 +--------
 .../results-back-button.component.ts          | 29 +-----
 14 files changed, 115 insertions(+), 83 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
index 11d722f317..fee1751d93 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton | async"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
index 4475fbec8a..2cc653eba5 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton | async"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index 1c079ed36f..b97aff326a 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton | async"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
index 87c9cc2fa1..8b29339211 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton | async"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
index 34c23ebf12..845f8127c0 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton | async"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-item-page-title-field class="mr-auto" [item]="object">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
index bb49dc507a..e4475cc6f1 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton | async"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html
index f418f5691e..56e118ca24 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/item-page/simple/item-types/publication/publication.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton | async"></ds-themed-results-back-button>
 <div class="row" *ngIf="iiifEnabled">
   <div class="col-12">
     <ds-mirador-viewer  id="iiif-viewer"
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 d775a907b2..cb91a31b06 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
@@ -41,6 +41,8 @@ import { ResearcherProfileDataService } from '../../../../core/profile/researche
 
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
+import { Router } from '@angular/router';
+import { ItemComponent } from './item.component';
 
 export function getIIIFSearchEnabled(enabled: boolean): MetadataValue {
   return Object.assign(new MetadataValue(), {
@@ -400,5 +402,93 @@ describe('ItemComponent', () => {
       ]
     },
   });
+  describe('back to results', () => {
+    let comp: ItemComponent;
+    let fixture: ComponentFixture<any>;
+    let router: Router;
+
+    const searchUrl = '/search?query=test&spc.page=2';
+    const browseUrl = '/browse/title?scope=0cc&bbm.page=3';
+    const recentSubmissionsUrl = '/collections/be7b8430-77a5-4016-91c9-90863e50583a?cp.page=3';
+
+    beforeEach(waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [
+          TranslateModule.forRoot({
+            loader: {
+              provide: TranslateLoader,
+              useClass: TranslateLoaderMock
+            }
+          }),
+          RouterTestingModule,
+        ],
+        declarations: [ItemComponent, GenericItemPageFieldComponent, TruncatePipe ],
+        providers: [
+          { provide: ItemDataService, useValue: {} },
+          { provide: TruncatableService, useValue: {} },
+          { provide: RelationshipDataService, useValue: {} },
+          { provide: ObjectCacheService, useValue: {} },
+          { provide: UUIDService, useValue: {} },
+          { provide: Store, useValue: {} },
+          { provide: RemoteDataBuildService, useValue: {} },
+          { provide: CommunityDataService, useValue: {} },
+          { provide: HALEndpointService, useValue: {} },
+          { provide: HttpClient, useValue: {} },
+          { provide: DSOChangeAnalyzer, useValue: {} },
+          { provide: VersionHistoryDataService, useValue: {} },
+          { provide: VersionDataService, useValue: {} },
+          { provide: NotificationsService, useValue: {} },
+          { provide: DefaultChangeAnalyzer, useValue: {} },
+          { provide: BitstreamDataService, useValue: {} },
+          { provide: WorkspaceitemDataService, useValue: {} },
+          { provide: SearchService, useValue: {} },
+          { provide: RouteService, useValue: mockRouteService },
+          { provide: AuthorizationDataService, useValue: {} },
+          { provide: ResearcherProfileDataService, useValue: {} }
+        ],
+        schemas: [NO_ERRORS_SCHEMA]
+      }).overrideComponent(ItemComponent, {
+        set: {changeDetection: ChangeDetectionStrategy.Default}
+      });
+    }));
+
+    beforeEach(waitForAsync(() => {
+      router = TestBed.inject(Router);
+      spyOn(router, 'navigateByUrl');
+      TestBed.compileComponents();
+      fixture = TestBed.createComponent(ItemComponent);
+      comp = fixture.componentInstance;
+      comp.object = mockItem;
+      fixture.detectChanges();
+    }));
+
+    it('should hide back button',() => {
+      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf('/item'));
+      comp.showBackButton.subscribe((val) => {
+        expect(val).toBeFalse();
+      });
+    });
+    it('should show back button for search', () => {
+      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(searchUrl));
+      comp.ngOnInit();
+      comp.showBackButton.subscribe((val) => {
+        expect(val).toBeTrue();
+      });
+    });
+    it('should show back button for browse', () => {
+      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(browseUrl));
+      comp.ngOnInit();
+      comp.showBackButton.subscribe((val) => {
+        expect(val).toBeTrue();
+      });
+    });
+    it('should show back button for recent submissions', () => {
+      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(recentSubmissionsUrl));
+      comp.ngOnInit();
+      comp.showBackButton.subscribe((val) => {
+        expect(val).toBeTrue();
+      });
+    });
+  });
 
 });
diff --git a/src/app/item-page/simple/item-types/shared/item.component.ts b/src/app/item-page/simple/item-types/shared/item.component.ts
index 5d11dda8e9..b815ca0ddb 100644
--- a/src/app/item-page/simple/item-types/shared/item.component.ts
+++ b/src/app/item-page/simple/item-types/shared/item.component.ts
@@ -5,6 +5,7 @@ import { getItemPageRoute } from '../../../item-page-routing-paths';
 import { RouteService } from '../../../../core/services/route.service';
 import { Observable } from 'rxjs';
 import { getDSpaceQuery, isIiifEnabled, isIiifSearchEnabled } from './item-iiif-utils';
+import { filter, map, take } from 'rxjs/operators';
 
 @Component({
   selector: 'ds-item',
@@ -16,6 +17,11 @@ import { getDSpaceQuery, isIiifEnabled, isIiifSearchEnabled } from './item-iiif-
 export class ItemComponent implements OnInit {
   @Input() object: Item;
 
+  /**
+   * Used to show or hide the back to results button.
+   */
+  showBackButton: Observable<boolean>;
+
   /**
    * Route to the item page
    */
@@ -42,6 +48,12 @@ export class ItemComponent implements OnInit {
     this.mediaViewer = environment.mediaViewer;
   }
   ngOnInit(): void {
+
+    this.showBackButton = this.routeService.getPreviousUrl().pipe(
+      filter(url => /^(\/search|\/browse|\/collections|\/admin\/search|\/mydspace)/.test(url)),
+      take(1),
+      map(() => true)
+    );
     this.itemPageRoute = getItemPageRoute(this.object);
     // check to see if iiif viewer is required.
     this.iiifEnabled = isIiifEnabled(this.object);
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
index ef96eef620..462876736c 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton | async"></ds-themed-results-back-button>
 <div class="row" *ngIf="iiifEnabled">
   <div class="col-12">
     <ds-mirador-viewer id="iiif-viewer"
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index 9a6780db8a..84aa6a0484 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -4,8 +4,7 @@
   <div *ngIf="objects?.hasSucceeded && !objects?.isLoading && objects?.payload?.page.length > 0" @fadeIn>
       <div *ngIf="shouldDisplayResetButton$ |async" class="mb-2 reset">
         <ds-results-back-button [paginationConfig]="paginationConfig"
-                                [previousPage$]="previousPage$"
-                                [alwaysShowButton]=true></ds-results-back-button>
+                                [previousPage$]="previousPage$"></ds-results-back-button>
       </div>
     <ds-viewable-collection
       [config]="paginationConfig"
@@ -21,8 +20,7 @@
   <div *ngIf="!objects?.isLoading && objects?.payload?.page.length === 0">
     <div *ngIf="shouldDisplayResetButton$ |async" class="d-inline-block mb-4 reset">
       <ds-results-back-button [paginationConfig]="paginationConfig"
-                              [previousPage$]="previousPage$"
-                              [alwaysShowButton]=true></ds-results-back-button>
+                              [previousPage$]="previousPage$"></ds-results-back-button>
     </div>
     <div class="alert alert-info w-100" role="alert">
       {{'browse.empty' | translate}}
diff --git a/src/app/shared/results-back-button/results-back-button.component.html b/src/app/shared/results-back-button/results-back-button.component.html
index 0381c06610..79910fa332 100644
--- a/src/app/shared/results-back-button/results-back-button.component.html
+++ b/src/app/shared/results-back-button/results-back-button.component.html
@@ -1,4 +1,4 @@
-<button *ngIf="showBackButton" class="btn btn-secondary btn-sm mb-2 ng-tns-c242-28" (click)="back()">
+<button class="btn btn-secondary btn-sm mb-2 ng-tns-c242-28" (click)="back()">
   <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
   {{this.buttonLabel | async}}
 </button>
diff --git a/src/app/shared/results-back-button/results-back-button.component.spec.ts b/src/app/shared/results-back-button/results-back-button.component.spec.ts
index 15cefa79a2..8536099d3a 100644
--- a/src/app/shared/results-back-button/results-back-button.component.spec.ts
+++ b/src/app/shared/results-back-button/results-back-button.component.spec.ts
@@ -9,7 +9,6 @@ import { Router } from '@angular/router';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../testing/pagination-service.stub';
-import { By } from '@angular/platform-browser';
 
 describe('ResultsBackButtonComponent', () => {
 
@@ -77,11 +76,7 @@ describe('ResultsBackButtonComponent', () => {
         expect(translate.get).toHaveBeenCalledWith('browse.back.all-results');
       });
 
-      it('should navigate to previous pagination', () => {
-        component.back();
-        expect(mockRouteService.getPreviousUrl).toHaveBeenCalled();
-        expect(paginationService.updateRoute).toHaveBeenCalled();
-      });
+
 
     });
 
@@ -106,41 +101,5 @@ describe('ResultsBackButtonComponent', () => {
 
   });
 
-  describe('back to results', () => {
-
-    const mockRouteService = getMockRouteService(nonSearchUrl);
-
-    beforeEach(waitForAsync(() => {
-      TestBed.configureTestingModule({
-        declarations: [ResultsBackButtonComponent],
-        imports: [TranslateModule.forRoot(),
-          RouterTestingModule.withRoutes([])
-        ],
-        providers: [
-          {provide: RouteService, useValue: mockRouteService},
-          {provide: PaginationService, useValue: paginationService},
-          {provide: Router, useValue: router},
-          {provide: TranslateService, useValue: translate}
-        ],
-        schemas: [NO_ERRORS_SCHEMA]
-      }).compileComponents();
-      spyOn(mockRouteService, 'getPreviousUrl').and.callThrough();
-    }));
-
-    describe('previous route not search or browse list', () => {
-      beforeEach(waitForAsync(() => {
-        fixture = TestBed.createComponent(ResultsBackButtonComponent);
-        component = fixture.componentInstance;
-        component.ngOnInit();
-        fixture.detectChanges();
-      }));
-
-      it('should hide back button', () => {
-        let button = fixture.debugElement.query(By.css('button'));
-        expect(button).toBeNull();
-      });
-    });
-
-  });
 });
 
diff --git a/src/app/shared/results-back-button/results-back-button.component.ts b/src/app/shared/results-back-button/results-back-button.component.ts
index aaac6eafb3..25a3f9476b 100644
--- a/src/app/shared/results-back-button/results-back-button.component.ts
+++ b/src/app/shared/results-back-button/results-back-button.component.ts
@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
-import { filter, map, take } from 'rxjs/operators';
+import { take } from 'rxjs/operators';
 import { RouteService } from '../../core/services/route.service';
 import { Router } from '@angular/router';
 import { PaginationService } from '../../core/pagination/pagination.service';
@@ -29,19 +29,6 @@ export class ResultsBackButtonComponent implements OnInit {
    */
   @Input() paginationConfig?: PaginationComponentOptions;
 
-  /**
-   * Tells component to always show the back button.
-   * When not true the button is displayed based on
-   * the previous route.
-   */
-  @Input() alwaysShowButton?: boolean;
-
-  /**
-   * Always show back button when true regardless of
-   * previous route.
-   */
-  showBackButton: boolean;
-
   /**
    * The button text
    */
@@ -60,20 +47,6 @@ export class ResultsBackButtonComponent implements OnInit {
     } else {
       this.buttonLabel = this.translateService.get('search.browse.item-back');
     }
-
-    if (this.alwaysShowButton) {
-      this.showBackButton = true;
-    } else {
-      // Show the back button when the previous route was a search or browse list.
-      // Include the button for admin search results and MyDspace.
-      this.routeService.getPreviousUrl().pipe(
-        filter(url => /^(\/search|\/browse|\/collections|\/admin\/search|\/mydspace)/.test(url)),
-        take(1),
-        map(() => true)
-      ).subscribe(showButton => {
-        this.showBackButton = showButton;
-      });
-    }
   }
 
   /**

From 636b4f8a29e049460d07a9e66e1a4c21ebed6535 Mon Sep 17 00:00:00 2001
From: Toni Prieto <antonio.juan.prieto@upc.edu>
Date: Mon, 7 Nov 2022 22:08:36 +0100
Subject: [PATCH 137/160] Catalan translation

---
 src/assets/i18n/ca.json5 | 7155 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 7155 insertions(+)
 create mode 100644 src/assets/i18n/ca.json5

diff --git a/src/assets/i18n/ca.json5 b/src/assets/i18n/ca.json5
new file mode 100644
index 0000000000..24698baac0
--- /dev/null
+++ b/src/assets/i18n/ca.json5
@@ -0,0 +1,7155 @@
+{
+
+  // "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à autoritzat a accedir a aquesta pàgina. Podeu utilitzar el botó de sota per tornar a la pàgina inicial.",
+
+  // "401.link.home-page": "Take me to the home page",
+  "401.link.home-page":  "Porta'm a la pàgina d'inici",
+
+  // "401.unauthorized": "unauthorized",
+  "401.unauthorized":  "no autoritzat",
+
+
+
+  // "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 teniu permisos per accedir a aquesta pàgina. Podeu utilitzar el botó de sota per tornar a la pàgina inicial.",
+
+  // "403.link.home-page": "Take me to the home page",
+  "403.link.home-page":  "Porta'm a la pàgina d'inici",
+
+  // "403.forbidden": "forbidden",
+  "403.forbidden":  "prohibit",
+
+  // "500.page-internal-server-error": "Service Unavailable",
+  "500.page-internal-server-error":  "Servei 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 es pot atendre la vostra petició a causa de problemes de capacitat o manteniments programats del servidor. Intenteu-ho més endavant, si us plau.",
+
+  // "500.link.home-page": "Take me to the home page",
+  "500.link.home-page":  "Porta'm a la pàgina d'inici",
+
+
+  // "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 podem trobar la pàgina que busqueu. La pàgina pot haver estat moguda o eliminada. Podeu utilitzar el botó de sota per tornar a la pàgina d'inici. ",
+
+  // "404.link.home-page": "Take me to the home page",
+  "404.link.home-page":  "Porta'm a la pàgina d'inici",
+
+  // "404.page-not-found": "page not found",
+  "404.page-not-found":  "pàgina no trobada",
+
+  // "error-page.description.401": "unauthorized",
+  "error-page.description.401":  "no autoritzat",
+
+  // "error-page.description.403": "forbidden",
+  "error-page.description.403":  "prohibit",
+
+  // "error-page.description.500": "Service Unavailable",
+  "error-page.description.500":  "Servei no disponible",
+
+  // "error-page.description.404": "page not found",
+  "error-page.description.404":  "pàgina no trobada",
+
+  // "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":  "S'ha produït un error al login via ORCID. Assegureu-vos que heu compartit el correu electrònic del vostre compte ORCID amb Dspace. Si l'error continua, contacteu amb l'administrador",
+
+  // "access-status.embargo.listelement.badge": "Embargo",
+  "access-status.embargo.listelement.badge":  "Embargament",
+
+  // "access-status.metadata.only.listelement.badge": "Metadata only",
+  "access-status.metadata.only.listelement.badge":  "Només Metadades",
+
+  // "access-status.open.access.listelement.badge": "Open Access",
+  "access-status.open.access.listelement.badge":  "Accés Obert",
+
+  // "access-status.restricted.listelement.badge": "Restricted",
+  "access-status.restricted.listelement.badge":  "Restringit",
+
+  // "access-status.unknown.listelement.badge": "Unknown",
+  "access-status.unknown.listelement.badge":  "Desconegut",
+
+  // "admin.curation-tasks.breadcrumbs": "System curation tasks",
+  "admin.curation-tasks.breadcrumbs":  "Tasques de curació del sistema",
+
+  // "admin.curation-tasks.title": "System curation tasks",
+  "admin.curation-tasks.title":  "Tasques de curació del sistema",
+
+  // "admin.curation-tasks.header": "System curation tasks",
+  "admin.curation-tasks.header":  "Tasques de curació del sistema",
+
+  // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
+  "admin.registries.bitstream-formats.breadcrumbs":  "Registre de formats",
+
+  // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.create.breadcrumbs":  "Format del fitxer",
+
+  // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
+  "admin.registries.bitstream-formats.create.failure.content":  "S'ha produït un error en crear el nou format de fitxer.",
+
+  // "admin.registries.bitstream-formats.create.failure.head": "Failure",
+  "admin.registries.bitstream-formats.create.failure.head":  "Fallada",
+
+  // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  "admin.registries.bitstream-formats.create.head":  "Crear format de fitxer",
+
+  // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
+  "admin.registries.bitstream-formats.create.new":  "Afegir un nou format de fitxer",
+
+  // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
+  "admin.registries.bitstream-formats.create.success.content":  "El format de fitxer nou s'ha crear correctament.",
+
+  // "admin.registries.bitstream-formats.create.success.head": "Success",
+  "admin.registries.bitstream-formats.create.success.head":  "Èxit",
+
+  // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.failure.amount":  "Error en eliminar {{ amount }} format(s)",
+
+  // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
+  "admin.registries.bitstream-formats.delete.failure.head":  "Fallada",
+
+  // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.success.amount":  "S'han eliminat correctament {{ amount }} format(s)",
+
+  // "admin.registries.bitstream-formats.delete.success.head": "Success",
+  "admin.registries.bitstream-formats.delete.success.head":  "Èxit",
+
+  // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
+  "admin.registries.bitstream-formats.description":  "Aquesta llista de formats de fitxer proporciona informació sobre formats coneguts i el nivell de suport.",
+
+  // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.edit.breadcrumbs":  "Format del fitxer",
+
+  // "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":  "Descripció",
+
+  // "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":  "Les extensions fan referència a les extensions de fitxers que s'utilitzen per identificar automàticament el format dels fitxers carregats. Podeu introduir vàries extensions per a cada format.",
+
+  // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
+  "admin.registries.bitstream-formats.edit.extensions.label":  "Extensions de fitxer",
+
+  // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder":  "Introduïu una extensió de fitxer (sense el punt)",
+
+  // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
+  "admin.registries.bitstream-formats.edit.failure.content":  "S'ha produït un error en editar el format del fitxer.",
+
+  // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
+  "admin.registries.bitstream-formats.edit.failure.head":  "Fallada",
+
+  // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
+  "admin.registries.bitstream-formats.edit.head":  "Format del fitxer: {{ 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":  "Els formats marcats com a interns estan ocults a l'usuari i s'utilitzen amb finalitats administratives.",
+
+  // "admin.registries.bitstream-formats.edit.internal.label": "Internal",
+  "admin.registries.bitstream-formats.edit.internal.label":  "Intern",
+
+  // "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 tipus MIME associat amb aquest format no ha de ser únic.",
+
+  // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
+  "admin.registries.bitstream-formats.edit.mimetype.label":  "Tipus 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 nom únic per a aquest format, (per exemple, Microsoft Word XP o Microsoft Word 2000)",
+
+  // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
+  "admin.registries.bitstream-formats.edit.shortDescription.label":  "Nom",
+
+  // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
+  "admin.registries.bitstream-formats.edit.success.content":  "El format del fitxer s'ha editat correctament.",
+
+  // "admin.registries.bitstream-formats.edit.success.head": "Success",
+  "admin.registries.bitstream-formats.edit.success.head":  "Èxit",
+
+  // "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 nivell de suport que la seva institució promet per a aquest format.",
+
+  // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
+  "admin.registries.bitstream-formats.edit.supportLevel.label":  "Nivell de suport",
+
+  // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.head":  "Registre de formats de fitxer",
+
+  // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
+  "admin.registries.bitstream-formats.no-items":  "No hi ha formats de fitxer a mostrar.",
+
+  // "admin.registries.bitstream-formats.table.delete": "Delete selected",
+  "admin.registries.bitstream-formats.table.delete":  "Eliminar seleccionat",
+
+  // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
+  "admin.registries.bitstream-formats.table.deselect-all":  "Deseleccionar tot",
+
+  // "admin.registries.bitstream-formats.table.internal": "internal",
+  "admin.registries.bitstream-formats.table.internal":  "intern",
+
+  // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
+  "admin.registries.bitstream-formats.table.mimetype":  "Tipus MIME",
+
+  // "admin.registries.bitstream-formats.table.name": "Name",
+  "admin.registries.bitstream-formats.table.name":  "Nom",
+  // "admin.registries.bitstream-formats.table.id" : "ID",
+  "admin.registries.bitstream-formats.table.id" : "ID",
+
+  // "admin.registries.bitstream-formats.table.return": "Back",
+  "admin.registries.bitstream-formats.table.return":  "Enrere",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
+  "admin.registries.bitstream-formats.table.supportLevel.KNOWN":  "Conegut",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED":  "Suportat",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN":  "Desconegut",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
+  "admin.registries.bitstream-formats.table.supportLevel.head":  "Nivell de suport",
+
+  // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.title":  "Registre de format Fitxer",
+
+
+
+  // "admin.registries.metadata.breadcrumbs": "Metadata registry",
+  "admin.registries.metadata.breadcrumbs":  "Registre de metadades",
+
+  // "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 registre de metadades manté una llista de tots els camps de metadades disponibles al dipòsit. Aquests camps poden estar dividits entre múltiples esquemes. No obstant això, DSpace requereix l'esquema qualificat de Dublin Core.",
+
+  // "admin.registries.metadata.form.create": "Create metadata schema",
+  "admin.registries.metadata.form.create":  "Crear esquema de metadades",
+
+  // "admin.registries.metadata.form.edit": "Edit metadata schema",
+  "admin.registries.metadata.form.edit":  "Editar esquema de metadades",
+
+  // "admin.registries.metadata.form.name": "Name",
+  "admin.registries.metadata.form.name":  "Nom",
+
+  // "admin.registries.metadata.form.namespace": "Namespace",
+  "admin.registries.metadata.form.namespace":  "Espai de noms",
+
+  // "admin.registries.metadata.head": "Metadata Registry",
+  "admin.registries.metadata.head":  "Registre de metadades",
+
+  // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
+  "admin.registries.metadata.schemas.no-items":  "No hi ha esquemes de metadades per mostrar.",
+
+  // "admin.registries.metadata.schemas.table.delete": "Delete selected",
+  "admin.registries.metadata.schemas.table.delete":  "Eliminar seleccionat",
+
+  // "admin.registries.metadata.schemas.table.id": "ID",
+  "admin.registries.metadata.schemas.table.id":  "ID",
+
+  // "admin.registries.metadata.schemas.table.name": "Name",
+  "admin.registries.metadata.schemas.table.name":  "Nom",
+
+  // "admin.registries.metadata.schemas.table.namespace": "Namespace",
+  "admin.registries.metadata.schemas.table.namespace":  "Espai de noms",
+
+  // "admin.registries.metadata.title": "Metadata Registry",
+  "admin.registries.metadata.title":  "Registre de metadades",
+
+
+
+  // "admin.registries.schema.breadcrumbs": "Metadata schema",
+  "admin.registries.schema.breadcrumbs":  "Esquema de metadades",
+
+  // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
+  "admin.registries.schema.description":  "Aquest és l'esquema de metadades per a \"{{ namespace }}\".",
+
+  // "admin.registries.schema.fields.head": "Schema metadata fields",
+  "admin.registries.schema.fields.head":  "Camps de metadades de l'esquema",
+
+  // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
+  "admin.registries.schema.fields.no-items":  "No hi ha camps de metadades per mostrar.",
+
+  // "admin.registries.schema.fields.table.delete": "Delete selected",
+  "admin.registries.schema.fields.table.delete":  "Elimina seleccionat",
+
+  // "admin.registries.schema.fields.table.field": "Field",
+  "admin.registries.schema.fields.table.field":  "Camp",
+  // "admin.registries.schema.fields.table.id" : "ID",
+  "admin.registries.schema.fields.table.id" : "ID",
+
+  // "admin.registries.schema.fields.table.scopenote": "Scope Note",
+  "admin.registries.schema.fields.table.scopenote":  "Nota d'abast",
+
+  // "admin.registries.schema.form.create": "Create metadata field",
+  "admin.registries.schema.form.create":  "Crear camp de metadades",
+
+  // "admin.registries.schema.form.edit": "Edit metadata field",
+  "admin.registries.schema.form.edit":  "Editar camp de metadades",
+
+  // "admin.registries.schema.form.element": "Element",
+  "admin.registries.schema.form.element":  "Element",
+
+  // "admin.registries.schema.form.qualifier": "Qualifier",
+  "admin.registries.schema.form.qualifier":  "Qualificador",
+
+  // "admin.registries.schema.form.scopenote": "Scope Note",
+  "admin.registries.schema.form.scopenote":  "Nota d'abast",
+
+  // "admin.registries.schema.head": "Metadata Schema",
+  "admin.registries.schema.head":  "Esquema de metadades",
+
+  // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.created":  "Esquema de metadades creat correctament \"{{ prefix }}\"",
+
+  // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.failure":  "Error en eliminar {{ amount }} esquemes de metadades",
+
+  // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.success":  "{{ amount }} esquemes de metadades eliminats correctament",
+
+  // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.edited":  "Esquema de metadades editat correctament \"{{ prefix }}\"",
+
+  // "admin.registries.schema.notification.failure": "Error",
+  "admin.registries.schema.notification.failure":  "Error",
+
+  // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.created":  "Camp de metadades creat correctament \"{{ field }}\"",
+
+  // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.failure":  "No s'han pogut esborrar {{ amount }} camps de metadades",
+
+  // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.success":  "{{ amount }} camps de metadades eliminats correctament",
+
+  // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.edited":  "Camp de metadades editat correctament \"{{ field }}\"",
+
+  // "admin.registries.schema.notification.success": "Success",
+  "admin.registries.schema.notification.success":  "Èxit",
+
+  // "admin.registries.schema.return": "Back",
+  "admin.registries.schema.return":  "Enrere",
+
+  // "admin.registries.schema.title": "Metadata Schema Registry",
+  "admin.registries.schema.title":  "Registre d'esquemes de metadades",
+
+
+
+  // "admin.access-control.epeople.actions.delete": "Delete EPerson",
+  "admin.access-control.epeople.actions.delete":  "Eliminar usuari",
+
+  // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
+  "admin.access-control.epeople.actions.impersonate":  "Fer-se passar per usuari",
+
+  // "admin.access-control.epeople.actions.reset": "Reset password",
+  "admin.access-control.epeople.actions.reset":  "Restablir la contrasenya",
+
+  // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
+  "admin.access-control.epeople.actions.stop-impersonating":  "Deixa de fer-se passar per usuari",
+
+  // "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.breadcrumbs":  "Usuaris",
+
+  // "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.title":  "Usuaris",
+
+  // "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.head":  "Usuaris",
+
+  // "admin.access-control.epeople.search.head": "Search",
+  "admin.access-control.epeople.search.head":  "Cerca",
+
+  // "admin.access-control.epeople.button.see-all": "Browse All",
+  "admin.access-control.epeople.button.see-all":  "Examinar tot",
+
+  // "admin.access-control.epeople.search.scope.metadata": "Metadata",
+  "admin.access-control.epeople.search.scope.metadata":  "Metadades",
+
+  // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  "admin.access-control.epeople.search.scope.email":  "Correu electrònic (exacte)",
+
+  // "admin.access-control.epeople.search.button": "Search",
+  "admin.access-control.epeople.search.button":  "Cerca",
+
+  // "admin.access-control.epeople.search.placeholder": "Search people...",
+  "admin.access-control.epeople.search.placeholder":  "Cerca usuaris...",
+
+  // "admin.access-control.epeople.button.add": "Add EPerson",
+  "admin.access-control.epeople.button.add":  "Afegir un usuari",
+
+  // "admin.access-control.epeople.table.id": "ID",
+  "admin.access-control.epeople.table.id":  "ID",
+
+  // "admin.access-control.epeople.table.name": "Name",
+  "admin.access-control.epeople.table.name":  "Nom",
+
+  // "admin.access-control.epeople.table.email": "E-mail (exact)",
+  "admin.access-control.epeople.table.email":  "Correu electrònic (exacte)",
+
+  // "admin.access-control.epeople.table.edit": "Edit",
+  "admin.access-control.epeople.table.edit":  "Editar",
+
+  // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.edit":  "Editar \"{{ name }}\"",
+
+  // "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 teniu autorització per editar aquest grup.",
+
+  // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.remove":  "Eliminar \"{{ name }}\"",
+
+  // "admin.access-control.epeople.no-items": "No EPeople to show.",
+  "admin.access-control.epeople.no-items":  "No hi ha usuaris per mostrar.",
+
+  // "admin.access-control.epeople.form.create": "Create EPerson",
+  "admin.access-control.epeople.form.create":  "Crear un usuari",
+
+  // "admin.access-control.epeople.form.edit": "Edit EPerson",
+  "admin.access-control.epeople.form.edit":  "Editar usuari",
+
+  // "admin.access-control.epeople.form.firstName": "First name",
+  "admin.access-control.epeople.form.firstName":  "Nom",
+
+  // "admin.access-control.epeople.form.lastName": "Last name",
+  "admin.access-control.epeople.form.lastName":  "Cognoms",
+
+  // "admin.access-control.epeople.form.email": "E-mail",
+  "admin.access-control.epeople.form.email":  "Correu electrònic",
+
+  // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  "admin.access-control.epeople.form.emailHint":  "Ha de ser una adreça de correu electrònic vàlida",
+
+  // "admin.access-control.epeople.form.canLogIn": "Can log in",
+  "admin.access-control.epeople.form.canLogIn":  "Pot iniciar sessió",
+
+  // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
+  "admin.access-control.epeople.form.requireCertificate":  "Requereix certificat",
+
+  // "admin.access-control.epeople.form.return": "Back",
+  "admin.access-control.epeople.form.return":  "Enrere",
+
+  // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.success":  "Usuari \"{{ name }}\" creat correctament",
+
+  // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure":  "Error en crear usuari \"{{ name }}\"",
+
+  // "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 creant usuari \"{{ name }}\", el correu electrònic \"{{ email }}\" ja està en ús.",
+
+  // "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 editant usuari \"{{ name }}\", el correu electrònic \"{{ email }}\" ja està en ús.",
+
+  // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.success":  "Usuari \"{{ name }}\" editat correctament",
+
+  // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure":  "Error editant usuari \"{{ name }}\"",
+
+  // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.success":  "Usuari \"{{ name }}\" eliminat correctament",
+
+  // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure":  "No s'ha pogut esborrar l'usuari \"{{ name }}\"",
+
+  // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf":  "Membre d'aquests grups:",
+
+  // "admin.access-control.epeople.form.table.id": "ID",
+  "admin.access-control.epeople.form.table.id":  "ID",
+
+  // "admin.access-control.epeople.form.table.name": "Name",
+  "admin.access-control.epeople.form.table.name":  "Nom",
+
+  // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.epeople.form.table.collectionOrCommunity":  "Col·lecció/Comunitat",
+
+  // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
+  "admin.access-control.epeople.form.memberOfNoGroups":  "Aquest usuari no és membre de cap grup",
+
+  // "admin.access-control.epeople.form.goToGroups": "Add to groups",
+  "admin.access-control.epeople.form.goToGroups":  "Afegir a grups",
+
+  // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.failure":  "No s'ha pogut esborrar l'usuari: \"{{ name }}\"",
+
+  // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success":  "Usuari eliminat correctament: \"{{ name }}\"",
+
+
+
+  // "admin.access-control.groups.title": "Groups",
+  "admin.access-control.groups.title":  "Grups",
+
+  // "admin.access-control.groups.breadcrumbs": "Groups",
+  "admin.access-control.groups.breadcrumbs":  "Grups",
+
+  // "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group",
+  "admin.access-control.groups.singleGroup.breadcrumbs":  "Editar grup",
+
+  // "admin.access-control.groups.title.singleGroup": "Edit Group",
+  "admin.access-control.groups.title.singleGroup":  "Editar grup",
+
+  // "admin.access-control.groups.title.addGroup": "New Group",
+  "admin.access-control.groups.title.addGroup":  "Nou grup",
+
+  // "admin.access-control.groups.addGroup.breadcrumbs": "New Group",
+  "admin.access-control.groups.addGroup.breadcrumbs":  "Nou grup",
+
+  // "admin.access-control.groups.head": "Groups",
+  "admin.access-control.groups.head":  "Grups",
+
+  // "admin.access-control.groups.button.add": "Add group",
+  "admin.access-control.groups.button.add":  "Afegir grup",
+
+  // "admin.access-control.groups.search.head": "Search groups",
+  "admin.access-control.groups.search.head":  "Cerca grups",
+
+  // "admin.access-control.groups.button.see-all": "Browse all",
+  "admin.access-control.groups.button.see-all":  "Examinar-ho tot",
+
+  // "admin.access-control.groups.search.button": "Search",
+  "admin.access-control.groups.search.button":  "Cerca",
+
+  // "admin.access-control.groups.search.placeholder": "Search groups...",
+  "admin.access-control.groups.search.placeholder":  "Cerca grups...",
+
+  // "admin.access-control.groups.table.id": "ID",
+  "admin.access-control.groups.table.id":  "ID",
+
+  // "admin.access-control.groups.table.name": "Name",
+  "admin.access-control.groups.table.name":  "Nom",
+
+  // "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.table.collectionOrCommunity":  "Col·lecció/Comunitat",
+
+  // "admin.access-control.groups.table.members": "Members",
+  "admin.access-control.groups.table.members":  "Membres",
+
+  // "admin.access-control.groups.table.edit": "Edit",
+  "admin.access-control.groups.table.edit":  "Editar",
+
+  // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.edit":  "Editar \"{{ name }}\"",
+
+  // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.remove":  "Eliminar \"{{ 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":  "No s'han trobat grups cercant al camp nom o al camp UUID",
+
+  // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.success":  "El grup \"{{ name }}\" s'ha eliminat correctament",
+
+  // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title":  "No s'ha pogut esborrar el grup \"{{ 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.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":  "Aquest grup és permanent, per la qual cosa no es pot editar ni eliminar. Però podeu afegir i eliminar membres del grup utilitzant aquesta pàgina.",
+
+  // "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":  "Aquest grup no pot ser modificat o eliminat perquè correspon a un rol en el procés d'entrada i revisió d'enviaments a {{ comcol }} \"{{ name }}\". Podeu eliminar-lo des de la pestanya <a href='{{comcolEditRolesRoute}}'>\" assignar rols\"</a> de la pàgina d'edició de la {{ comcol }}. Sí que podeu afegir i eliminar membres del grup utilitzant aquesta pàgina.",
+
+  // "admin.access-control.groups.form.head.create": "Create group",
+  "admin.access-control.groups.form.head.create":  "Crear un grup",
+
+  // "admin.access-control.groups.form.head.edit": "Edit group",
+  "admin.access-control.groups.form.head.edit":  "Editar grup",
+
+  // "admin.access-control.groups.form.groupName": "Group name",
+  "admin.access-control.groups.form.groupName":  "Nom del grup",
+
+  // "admin.access-control.groups.form.groupCommunity": "Community or Collection",
+  "admin.access-control.groups.form.groupCommunity":  "Comunitat o Col·lecció",
+
+  // "admin.access-control.groups.form.groupDescription": "Description",
+  "admin.access-control.groups.form.groupDescription":  "Descripció",
+
+  // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.success":  "Grup creat amb èxit \"{{ name }}\"",
+
+  // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure":  "No s'ha pogut crear el grup \"{{ name }}\"",
+
+  // "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 s'ha pogut crear el grup amb el nom: \"{{ name }}\", assegureu-vos que el nom no estigui en ús.",
+
+  // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.failure":  "No s'ha pogut editar el grup \"{{ 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 nom \"{{ name }}\" ja està en ús!",
+
+  // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.success":  "Grup \"{{ name }}\" editat correctament",
+
+  // "admin.access-control.groups.form.actions.delete": "Delete Group",
+  "admin.access-control.groups.form.actions.delete":  "Eliminar grup",
+
+  // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.header":  "Eliminar grup \"{{ dsoName }}\"",
+
+  // "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":  "Esteu segur que voleu suprimir el grup \"{{ dsoName }}\"?",
+
+  // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
+  "admin.access-control.groups.form.delete-group.modal.cancel":  "Cancel·lar",
+
+  // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
+  "admin.access-control.groups.form.delete-group.modal.confirm":  "Esborrar",
+
+  // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.success":  "El grup \"{{ name }}\" s'ha eliminat correctament",
+
+  // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.title":  "No s'ha pogut esborrar el grup \"{{ 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.members-list.head": "EPeople",
+  "admin.access-control.groups.form.members-list.head":  "Usuaris",
+
+  // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
+  "admin.access-control.groups.form.members-list.search.head":  "Afegir usuaris",
+
+  // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.members-list.button.see-all":  "Examinar tot",
+
+  // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
+  "admin.access-control.groups.form.members-list.headMembers":  "Membres actuals",
+
+  // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
+  "admin.access-control.groups.form.members-list.search.scope.metadata":  "Metadades",
+
+  // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
+  "admin.access-control.groups.form.members-list.search.scope.email":  "Correu electrònic (exacte)",
+
+  // "admin.access-control.groups.form.members-list.search.button": "Search",
+  "admin.access-control.groups.form.members-list.search.button":  "Cerca",
+
+  // "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.table.name": "Name",
+  "admin.access-control.groups.form.members-list.table.name":  "Nom",
+
+  // "admin.access-control.groups.form.members-list.table.identity": "Identity",
+  "admin.access-control.groups.form.members-list.table.identity":  "Identitat",
+
+  // "admin.access-control.groups.form.members-list.table.email": "Email",
+  "admin.access-control.groups.form.members-list.table.email":  "Correu electrònic",
+
+  // "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.table.edit": "Remove / Add",
+  "admin.access-control.groups.form.members-list.table.edit":  "Eliminar / Afegir",
+
+  // "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 membre amb nom \"{{ name }}\"",
+
+  // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.addMember":  "Membre afegit amb èxit: \"{{ 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":  "No s'ha pogut afegir el membre: \"{{ 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":  "Membre eliminat correctament: \"{{ 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":  "No s'ha pogut suprimir el membre: \"{{ 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":  "Afegir membre amb nom \"{{ name }}\"",
+
+  // "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 hi ha un grup actiu actual, envieu primer un nom.",
+
+  // "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":  "Encara no hi ha membres al grup, cerqueu i afegiu.",
+
+  // "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 s'han trobat usuaris en aquesta cerca",
+
+  // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure":  "Alguna cosa ha sortir malament: \"{{ cause }}\"",
+
+  // "admin.access-control.groups.form.subgroups-list.head": "Groups",
+  "admin.access-control.groups.form.subgroups-list.head":  "Grups",
+
+  // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
+  "admin.access-control.groups.form.subgroups-list.search.head":  "Afegir subgrup",
+
+  // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.subgroups-list.button.see-all":  "Examinar tot",
+
+  // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups":  "Subgrups actuals",
+
+  // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
+  "admin.access-control.groups.form.subgroups-list.search.button":  "Cerca",
+
+  // "admin.access-control.groups.form.subgroups-list.table.id": "ID",
+  "admin.access-control.groups.form.subgroups-list.table.id":  "ID",
+
+  // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
+  "admin.access-control.groups.form.subgroups-list.table.name":  "Nom",
+
+  // "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity":  "Col·lecció/Comunitat",
+
+  // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
+  "admin.access-control.groups.form.subgroups-list.table.edit":  "Eliminar / Afegir",
+
+  // "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 subgrup amb nom \"{{ 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":  "Afegir subgrup amb el nom \"{{ name }}\"",
+
+  // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
+  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup":  "Grup actual",
+
+  // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup":  "Subgrup afegit correctament: \"{{ 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":  "No s'ha pogut afegir el subgrup: \"{{ 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":  "Subgrup eliminat correctament: \"{{ 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":  "No s'ha pogut suprimir el subgrup: \"{{ 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":  "No hi ha un grup actiu actual, envieu un nom primer.",
+
+  // "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":  "Aquest és el grup actual, no es pot afegir.",
+
+  // "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 s'han trobat grups amb aquest text al nom o al UUID",
+
+  // "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":  "Encara no hi ha subgrups al grup.",
+
+  // "admin.access-control.groups.form.return": "Back",
+  "admin.access-control.groups.form.return":  "Enrere",
+
+
+
+  // "admin.search.breadcrumbs": "Administrative Search",
+  "admin.search.breadcrumbs":  "Cerca 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":  "Esborrar",
+
+  // "admin.search.item.edit": "Edit",
+  "admin.search.item.edit":  "Editar",
+
+  // "admin.search.item.make-private": "Make non-discoverable",
+  "admin.search.item.make-private":  "Fer-ho privat",
+
+  // "admin.search.item.make-public": "Make discoverable",
+  "admin.search.item.make-public":  "Fer-ho públic",
+
+  // "admin.search.item.move": "Move",
+  "admin.search.item.move":  "Moure",
+
+  // "admin.search.item.reinstate": "Reinstate",
+  "admin.search.item.reinstate":  "Reintegrar",
+
+  // "admin.search.item.withdraw": "Withdraw",
+  "admin.search.item.withdraw":  "Retira",
+
+  // "admin.search.title": "Administrative Search",
+  "admin.search.title":  "Cerca administrativa",
+
+  // "administrativeView.search.results.head": "Administrative Search",
+  "administrativeView.search.results.head":  "Cerca administrativa",
+
+
+
+
+  // "admin.workflow.breadcrumbs": "Administer Workflow",
+  "admin.workflow.breadcrumbs":  "Administrar flux de treball",
+
+  // "admin.workflow.title": "Administer Workflow",
+  "admin.workflow.title":  "Administrar flux de treball",
+
+  // "admin.workflow.item.workflow": "Workflow",
+  "admin.workflow.item.workflow":  "Flux de treball",
+
+  // "admin.workflow.item.delete": "Delete",
+  "admin.workflow.item.delete":  "Esborrar",
+
+  // "admin.workflow.item.send-back": "Send back",
+  "admin.workflow.item.send-back":  "Tornar",
+
+
+
+  // "admin.metadata-import.breadcrumbs": "Import Metadata",
+  "admin.metadata-import.breadcrumbs":  "Importa metadades",
+
+  // "admin.batch-import.breadcrumbs": "Import Batch",
+  "admin.batch-import.breadcrumbs":  "Importació per lots",
+
+  // "admin.metadata-import.title": "Import Metadata",
+  "admin.metadata-import.title":  "Importar metadades",
+
+  // "admin.batch-import.title": "Import Batch",
+  "admin.batch-import.title":  "Importació per lots",
+
+  // "admin.metadata-import.page.header": "Import Metadata",
+  "admin.metadata-import.page.header":  "Importa metadades",
+
+  // "admin.batch-import.page.header": "Import Batch",
+  "admin.batch-import.page.header":  "Importació per lots",
+
+  // "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":  "Podeu deixar anar o examinar fitxers CSV que contenen operacions de metadades per lots aquí",
+
+  // "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
+  "admin.batch-import.page.help":  "Seleccioneu la Col·lecció a la qual importar. Després, deixeu anar o busqueu el fitxer zip en format Simple Archive Format (SAF) que inclou els ítems a importar",
+
+  // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
+  "admin.metadata-import.page.dropMsg":  "Deixeu anar un CSV de metadades per importar",
+
+  // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
+  "admin.batch-import.page.dropMsg":  "Deixeu anar un ZIP per lots per importar",
+
+  // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
+  "admin.metadata-import.page.dropMsgReplace":  "Deixa anar per reemplaçar el CSV de metadades a importar",
+
+  // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
+  "admin.batch-import.page.dropMsgReplace":  "Deixa anar per reemplaçar el ZIP per lots a importar",
+
+  // "admin.metadata-import.page.button.return": "Back",
+  "admin.metadata-import.page.button.return":  "Enrere",
+
+  // "admin.metadata-import.page.button.proceed": "Proceed",
+  "admin.metadata-import.page.button.proceed":  "Continuar",
+
+  // "admin.metadata-import.page.button.select-collection": "Select Collection",
+  "admin.metadata-import.page.button.select-collection":  "Selecciona la Col·lecció",
+
+  // "admin.metadata-import.page.error.addFile": "Select file first!",
+  "admin.metadata-import.page.error.addFile":  "Seleccioneu el fitxer primer!",
+
+  // "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  "admin.batch-import.page.error.addFile":  "Seleccioneu el fitxer ZIP primer!",
+
+  // "admin.metadata-import.page.validateOnly": "Validate Only",
+  "admin.metadata-import.page.validateOnly":  "Només Validar",
+
+  // "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":  "En seleccionar, es validarà el CSV pujat. Rebreu un informe amb els canvis detectats, però no s'efectuaran aquests canvis.",
+
+  // "admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.",
+  "admin.batch-import.page.validateOnly.hint":  "En seleccionar, es validarà el fitxer ZIP pujat. Rebreu un informe amb els canvis detectats, però no s'efectuaran aquests canvis.",
+
+  // "admin.batch-import.page.remove": "remove",
+  "admin.batch-import.page.remove":  "eliminar",
+
+  // "auth.errors.invalid-user": "Invalid email address or password.",
+  "auth.errors.invalid-user":  "Adreça de correu electrònic o contrasenya no vàlids.",
+
+  // "auth.messages.expired": "Your session has expired. Please log in again.",
+  "auth.messages.expired":  "La vostra sessió ha caducat. Inicieu sessió de nou.",
+
+  // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
+  "auth.messages.token-refresh-failed":  "No s'ha pogut actualitzar el token de la sessió. Inicieu sessió de nou.",
+
+
+
+  // "bitstream.download.page": "Now downloading {{bitstream}}..." ,
+  "bitstream.download.page":  "Descarregant {{ bitstream }}...",
+
+  // "bitstream.download.page.back": "Back" ,
+  "bitstream.download.page.back":  "Enrere",
+
+
+  // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.link":  "Editar les polítiques del fitxer",
+
+  // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.title":  "Editar les polítiques de fitxer",
+
+  // "bitstream.edit.return": "Back",
+  "bitstream.edit.return":  "Enrere",
+
+  // "bitstream.edit.bitstream": "Bitstream: ",
+  "bitstream.edit.bitstream":  "Arxiu: ",
+
+  // "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": "Opcionalment, proporcioneu una breu descripció del fitxer, per exemple \"<i>Article principal</i>\" o \"<i>Lectures de dades de l'experiment</i>\".",
+
+  // "bitstream.edit.form.description.label": "Description",
+  "bitstream.edit.form.description.label":  "Descripció",
+
+  // "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 dia a partir del qual es permet l'accés. <b>Aquesta data no es pot modificar en aquest formulari.</b> Per establir una data d'embargament per a un fitxer, aneu a la pestanya <i>Estat de l'ítem</i> , feu clic a <i>Autoritzacions...</i> , creeu o editeu la política <i>READ</i> del fitxer i configureu la <i>Data d'inici</i> com vulgueu.",
+
+  // "bitstream.edit.form.embargo.label": "Embargo until specific date",
+  "bitstream.edit.form.embargo.label":  "Embargament fins a data 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":  "Canvieu el nom del fitxer. Tingueu en compte que això canviarà l'URL de visualització del fitxer, però els enllaços antics continuaran resolent-se sempre que la ID de seqüència no canviï.",
+
+  // "bitstream.edit.form.fileName.label": "Filename",
+  "bitstream.edit.form.fileName.label":  "Nom del fitxer",
+
+  // "bitstream.edit.form.newFormat.label": "Describe new format",
+  "bitstream.edit.form.newFormat.label":  "Descriu el nou format",
+
+  // "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":  "L'aplicació que heu utilitzat per crear el fitxer i el número de versió (per exemple, \"<i>ACMESoft SuperApp versió 1.5</i>\").",
+
+  // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
+  "bitstream.edit.form.primaryBitstream.label":  "Fitxer principal",
+
+  // "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 format no és a la llista anterior, <b>seleccioneu \"el format no és a la llista\" a dalt</b> i descriviu-lo a \"Descriure el nou format\".",
+
+  // "bitstream.edit.form.selectedFormat.label": "Selected Format",
+  "bitstream.edit.form.selectedFormat.label":  "Format seleccionat",
+
+  // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
+  "bitstream.edit.form.selectedFormat.unknown":  "El format no és a la llista",
+
+  // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
+  "bitstream.edit.notifications.error.format.title":  "S'ha produït un error en desar el format del fitxer.",
+
+  // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
+  "bitstream.edit.form.iiifLabel.label":  "Etiqueta IIIF",
+
+  // "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
+  "bitstream.edit.form.iiifLabel.hint":  "Etiqueta Canvas per a aquesta imatge. Si no es proporciona, s'utilitzarà l'etiqueta per defecte.",
+
+  // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
+  "bitstream.edit.form.iiifToc.label":  "Índex de l'IIIF",
+
+  // "bitstream.edit.form.iiifToc.hint": "Adding text here makes this the start of a new table of contents range.",
+  "bitstream.edit.form.iiifToc.hint":  "Afegir text aquí crea un nou començament de l'índex.",
+
+  // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
+  "bitstream.edit.form.iiifWidth.label":  "Amplada del marc IIIF",
+
+  // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
+  "bitstream.edit.form.iiifWidth.hint":  "L'amplada del marc normalment hauria de coincidir amb l'amplada de la imatge.",
+
+  // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
+  "bitstream.edit.form.iiifHeight.label":  "Alçada del marc IIIF",
+
+  // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
+  "bitstream.edit.form.iiifHeight.hint":  "L'alçada del marc normalment hauria de coincidir amb l'alçada de la imatge",
+
+
+  // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
+  "bitstream.edit.notifications.saved.content":  "S'han desat els canvis en aquest fitxer.",
+
+  // "bitstream.edit.notifications.saved.title": "Bitstream saved",
+  "bitstream.edit.notifications.saved.title":  "Fitxer desat",
+
+  // "bitstream.edit.title": "Edit bitstream",
+  "bitstream.edit.title":  "Editar fitxer",
+
+  // "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":  "Ja teniu accés al fitxer, si voleu descarregar-lo premeu ",
+
+  // "bitstream-request-a-copy.alert.canDownload2": "here",
+  "bitstream-request-a-copy.alert.canDownload2":  "aquí",
+
+  // "bitstream-request-a-copy.header": "Request a copy of the file",
+  "bitstream-request-a-copy.header":  "Sol·licitar una còpia del fitxer",
+
+  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
+  "bitstream-request-a-copy.intro":  "Introduïu la informació següent per sol·licitar una còpia del següent ítem: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
+  "bitstream-request-a-copy.intro.bitstream.one":  "Sol·licitant el fitxer següent: ",
+  // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
+  "bitstream-request-a-copy.intro.bitstream.all":  "Sol·licitant tots els fitxers. ",
+
+  // "bitstream-request-a-copy.name.label": "Name *",
+  "bitstream-request-a-copy.name.label":  "Nom *",
+
+  // "bitstream-request-a-copy.name.error": "The name is required",
+  "bitstream-request-a-copy.name.error":  "Es requereix un nom",
+
+  // "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  "bitstream-request-a-copy.email.label":  "La vostra adreça de correu electrònic *",
+
+  // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
+  "bitstream-request-a-copy.email.hint":  "S'enviarà el fitxer a aquesta adreça de correu electrònic.",
+
+  // "bitstream-request-a-copy.email.error": "Please enter a valid email address.",
+  "bitstream-request-a-copy.email.error":  "Si us plau, introduïu una adreça de correu electrònic vàlida.",
+
+  // "bitstream-request-a-copy.allfiles.label": "Files",
+  "bitstream-request-a-copy.allfiles.label":  "Fitxers",
+
+  // "bitstream-request-a-copy.files-all-false.label": "Only the requested file",
+  "bitstream-request-a-copy.files-all-false.label":  "Només el fitxer indicat",
+
+  // "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access",
+  "bitstream-request-a-copy.files-all-true.label":  "Tots els fitxers (d'aquest ítem) en accés restringit",
+
+  // "bitstream-request-a-copy.message.label": "Message",
+  "bitstream-request-a-copy.message.label":  "Missatge",
+
+  // "bitstream-request-a-copy.return": "Back",
+  "bitstream-request-a-copy.return":  "Enrere",
+
+  // "bitstream-request-a-copy.submit": "Request copy",
+  "bitstream-request-a-copy.submit":  "Sol·licitar còpia",
+
+  // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
+  "bitstream-request-a-copy.submit.success":  "S'ha enviat la sol·licitud de còpia.",
+
+  // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
+  "bitstream-request-a-copy.submit.error":  "S'ha produït un error en l'enviament de la sol·licitud de còpia.",
+
+
+
+  // "browse.back.all-results": "All browse results",
+  "browse.back.all-results":  "Tots els resultats de la cerca",
+
+  // "browse.comcol.by.author": "By Author",
+  "browse.comcol.by.author":  "Per autor",
+
+  // "browse.comcol.by.dateissued": "By Issue Date",
+  "browse.comcol.by.dateissued":  "Per data de publicació",
+
+  // "browse.comcol.by.subject": "By Subject",
+  "browse.comcol.by.subject":  "Per matèria",
+
+  // "browse.comcol.by.title": "By Title",
+  "browse.comcol.by.title":  "Per títol",
+
+  // "browse.comcol.head": "Browse",
+  "browse.comcol.head":  "Examinar",
+
+  // "browse.empty": "No items to show.",
+  "browse.empty":  "No hi ha ítems per mostrar.",
+
+  // "browse.metadata.author": "Author",
+  "browse.metadata.author":  "Autor",
+
+  // "browse.metadata.dateissued": "Issue Date",
+  "browse.metadata.dateissued":  "Data de publicació",
+
+  // "browse.metadata.subject": "Subject",
+  "browse.metadata.subject":  "Matèria",
+
+  // "browse.metadata.title": "Title",
+  "browse.metadata.title":  "Títol",
+
+  // "browse.metadata.author.breadcrumbs": "Browse by Author",
+  "browse.metadata.author.breadcrumbs":  "Cerca per autor",
+
+  // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
+  "browse.metadata.dateissued.breadcrumbs":  "Examinar per data",
+
+  // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
+  "browse.metadata.subject.breadcrumbs":  "Examinar per matèria",
+
+  // "browse.metadata.title.breadcrumbs": "Browse by Title",
+  "browse.metadata.title.breadcrumbs":  "Examinar per títol",
+
+  // "pagination.next.button": "Next",
+  "pagination.next.button":  "Següent",
+
+  // "pagination.previous.button": "Previous",
+  "pagination.previous.button":  "Anterior",
+
+  // "pagination.next.button.disabled.tooltip": "No more pages of results",
+  "pagination.next.button.disabled.tooltip":  "No hi ha més pàgines de resultats",
+
+  // "browse.startsWith": ", starting with {{ startsWith }}",
+  "browse.startsWith":  ", començant per {{ startsWith }}",
+
+  // "browse.startsWith.choose_start": "(Choose start)",
+  "browse.startsWith.choose_start":  "(Triar inici)",
+
+  // "browse.startsWith.choose_year": "(Choose year)",
+  "browse.startsWith.choose_year":  "(Triar any)",
+
+  // "browse.startsWith.choose_year.label": "Choose the issue year",
+  "browse.startsWith.choose_year.label":  "Trieu l'any de publicació",
+
+  // "browse.startsWith.jump": "Filter results by year or month",
+  "browse.startsWith.jump":  "Filtrar resultats per any o per mes:",
+
+  // "browse.startsWith.months.april": "April",
+  "browse.startsWith.months.april":  "abril",
+
+  // "browse.startsWith.months.august": "August",
+  "browse.startsWith.months.august":  "agost",
+
+  // "browse.startsWith.months.december": "December",
+  "browse.startsWith.months.december":  "desembre",
+
+  // "browse.startsWith.months.february": "February",
+  "browse.startsWith.months.february":  "febrer",
+
+  // "browse.startsWith.months.january": "January",
+  "browse.startsWith.months.january":  "gener",
+
+  // "browse.startsWith.months.july": "July",
+  "browse.startsWith.months.july":  "juliol",
+
+  // "browse.startsWith.months.june": "June",
+  "browse.startsWith.months.june":  "juny",
+
+  // "browse.startsWith.months.march": "March",
+  "browse.startsWith.months.march":  "març",
+
+  // "browse.startsWith.months.may": "May",
+  "browse.startsWith.months.may":  "maig",
+
+  // "browse.startsWith.months.none": "(Choose month)",
+  "browse.startsWith.months.none":  "(Triar mes)",
+
+  // "browse.startsWith.months.none.label": "Choose the issue month",
+  "browse.startsWith.months.none.label":  "Trieu el mes de publicació",
+
+  // "browse.startsWith.months.november": "November",
+  "browse.startsWith.months.november":  "novembre",
+
+  // "browse.startsWith.months.october": "October",
+  "browse.startsWith.months.october":  "octubre",
+
+  // "browse.startsWith.months.september": "September",
+  "browse.startsWith.months.september":  "setembre",
+
+  // "browse.startsWith.submit": "Browse",
+  "browse.startsWith.submit":  "Examinar",
+
+  // "browse.startsWith.type_date": "Filter results by date",
+  "browse.startsWith.type_date":  "Resultats per data",
+
+  // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
+  "browse.startsWith.type_date.label":  "O escriviu una data (any-mes) i feu clic al botó Examinar",
+
+  // "browse.startsWith.type_text": "Filter results by typing the first few letters",
+  "browse.startsWith.type_text":  "Seleccioneu resultats teclejant les primeres lletres",
+
+  // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title":  "Examinant {{ collection }} per {{ field }}{{ startsWith }} {{ value }}",
+
+  // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  "browse.title.page":  "Examinant {{ collection }} per {{ field }} {{ value }}",
+
+
+  // "chips.remove": "Remove chip",
+  "chips.remove":  "Treu xip",
+
+
+
+  // "collection.create.head": "Create a Collection",
+  "collection.create.head":  "Crear una col·lecció",
+
+  // "collection.create.notifications.success": "Successfully created the Collection",
+  "collection.create.notifications.success":  "Col·lecció creada amb èxit",
+
+  // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
+  "collection.create.sub-head":  "Crea una col·lecció per a la comunitat {{ parent }}",
+
+  // "collection.curate.header": "Curate Collection: {{collection}}",
+  "collection.curate.header":  "Curar col·lecció: {{ collection }}",
+
+  // "collection.delete.cancel": "Cancel",
+  "collection.delete.cancel":  "Cancel·lar",
+
+  // "collection.delete.confirm": "Confirm",
+  "collection.delete.confirm":  "Confirmar",
+
+  // "collection.delete.processing": "Deleting",
+  "collection.delete.processing":  "Eliminant",
+
+  // "collection.delete.head": "Delete Collection",
+  "collection.delete.head":  "Eliminar col·lecció",
+
+  // "collection.delete.notification.fail": "Collection could not be deleted",
+  "collection.delete.notification.fail":  "No s'ha pogut esborrar la col·lecció",
+
+  // "collection.delete.notification.success": "Successfully deleted collection",
+  "collection.delete.notification.success":  "Col·lecció eliminada correctament",
+
+  // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
+  "collection.delete.text":  "Estàs segur que vols eliminar la col·lecció \"{{ dso }}\"?",
+
+
+
+  // "collection.edit.delete": "Delete this collection",
+  "collection.edit.delete":  "Eliminar aquesta col·lecció",
+
+  // "collection.edit.head": "Edit Collection",
+  "collection.edit.head":  "Editar col·lecció",
+
+  // "collection.edit.breadcrumbs": "Edit Collection",
+  "collection.edit.breadcrumbs":  "Editar col·lecció",
+
+
+
+  // "collection.edit.tabs.mapper.head": "Item Mapper",
+  "collection.edit.tabs.mapper.head":  "Mapeig d'ítems",
+
+  // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
+  "collection.edit.tabs.item-mapper.title":  "Editar col·lecció: mapeig d'ítems",
+
+  // "collection.edit.item-mapper.cancel": "Cancel",
+  "collection.edit.item-mapper.cancel":  "Cancel·lar",
+
+  // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
+  "collection.edit.item-mapper.collection":  "Col·lecció: \"<b>{{ name }}</b>\"",
+
+  // "collection.edit.item-mapper.confirm": "Map selected items",
+  "collection.edit.item-mapper.confirm":  "Mapeja els ítems seleccionats",
+
+  // "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":  "Aquesta és l'eina de mapatge d'ítems que permet als administradors de col·leccions assignar ítems d'altres col·leccions a aquesta col·lecció. Podeu cercar ítems d'altres col·leccions i mapejar-los, o explorar la llista d'ítems mapeats.",
+
+  // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
+  "collection.edit.item-mapper.head":  "Mapeig d'ítems: mapea ítems d'altres col·leccions",
+
+  // "collection.edit.item-mapper.no-search": "Please enter a query to search",
+  "collection.edit.item-mapper.no-search":  "Introduïu una consulta per cercar",
+
+  // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.error.content":  "S'han produït errors en l'assignació de {{ amount }} ítems.",
+
+  // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
+  "collection.edit.item-mapper.notifications.map.error.head":  "Errors de mapatge",
+
+  // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.success.content":  "{{ amount }} ítems mapejats correctament.",
+
+  // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
+  "collection.edit.item-mapper.notifications.map.success.head":  "Mapeig completat",
+
+  // "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":  "S'han produït errors en eliminar els mapeigs de {{ amount }} ítems.",
+
+  // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
+  "collection.edit.item-mapper.notifications.unmap.error.head":  "Eliminar errors de mapatge",
+
+  // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.success.content":  "S'han eliminat correctament els mapeigs de {{ amount }} ítems.",
+
+  // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
+  "collection.edit.item-mapper.notifications.unmap.success.head":  "Finalitzada l'eliminació del mapatge",
+
+  // "collection.edit.item-mapper.remove": "Remove selected item mappings",
+  "collection.edit.item-mapper.remove":  "Eliminar els mapeigs d'ítems seleccionats",
+
+  // "collection.edit.item-mapper.search-form.placeholder": "Search items...",
+  "collection.edit.item-mapper.search-form.placeholder":  "Cerca els ítems...",
+
+  // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
+  "collection.edit.item-mapper.tabs.browse":  "Examinar ítems mapejats",
+
+  // "collection.edit.item-mapper.tabs.map": "Map new items",
+  "collection.edit.item-mapper.tabs.map":  "Assignar nous ítems",
+
+
+  // "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":  "Desfer eliminació",
+
+  // "collection.edit.logo.label": "Collection logo",
+  "collection.edit.logo.label":  "Logotip de la col·lecció",
+
+  // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
+  "collection.edit.logo.notifications.add.error":  "Error en carregar el logotip de la col·lecció. Verifiqueu el contingut abans de tornar-ho a provar.",
+
+  // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
+  "collection.edit.logo.notifications.add.success":  "Pujada correcta del logotip de la col·lecció.",
+
+  // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "collection.edit.logo.notifications.delete.success.title":  "Logotip eliminat",
+
+  // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
+  "collection.edit.logo.notifications.delete.success.content":  "S'ha eliminat correctament el logotip de la col·lecció.",
+
+  // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
+  "collection.edit.logo.notifications.delete.error.title":  "Error en eliminar el logotip",
+
+  // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
+  "collection.edit.logo.upload":  "Deixeu anar un logotip de col·lecció per carregar-lo",
+
+
+
+  // "collection.edit.notifications.success": "Successfully edited the Collection",
+  "collection.edit.notifications.success":  "Col·lecció editada amb èxit",
+
+  // "collection.edit.return": "Back",
+  "collection.edit.return":  "Enrere",
+
+
+
+  // "collection.edit.tabs.curate.head": "Curate",
+  "collection.edit.tabs.curate.head":  "Curar",
+
+  // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
+  "collection.edit.tabs.curate.title":  "Edició de col·lecció - Curar",
+
+  // "collection.edit.tabs.authorizations.head": "Authorizations",
+  "collection.edit.tabs.authorizations.head":  "Autoritzacions",
+
+  // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
+  "collection.edit.tabs.authorizations.title":  "Edició de col·lecció: autoritzacions",
+
+  // "collection.edit.item.authorizations.load-bundle-button": "Load more bundles",
+  "collection.edit.item.authorizations.load-bundle-button":  "Carregar més paquets",
+
+  // "collection.edit.item.authorizations.load-more-button": "Load more",
+  "collection.edit.item.authorizations.load-more-button":  "Carregar més",
+
+  // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
+  "collection.edit.item.authorizations.show-bitstreams-button":  "Mostrar les autoritzacions dels fitxers del paquet",
+
+  // "collection.edit.tabs.metadata.head": "Edit Metadata",
+  "collection.edit.tabs.metadata.head":  "Editar metadades",
+
+  // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
+  "collection.edit.tabs.metadata.title":  "Edició de col·lecció: metadades",
+
+  // "collection.edit.tabs.roles.head": "Assign Roles",
+  "collection.edit.tabs.roles.head":  "Assignar rols",
+
+  // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
+  "collection.edit.tabs.roles.title":  "Edició de col·lecció - Rols",
+
+  // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
+  "collection.edit.tabs.source.external":  "Aquesta col·lecció recull el contingut d'una font externa",
+
+  // "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":  "Heu de proporcionar el set-ID de la col·lecció de destinació.",
+
+  // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
+  "collection.edit.tabs.source.form.harvestType":  "Contingut que s'està recol·lectant",
+
+  // "collection.edit.tabs.source.form.head": "Configure an external source",
+  "collection.edit.tabs.source.form.head":  "Configura una font externa",
+
+  // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
+  "collection.edit.tabs.source.form.metadataConfigId":  "Format de metadades",
+
+  // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
+  "collection.edit.tabs.source.form.oaiSetId":  "ID de set específic d'OAI",
+
+  // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
+  "collection.edit.tabs.source.form.oaiSource":  "Proveïdor 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":  "Recollir metadades i fitxers (requereix suport 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":  "Recollir metadades i referències a fitxers (requereix suport ORE)",
+
+  // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY":  "Recollir només metadades",
+
+  // "collection.edit.tabs.source.head": "Content Source",
+  "collection.edit.tabs.source.head":  "Origen del contingut",
+
+  // "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":  "Els teus canvis han sigut descartats. Per recuperar-los, premeu el botó 'Desfer'",
+
+  // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded",
+  "collection.edit.tabs.source.notifications.discarded.title":  "Canvis descartats",
+
+  // "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":  "Els canvis no s'han desat. Assegureu-vos que tots els camps siguin vàlids abans de desar.",
+
+  // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
+  "collection.edit.tabs.source.notifications.invalid.title":  "Metadades invàlides",
+
+  // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
+  "collection.edit.tabs.source.notifications.saved.content":  "S'han desat els canvis a la font de contingut d'aquesta col·lecció.",
+
+  // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
+  "collection.edit.tabs.source.notifications.saved.title":  "Font de contingut desat",
+
+  // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
+  "collection.edit.tabs.source.title":  "Edició de col·lecció: font de contingut",
+
+
+
+  // "collection.edit.template.add-button": "Add",
+  "collection.edit.template.add-button":  "Afegir",
+
+  // "collection.edit.template.breadcrumbs": "Item template",
+  "collection.edit.template.breadcrumbs":  "Plantilla d'ítem",
+
+  // "collection.edit.template.cancel": "Cancel",
+  "collection.edit.template.cancel":  "Cancel·lar",
+
+  // "collection.edit.template.delete-button": "Delete",
+  "collection.edit.template.delete-button":  "Esborrar",
+
+  // "collection.edit.template.edit-button": "Edit",
+  "collection.edit.template.edit-button":  "Editar",
+
+  // "collection.edit.template.error": "An error occurred retrieving the template item",
+  "collection.edit.template.error":  "S'ha produït un error en recuperar la plantilla de l'ítem.",
+
+  // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
+  "collection.edit.template.head":  "Editar plantilla de l'ítem per a la col·lecció \"{{ collection }}\"",
+
+  // "collection.edit.template.label": "Template item",
+  "collection.edit.template.label":  "Plantilla d'ítem",
+
+  // "collection.edit.template.loading": "Loading template item...",
+  "collection.edit.template.loading":  "Carregant plantilla d'ítem...",
+
+  // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
+  "collection.edit.template.notifications.delete.error":  "No s'ha pogut suprimir la plantilla d'ítem.",
+
+  // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
+  "collection.edit.template.notifications.delete.success":  "S'ha eliminat correctament la plantilla d'ítem.",
+
+  // "collection.edit.template.title": "Edit Template Item",
+  "collection.edit.template.title":  "Editar plantilla d'ítem",
+
+
+
+  // "collection.form.abstract": "Short Description",
+  "collection.form.abstract":  "Breu descripció",
+
+  // "collection.form.description": "Introductory text (HTML)",
+  "collection.form.description":  "Text introductori (HTML)",
+
+  // "collection.form.errors.title.required": "Please enter a collection name",
+  "collection.form.errors.title.required":  "Introduïu un nom de col·lecció",
+
+  // "collection.form.license": "License",
+  "collection.form.license":  "Llicència",
+
+  // "collection.form.provenance": "Provenance",
+  "collection.form.provenance":  "Procedència",
+
+  // "collection.form.rights": "Copyright text (HTML)",
+  "collection.form.rights":  "Text de copyright (HTML)",
+
+  // "collection.form.tableofcontents": "News (HTML)",
+  "collection.form.tableofcontents":  "Notícies (HTML)",
+
+  // "collection.form.title": "Name",
+  "collection.form.title":  "Nom",
+
+  // "collection.form.entityType": "Entity Type",
+  "collection.form.entityType":  "Tipus d'Entitat",
+
+
+
+  // "collection.listelement.badge": "Collection",
+  "collection.listelement.badge":  "Col·lecció",
+
+
+
+  // "collection.page.browse.recent.head": "Recent Submissions",
+  "collection.page.browse.recent.head":  "Enviaments recents",
+
+  // "collection.page.browse.recent.empty": "No items to show",
+  "collection.page.browse.recent.empty":  "No hi ha elements per mostrar",
+
+  // "collection.page.edit": "Edit this collection",
+  "collection.page.edit":  "Editar aquesta col·lecció",
+
+  // "collection.page.handle": "Permanent URI for this collection",
+  "collection.page.handle":  "URI permanent per a aquesta col·lecció",
+
+  // "collection.page.license": "License",
+  "collection.page.license":  "Llicència",
+
+  // "collection.page.news": "News",
+  "collection.page.news":  "Notícies",
+
+
+
+  // "collection.select.confirm": "Confirm selected",
+  "collection.select.confirm":  "Confirmar selecció",
+
+  // "collection.select.empty": "No collections to show",
+  "collection.select.empty":  "No hi ha col·leccions per mostrar",
+
+  // "collection.select.table.title": "Title",
+  "collection.select.table.title":  "Títol",
+
+
+  // "collection.source.controls.head": "Harvest Controls",
+  "collection.source.controls.head":  "Controls de recol·lecció",
+  // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
+  "collection.source.controls.test.submit.error":  "Hi ha hagut errors en realitzar les proves de comprovació de la configuració",
+  // "collection.source.controls.test.failed": "The script to test the settings has failed",
+  "collection.source.controls.test.failed":  "La prova de la configuració ha fallat",
+  // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
+  "collection.source.controls.test.completed":  "L'script de prova de la configuració s'ha acabat correctament",
+  // "collection.source.controls.test.submit": "Test configuration",
+  "collection.source.controls.test.submit":  "Proveu la configuració",
+  // "collection.source.controls.test.running": "Testing configuration...",
+  "collection.source.controls.test.running":  "Provant la configuració...",
+  // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
+  "collection.source.controls.import.submit.success":  "La importació ha començat correctament",
+  // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
+  "collection.source.controls.import.submit.error":  "Hi ha hagut alguna errada en iniciar la importació",
+  // "collection.source.controls.import.submit": "Import now",
+  "collection.source.controls.import.submit":  "Importa ara",
+  // "collection.source.controls.import.running": "Importing...",
+  "collection.source.controls.import.running":  "Important...",
+  // "collection.source.controls.import.failed": "An error occurred during the import",
+  "collection.source.controls.import.failed":  "S'ha produït un error durant la importació",
+  // "collection.source.controls.import.completed": "The import completed",
+  "collection.source.controls.import.completed":  "La importació ha finalitzat",
+  // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
+  "collection.source.controls.reset.submit.success":  "La restauració i reimportació ha començat correctament",
+  // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
+  "collection.source.controls.reset.submit.error":  "S'ha produït un error en iniciar la restauració i reimportació",
+  // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
+  "collection.source.controls.reset.failed":  "S'ha produït un error en la restauració i reimportació",
+  // "collection.source.controls.reset.completed": "The reset and reimport completed",
+  "collection.source.controls.reset.completed":  "Restauració i reimportació finalitzades",
+  // "collection.source.controls.reset.submit": "Reset and reimport",
+  "collection.source.controls.reset.submit":  "Restauració i reimportació",
+  // "collection.source.controls.reset.running": "Resetting and reimporting...",
+  "collection.source.controls.reset.running":  "Restaurant i reimportant...",
+  // "collection.source.controls.harvest.status": "Harvest status:",
+  "collection.source.controls.harvest.status":  "Estat de la Recol·lecció:",
+  // "collection.source.controls.harvest.start": "Harvest start time:",
+  "collection.source.controls.harvest.start":  "Inici de la recol·lecció:",
+  // "collection.source.controls.harvest.last": "Last time harvested:",
+  "collection.source.controls.harvest.last":  "Data de la darrera recol·lecció:",
+  // "collection.source.controls.harvest.message": "Harvest info:",
+  "collection.source.controls.harvest.message":  "Informació de recol·lecció:",
+  // "collection.source.controls.harvest.no-information": "N/A",
+  "collection.source.controls.harvest.no-information":  "N/A",
+
+
+  // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
+  "collection.source.update.notifications.error.content":  "La configuració proporcionada s'ha provat i no ha funcionat.",
+
+  // "collection.source.update.notifications.error.title": "Server Error",
+  "collection.source.update.notifications.error.title":  "Error del servidor",
+
+
+
+  // "communityList.breadcrumbs": "Community List",
+  "communityList.breadcrumbs":  "Llista de comunitats",
+
+  // "communityList.tabTitle": "Community List",
+  "communityList.tabTitle":  "Llista de comunitats",
+
+  // "communityList.title": "List of Communities",
+  "communityList.title":  "Llista de comunitats",
+
+  // "communityList.showMore": "Show More",
+  "communityList.showMore":  "Mostrar més",
+
+
+
+  // "community.create.head": "Create a Community",
+  "community.create.head":  "Crear una comunitat",
+
+  // "community.create.notifications.success": "Successfully created the Community",
+  "community.create.notifications.success":  "Comunitat creada amb èxit",
+
+  // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
+  "community.create.sub-head":  "Crear una subcomunitat per a la comunitat {{ parent }}",
+
+  // "community.curate.header": "Curate Community: {{community}}",
+  "community.curate.header":  "Curar comunitat: {{ community }}",
+
+  // "community.delete.cancel": "Cancel",
+  "community.delete.cancel":  "Cancel·lar",
+
+  // "community.delete.confirm": "Confirm",
+  "community.delete.confirm":  "Confirmar",
+
+  // "community.delete.processing": "Deleting...",
+  "community.delete.processing":  "Eliminant...",
+
+  // "community.delete.head": "Delete Community",
+  "community.delete.head":  "Eliminar comunitat",
+
+  // "community.delete.notification.fail": "Community could not be deleted",
+  "community.delete.notification.fail":  "No s'ha pogut eliminar la comunitat",
+
+  // "community.delete.notification.success": "Successfully deleted community",
+  "community.delete.notification.success":  "Comunitat eliminada amb èxit",
+
+  // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
+  "community.delete.text":  "Esteu segur que voleu suprimir la comunitat \"{{ dso }}\"?",
+
+  // "community.edit.delete": "Delete this community",
+  "community.edit.delete":  "Eliminar aquesta comunitat",
+
+  // "community.edit.head": "Edit Community",
+  "community.edit.head":  "Editar comunitat",
+
+  // "community.edit.breadcrumbs": "Edit Community",
+  "community.edit.breadcrumbs":  "Editar comunitat",
+
+
+  // "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":  "Desfer eliminació",
+
+  // "community.edit.logo.label": "Community logo",
+  "community.edit.logo.label":  "Logotip de la comunitat",
+
+  // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  "community.edit.logo.notifications.add.error":  "Error en carregar el logotip de la comunitat. Verifiqueu el contingut abans de tornar-ho a provar.",
+
+  // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
+  "community.edit.logo.notifications.add.success":  "Logotip de la comunitat pujat correctament.",
+
+  // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "community.edit.logo.notifications.delete.success.title":  "Logotip eliminat",
+
+  // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
+  "community.edit.logo.notifications.delete.success.content":  "S'ha eliminat correctament el logotip de la comunitat.",
+
+  // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
+  "community.edit.logo.notifications.delete.error.title":  "Error en eliminar el logotip",
+
+  // "community.edit.logo.upload": "Drop a Community Logo to upload",
+  "community.edit.logo.upload":  "Deixeu anar un logotip de la comunitat per carregar",
+
+
+
+  // "community.edit.notifications.success": "Successfully edited the Community",
+  "community.edit.notifications.success":  "Comunitat editada amb èxit",
+
+  // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
+  "community.edit.notifications.unauthorized":  "No tens privilegis per fer aquest canvi",
+
+  // "community.edit.notifications.error": "An error occured while editing the Community",
+  "community.edit.notifications.error":  "S'ha produït un error en editar la comunitat.",
+
+  // "community.edit.return": "Back",
+  "community.edit.return":  "Enrere",
+
+
+
+  // "community.edit.tabs.curate.head": "Curate",
+  "community.edit.tabs.curate.head":  "Curar",
+
+  // "community.edit.tabs.curate.title": "Community Edit - Curate",
+  "community.edit.tabs.curate.title":  "Edició de la comunitat - Curar",
+
+  // "community.edit.tabs.metadata.head": "Edit Metadata",
+  "community.edit.tabs.metadata.head":  "Editar metadades",
+
+  // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
+  "community.edit.tabs.metadata.title":  "Edició de la comunitat: metadades",
+
+  // "community.edit.tabs.roles.head": "Assign Roles",
+  "community.edit.tabs.roles.head":  "Assignar rols",
+
+  // "community.edit.tabs.roles.title": "Community Edit - Roles",
+  "community.edit.tabs.roles.title":  "Edició de la comunitat: funcions",
+
+  // "community.edit.tabs.authorizations.head": "Authorizations",
+  "community.edit.tabs.authorizations.head":  "Autoritzacions",
+
+  // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
+  "community.edit.tabs.authorizations.title":  "Edició de la comunitat: autoritzacions",
+
+
+
+  // "community.listelement.badge": "Community",
+  "community.listelement.badge":  "Comunitat",
+
+
+
+  // "comcol-role.edit.no-group": "None",
+  "comcol-role.edit.no-group":  "Cap",
+
+  // "comcol-role.edit.create": "Create",
+  "comcol-role.edit.create":  "Crear",
+
+  // "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role",
+  "comcol-role.edit.create.error.title":  "Error en crear un grup per al rol '{{ role }}'",
+
+  // "comcol-role.edit.restrict": "Restrict",
+  "comcol-role.edit.restrict":  "Restringir",
+
+  // "comcol-role.edit.delete": "Delete",
+  "comcol-role.edit.delete":  "Esborrar",
+
+  // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
+  "comcol-role.edit.delete.error.title":  "Error en esborrar el grup del rol '{{ role }}'",
+
+
+  // "comcol-role.edit.community-admin.name": "Administrators",
+  "comcol-role.edit.community-admin.name":  "Administradors",
+
+  // "comcol-role.edit.collection-admin.name": "Administrators",
+  "comcol-role.edit.collection-admin.name":  "Administradors",
+
+
+  // "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":  "Els administradors de la comunitat poden crear subcomunitats o col·leccions i gestionar o assignar la gestió per a aquestes subcomunitats o col·leccions. A més, decideixen qui pot enviar ítems a les subcol·leccions, editar les metadades de l'ítem (un cop publicats) i afegir (mapejar) ítems existents d'altres col·leccions (subjecte a autorització).",
+
+  // "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":  "Els administradors de la col·lecció decideixen qui pot enviar ítems a la col·lecció, editar les metadades de l'ítem (un cop publicats) i afegir (mapejar) ítems existents d'altres col·leccions a aquesta col·lecció (subjecte a autorització).",
+
+
+  // "comcol-role.edit.submitters.name": "Submitters",
+  "comcol-role.edit.submitters.name":  "Remitents",
+
+  // "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":  "Els Usuaris i Grups que tenen permís per enviar nous ítems a aquesta col·lecció.",
+
+
+  // "comcol-role.edit.item_read.name": "Default item read access",
+  "comcol-role.edit.item_read.name":  "Accés de lectura predeterminat de l'ítem",
+
+  // "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":  "Usuaris i Grups que poden llegir nous ítems enviats a aquesta col·lecció. Els canvis en aquest rol no són retroactius. Els ítems existents al sistema encara seran visibles per a aquells que tenien accés de lectura en el moment de la seva addició.",
+
+  // "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 per als ítems entrants està configurada actualment com a Anònim.",
+
+
+  // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
+  "comcol-role.edit.bitstream_read.name":  "Accés de lectura per defecte de fitxers",
+
+  // "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":  "Els administradors de la comunitat poden crear subcomunitats o col·leccions i gestionar o assignar la gestió per a aquestes subcomunitats o col·leccions. A més, decideixen qui pot enviar ítems a les subcol·leccions, editar les metadades de l'ítem (un cop publicats) i afegir (mapejar) ítems existents d'altres col·leccions (subjecte a autorització).",
+
+  // "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 per als fitxers entrants s'estableix actualment a Anònim.",
+
+
+  // "comcol-role.edit.editor.name": "Editors",
+  "comcol-role.edit.editor.name":  "Editors",
+
+  // "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":  "Els editors poden editar les metadades dels enviaments entrants i després acceptar-los o rebutjar-los.",
+
+
+  // "comcol-role.edit.finaleditor.name": "Final editors",
+  "comcol-role.edit.finaleditor.name":  "Editors finals",
+
+  // "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":  "Els editors finals poden editar les metadades dels enviaments entrants, però no els poden rebutjar.",
+
+
+  // "comcol-role.edit.reviewer.name": "Reviewers",
+  "comcol-role.edit.reviewer.name":  "Revisors",
+
+  // "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":  "Els revisors poden acceptar o rebutjar enviaments entrants. No obstant això, no poden editar les metadades de l'enviament.",
+
+
+
+  // "community.form.abstract": "Short Description",
+  "community.form.abstract":  "Breu descripció",
+
+  // "community.form.description": "Introductory text (HTML)",
+  "community.form.description":  "Text introductori (HTML)",
+
+  // "community.form.errors.title.required": "Please enter a community name",
+  "community.form.errors.title.required":  "Introduïu un nom de comunitat",
+
+  // "community.form.rights": "Copyright text (HTML)",
+  "community.form.rights":  "Text de copyright (HTML)",
+
+  // "community.form.tableofcontents": "News (HTML)",
+  "community.form.tableofcontents":  "Notícies (HTML)",
+
+  // "community.form.title": "Name",
+  "community.form.title":  "Nom",
+
+  // "community.page.edit": "Edit this community",
+  "community.page.edit":  "Editar aquesta comunitat",
+
+  // "community.page.handle": "Permanent URI for this community",
+  "community.page.handle":  "URI permanent per a aquesta comunitat",
+
+  // "community.page.license": "License",
+  "community.page.license":  "Llicència",
+
+  // "community.page.news": "News",
+  "community.page.news":  "Notícies",
+
+  // "community.all-lists.head": "Subcommunities and Collections",
+  "community.all-lists.head":  "Subcomunitats i col·leccions",
+
+  // "community.sub-collection-list.head": "Collections of this Community",
+  "community.sub-collection-list.head":  "Col·leccions d'aquesta comunitat",
+
+  // "community.sub-community-list.head": "Communities of this Community",
+  "community.sub-community-list.head":  "Comunitats d'aquesta comunitat",
+
+
+
+  // "cookies.consent.accept-all": "Accept all",
+  "cookies.consent.accept-all":  "Acceptar tot",
+
+  // "cookies.consent.accept-selected": "Accept selected",
+  "cookies.consent.accept-selected":  "Acceptar selecció",
+
+  // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
+  "cookies.consent.app.opt-out.description":  "Aquesta aplicació es carrega per defecte (però podeu optar per sortir)",
+
+  // "cookies.consent.app.opt-out.title": "(opt-out)",
+  "cookies.consent.app.opt-out.title":  "(optar per sortir)",
+
+  // "cookies.consent.app.purpose": "purpose",
+  "cookies.consent.app.purpose":  "objectiu",
+
+  // "cookies.consent.app.required.description": "This application is always required",
+  "cookies.consent.app.required.description":  "Aquesta aplicació sempre és necessària",
+
+  // "cookies.consent.app.required.title": "(always required)",
+  "cookies.consent.app.required.title":  "(sempre requerit)",
+
+  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
+  "cookies.consent.app.disable-all.description": "Utilitzeu aquest camp per activar o desactivar tots els serveis.",
+
+  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
+  "cookies.consent.app.disable-all.title": "Activar o desactivar tots els serveis",
+
+  // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
+  "cookies.consent.update":  "Hi ha hagut canvis des de la darrera visita, si us plau, actualitzeu el vostre consentiment.",
+
+  // "cookies.consent.close": "Close",
+  "cookies.consent.close":  "Tancar",
+
+  // "cookies.consent.decline": "Decline",
+  "cookies.consent.decline":  "Declinar",
+
+  // "cookies.consent.ok": "That's ok",
+  "cookies.consent.ok": "D'acord",
+
+  // "cookies.consent.save": "Save",
+  "cookies.consent.save": "Guardar",
+
+  // "cookies.consent.content-notice.title": "Cookie Consent",
+  "cookies.consent.content-notice.title": "Cookie Consent",
+
+  // "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": "Recopilem i processem la vostra informació personal amb les finalitats següents: <strong>Autenticació, Preferències, Reconeixement i Estadístiques</strong>. <br/> Per obtenir més informació, llegiu la nostra {privacyPolicy}.",
+
+  // "cookies.consent.content-notice.description.no-privacy": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>.",
+  "cookies.consent.content-notice.description.no-privacy":  "Recopilem i processem la vostra informació personal per als següents propòsits: <strong>Autenticació, Preferències, Reconeixement i Estadístiques<strong>.",
+
+  // "cookies.consent.content-notice.learnMore": "Customize",
+  "cookies.consent.content-notice.learnMore":  "Personalitzar",
+
+  // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
+  "cookies.consent.content-modal.description":  "Aquí podeu veure i personalitzar la informació que recopilem sobre vostè.",
+
+  // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
+  "cookies.consent.content-modal.privacy-policy.name":  "política de privacitat",
+
+  // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
+  "cookies.consent.content-modal.privacy-policy.text":  "Per a més informació, llegiu si us plau la nostra {privacyPolicy}.",
+
+  // "cookies.consent.content-modal.title": "Information that we collect",
+  "cookies.consent.content-modal.title":  "Informació que recopilem",
+
+  // "cookies.consent.content-modal.services": "services",
+  "cookies.consent.content-modal.services": "serveis",
+
+  // "cookies.consent.content-modal.service": "service",
+  "cookies.consent.content-modal.service": "servei",
+
+  // "cookies.consent.app.title.authentication": "Authentication",
+  "cookies.consent.app.title.authentication":  "Autenticació",
+
+  // "cookies.consent.app.description.authentication": "Required for signing you in",
+  "cookies.consent.app.description.authentication":  "Requerit per iniciar sessió",
+
+
+  // "cookies.consent.app.title.preferences": "Preferences",
+  "cookies.consent.app.title.preferences":  "Preferències",
+
+  // "cookies.consent.app.description.preferences": "Required for saving your preferences",
+  "cookies.consent.app.description.preferences":  "Requerit per desar les vostres preferències",
+
+
+
+  // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
+  "cookies.consent.app.title.acknowledgement":  "Reconeixement",
+
+  // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
+  "cookies.consent.app.description.acknowledgement":  "Requerit per guardar els seus reconeixements i consentiments",
+
+
+
+  // "cookies.consent.app.title.google-analytics": "Google Analytics",
+  "cookies.consent.app.title.google-analytics":  "Google Analytics",
+
+  // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
+  "cookies.consent.app.description.google-analytics":  "Ens permet rastrejar dades estadístiques",
+
+
+
+  // "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
+  "cookies.consent.app.title.google-recaptcha":  "Google reCaptcha",
+
+  // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
+  "cookies.consent.app.description.google-recaptcha":  "Utilitzem el servei google reCAPTCHA durant el registre i la recuperació de contrasenya",
+
+
+  // "cookies.consent.purpose.functional": "Functional",
+  "cookies.consent.purpose.functional":  "Funcional",
+
+  // "cookies.consent.purpose.statistical": "Statistical",
+  "cookies.consent.purpose.statistical":  "Estadístic",
+
+  // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
+  "cookies.consent.purpose.registration-password-recovery":  "Registre i recuperació de contrasenya",
+
+  // "cookies.consent.purpose.sharing": "Sharing",
+  "cookies.consent.purpose.sharing":  "Compartició",
+
+  // "curation-task.task.citationpage.label":  "Generate Citation Page",
+  "curation-task.task.citationpage.label":  "Generar pàgina de cita",
+
+  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
+  "curation-task.task.checklinks.label":  "Comprovar enllaços a metadades",
+
+  // "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":  "Perfil de formats de fitxer",
+
+  // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
+  "curation-task.task.requiredmetadata.label":  "Comprovar les metadades obligatòries",
+
+  // "curation-task.task.translate.label": "Microsoft Translator",
+  "curation-task.task.translate.label":  "Traductor de Microsoft",
+
+  // "curation-task.task.vscan.label": "Virus Scan",
+  "curation-task.task.vscan.label":  "Comprovacio de virus",
+
+  // "curation-task.task.registerdoi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "Registrar DOI",
+
+
+
+  // "curation.form.task-select.label": "Task:",
+  "curation.form.task-select.label":  "Tasca:",
+
+  // "curation.form.submit": "Start",
+  "curation.form.submit":  "Iniciar",
+
+  // "curation.form.submit.success.head": "The curation task has been started successfully",
+  "curation.form.submit.success.head":  "La tasca de curació s'ha iniciat amb èxit.",
+
+  // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
+  "curation.form.submit.success.content":  "Serà redirigit a la pàgina del procés corresponent.",
+
+  // "curation.form.submit.error.head": "Running the curation task failed",
+  "curation.form.submit.error.head":  "Error en executar la tasca de curació",
+
+  // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+  "curation.form.submit.error.content":  "S'ha produït un error en intentar iniciar la tasca de curació.",
+
+  // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
+  "curation.form.submit.error.invalid-handle":  "No s'ha pogut determinar l'handle d'aquest objecte",
+
+  // "curation.form.handle.label": "Handle:",
+  "curation.form.handle.label":  "Handle:",
+
+  // "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
+  "curation.form.handle.hint":  "Suggeriment: Introduïu [el-vostre-prefix-handle]/0 per executar una tasca en tota la instal·lació (no totes les tasques permeten aquesta opció)",
+
+
+
+  // "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":  "Estimat {{ recipientName }},\nEn resposta a la vostra sol·licitud, lamento informar-vos que no és possible enviar-vos una còpia dels fitxers que heu sol·licitat, en relació amb el document: \"{{ itemUrl }}\" ({{ itemName }}), del qual sóc autor.\n\nSalutacions cordials,\n{{ authorName }} <{{ authorEmail }}>",
+
+  // "deny-request-copy.email.subject": "Request copy of document",
+  "deny-request-copy.email.subject":  "Sol·licitar una còpia del document",
+
+  // "deny-request-copy.error": "An error occurred",
+  "deny-request-copy.error":  "S'ha produit un error",
+
+  // "deny-request-copy.header": "Deny document copy request",
+  "deny-request-copy.header":  "Denegar còpia del document",
+
+  // "deny-request-copy.intro": "This message will be sent to the applicant of the request",
+  "deny-request-copy.intro":  "Aquest és el text que serà enviat al sol·licitant.",
+
+  // "deny-request-copy.success": "Successfully denied item request",
+  "deny-request-copy.success":  "Sol·licitud de còpia de document denegada",
+
+
+
+  // "dso.name.untitled": "Untitled",
+  "dso.name.untitled":  "Sense títol",
+
+
+
+  // "dso-selector.create.collection.head": "New collection",
+  "dso-selector.create.collection.head":  "Nova col·lecció",
+
+  // "dso-selector.create.collection.sub-level": "Create a new collection in",
+  "dso-selector.create.collection.sub-level":  "Crea una nova col·lecció a",
+
+  // "dso-selector.create.community.head": "New community",
+  "dso-selector.create.community.head":  "Nova comunitat",
+
+  // "dso-selector.create.community.or-divider": "or",
+  "dso-selector.create.community.or-divider": "o",
+
+  // "dso-selector.create.community.sub-level": "Create a new community in",
+  "dso-selector.create.community.sub-level":  "Crea una nova comunitat a",
+
+  // "dso-selector.create.community.top-level": "Create a new top-level community",
+  "dso-selector.create.community.top-level":  "Crea una nova comunitat de primer nivell",
+
+  // "dso-selector.create.item.head": "New item",
+  "dso-selector.create.item.head":  "Nou ítem",
+
+  // "dso-selector.create.item.sub-level": "Create a new item in",
+  "dso-selector.create.item.sub-level":  "Crea un nou ítem a",
+
+  // "dso-selector.create.submission.head": "New submission",
+  "dso-selector.create.submission.head":  "Nou enviament",
+
+  // "dso-selector.edit.collection.head": "Edit collection",
+  "dso-selector.edit.collection.head":  "Editar col·lecció",
+
+  // "dso-selector.edit.community.head": "Edit community",
+  "dso-selector.edit.community.head":  "Editar comunitat",
+
+  // "dso-selector.edit.item.head": "Edit item",
+  "dso-selector.edit.item.head":  "Editar ítem",
+
+  // "dso-selector.error.title": "An error occurred searching for a {{ type }}",
+  "dso-selector.error.title":  "S'ha produït un error en cercar un {{ type }}",
+
+  // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
+  "dso-selector.export-metadata.dspaceobject.head":  "Exportar metadades des de",
+
+  // "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
+  "dso-selector.export-batch.dspaceobject.head":  "Exportar fitxer per lots (ZIP) des de",
+
+  // "dso-selector.import-batch.dspaceobject.head": "Import batch from",
+  "dso-selector.import-batch.dspaceobject.head":  "Importar fitxer per lots des de",
+
+  // "dso-selector.no-results": "No {{ type }} found",
+  "dso-selector.no-results":  "No s'ha trobat {{ type }}",
+
+  // "dso-selector.placeholder": "Search for a {{ type }}",
+  "dso-selector.placeholder":  "Cerca un/a {{ type }}",
+
+  // "dso-selector.select.collection.head": "Select a collection",
+  "dso-selector.select.collection.head":  "Seleccionar una col·lecció",
+
+  // "dso-selector.set-scope.community.head": "Select a search scope",
+  "dso-selector.set-scope.community.head":  "Seleccionar un àmbit de cerca",
+
+  // "dso-selector.set-scope.community.button": "Search all of DSpace",
+  "dso-selector.set-scope.community.button":  "Cercar a tot DSpace",
+
+  // "dso-selector.set-scope.community.or-divider": "or",
+  "dso-selector.set-scope.community.or-divider": "o",
+
+  // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
+  "dso-selector.set-scope.community.input-header":  "Cerca una comunitat o una col·lecció",
+
+  // "dso-selector.claim.item.head": "Profile tips",
+  "dso-selector.claim.item.head":  "Suggeriments de perfil",
+
+  // "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":  "Hi ha perfils que podrien estar relacionats amb vostè. Si es veu reflectit en un d'ells, seleccioneu-lo i a la pàgina de detalls, escolliu l'opció de reclamar-lo. Opcionalment, podeu crear un nou perfil des de zero amb el botó inferior.",
+
+  // "dso-selector.claim.item.not-mine-label": "None of these are mine",
+  "dso-selector.claim.item.not-mine-label":  "Cap d'aquests és meu",
+
+  // "dso-selector.claim.item.create-from-scratch": "Create a new one",
+  "dso-selector.claim.item.create-from-scratch":  "Crear-ne un de nou",
+
+  // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
+  "dso-selector.results-could-not-be-retrieved": "S'ha produït un error, si us plau, actualitzeu de nou ↻",
+
+  // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
+  "confirmation-modal.export-metadata.header":  "Exporta metadades per a {{ dsoName }}",
+
+  // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
+  "confirmation-modal.export-metadata.info":  "Esteu segur que voleu exportar metadades per a {{ dsoName }}?",
+
+  // "confirmation-modal.export-metadata.cancel": "Cancel",
+  "confirmation-modal.export-metadata.cancel":  "Cancel·lar",
+
+  // "confirmation-modal.export-metadata.confirm": "Export",
+  "confirmation-modal.export-metadata.confirm":  "Exporta",
+
+  // "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.header":  "Exportar fitxer per lots (ZIP) per a {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.info":  "Esteu segur que voleu exportar un fitxer per lots (ZIP) per a {{ dsoName }}?",
+
+  // "confirmation-modal.export-batch.cancel": "Cancel",
+  "confirmation-modal.export-batch.cancel":  "Cancel·lar",
+
+  // "confirmation-modal.export-batch.confirm": "Export",
+  "confirmation-modal.export-batch.confirm":  "Exportar",
+
+  // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.header":  "Esborrar usuari \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info":  "Esteu segur que voleu eliminar l'usuari \"{{ dsoName }}\"?",
+
+  // "confirmation-modal.delete-eperson.cancel": "Cancel",
+  "confirmation-modal.delete-eperson.cancel":  "Cancel·lar",
+
+  // "confirmation-modal.delete-eperson.confirm": "Delete",
+  "confirmation-modal.delete-eperson.confirm":  "Esborrar",
+
+  // "confirmation-modal.delete-profile.header": "Delete Profile",
+  "confirmation-modal.delete-profile.header":  "Esborrar Perfil",
+
+  // "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile",
+  "confirmation-modal.delete-profile.info":  "Esteu segur que voleu suprimir el vostre perfil?",
+
+  // "confirmation-modal.delete-profile.cancel": "Cancel",
+  "confirmation-modal.delete-profile.cancel":  "Cancel·lar",
+
+  // "confirmation-modal.delete-profile.confirm": "Delete",
+  "confirmation-modal.delete-profile.confirm":  "Esborrar",
+
+
+  // "error.bitstream": "Error fetching bitstream",
+  "error.bitstream":  "Error en obtenir el fitxer",
+
+  // "error.browse-by": "Error fetching items",
+  "error.browse-by":  "Error en recuperar ítems",
+
+  // "error.collection": "Error fetching collection",
+  "error.collection":  "Error en recuperar la col·lecció",
+
+  // "error.collections": "Error fetching collections",
+  "error.collections":  "Error en recuperar col·leccions",
+
+  // "error.community": "Error fetching community",
+  "error.community":  "Error en recuperar la comunitat",
+
+  // "error.identifier": "No item found for the identifier",
+  "error.identifier":  "No s'ha trobat cap ítem amb aquest identificador",
+
+  // "error.default": "Error",
+  "error.default":  "Error",
+
+  // "error.item": "Error fetching item",
+  "error.item":  "Error en recuperar l'ítem",
+
+  // "error.items": "Error fetching items",
+  "error.items":  "Error en recuperar ítems",
+
+  // "error.objects": "Error fetching objects",
+  "error.objects":  "Error en recuperar objectes",
+
+  // "error.recent-submissions": "Error fetching recent submissions",
+  "error.recent-submissions":  "Error en recuperar els enviaments recents",
+
+  // "error.search-results": "Error fetching search results",
+  "error.search-results":  "Error en recuperar els resultats de cerca",
+
+  // "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 cerca no és vàlida. Reviseu a <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">la sintaxi de cerques Solr</a> per a més informació sobre aquest error.",
+
+  // "error.sub-collections": "Error fetching sub-collections",
+  "error.sub-collections":  "Error en recuperar subcol·leccions",
+
+  // "error.sub-communities": "Error fetching sub-communities",
+  "error.sub-communities":  "Error en recuperar subcomunitats",
+
+  // "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": "S'ha produït un error durant la inicialització de la secció. Comproveu la configuració del formulari d'entrada. Els detalls es mostren a continuació: <br> <br>",
+
+  // "error.top-level-communities": "Error fetching top-level communities",
+  "error.top-level-communities":  "Error en recuperar les comunitats de primer nivell",
+
+  // "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":  "Ha de concedir aquesta llicència de dipòsit per completar l'enviament. Si no podeu concedir aquesta llicència en aquest moment, podeu desar el vostre treball i tornar més tard o bé eliminar l'enviament.",
+
+  // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
+  "error.validation.pattern":  "Aquest camp d'entrada està restringit per aquest patró: {{ pattern }}.",
+
+  // "error.validation.filerequired": "The file upload is mandatory",
+  "error.validation.filerequired":  "La càrrega d'un fitxer és obligatòria",
+
+  // "error.validation.required": "This field is required",
+  "error.validation.required":  "Aquest camp es obligatori",
+
+  // "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  "error.validation.NotValidEmail":  "Aquest no és un correu electrònic vàlid",
+
+  // "error.validation.emailTaken": "This E-mail is already taken",
+  "error.validation.emailTaken":  "Aquest correu electrònic ja està en ús",
+
+  // "error.validation.groupExists": "This group already exists",
+  "error.validation.groupExists":  "Aquest grup ja existeix",
+
+
+  // "feed.description": "Syndication feed",
+  "feed.description":  "Fil de sindicació",
+
+
+  // "file-section.error.header": "Error obtaining files for this item",
+  "file-section.error.header":  "Error en obtenir els fitxers per a aquest ítem",
+
+
+
+  // "footer.copyright": "copyright © 2002-{{ year }}",
+  "footer.copyright":  "copyright © 2002-{{ year }}",
+
+  // "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ó de cookies",
+
+  // "footer.link.privacy-policy": "Privacy policy",
+  "footer.link.privacy-policy":  "Política de privadesa",
+
+  // "footer.link.end-user-agreement":"End User Agreement",
+  "footer.link.end-user-agreement":  "Acord d'usuari final",
+
+  // "footer.link.feedback":"Send Feedback",
+  "footer.link.feedback":  "Enviar Suggeriments",
+
+
+
+  // "forgot-email.form.header": "Forgot Password",
+  "forgot-email.form.header":  "Oblit de contrasenya",
+
+  // "forgot-email.form.info": "Enter the email address associated with the account.",
+  "forgot-email.form.info":  "Introduïu l'adreça de correu electrònic que vau proporcionar al registrar-vos.",
+
+  // "forgot-email.form.email": "Email Address *",
+  "forgot-email.form.email":  "Adreça de correu electrònic *",
+
+  // "forgot-email.form.email.error.required": "Please fill in an email address",
+  "forgot-email.form.email.error.required":  "Si us plau introduïu una adreça de correu electrònic",
+
+  // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
+  "forgot-email.form.email.error.pattern":  "Si us plau introduïu una adreça de correu electrònic vàlida",
+
+  // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
+  "forgot-email.form.email.hint":  "Se us enviarà un missatge a aquesta adreça amb les instruccions pertinents.",
+
+  // "forgot-email.form.submit": "Reset password",
+  "forgot-email.form.submit":  "Restablir contrasenya",
+
+  // "forgot-email.form.success.head": "Password reset email sent",
+  "forgot-email.form.success.head":  "S'ha enviat el missatge de restabliment de contrasenya",
+
+  // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "forgot-email.form.success.content":  "S'ha enviat un correu a {{ email }} que conté una URL especial i instruccions addicionals.",
+
+  // "forgot-email.form.error.head": "Error when trying to reset password",
+  "forgot-email.form.error.head":  "Error en intentar restablir la contrasenya",
+
+  // "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":  "S'ha produït un error intentant restablir la contrasenya del compte associat al correu electrònic: {{ email }}",
+
+
+
+  // "forgot-password.title": "Forgot Password",
+  "forgot-password.title":  "Oblit de contrasenya",
+
+  // "forgot-password.form.head": "Forgot Password",
+  "forgot-password.form.head":  "Oblit de contrasenya",
+
+  // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box.",
+  "forgot-password.form.info":  "Introduïu una nova contrasenya al camp a continuació i confirmeu-la reescrivint-la al segon camp.",
+
+  // "forgot-password.form.card.security": "Security",
+  "forgot-password.form.card.security":  "Seguretat",
+
+  // "forgot-password.form.identification.header": "Identify",
+  "forgot-password.form.identification.header":  "Identitat",
+
+  // "forgot-password.form.identification.email": "Email address: ",
+  "forgot-password.form.identification.email":  "Adreça de correu electrònic: ",
+
+  // "forgot-password.form.label.password": "Password",
+  "forgot-password.form.label.password":  "Contrasenya",
+
+  // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
+  "forgot-password.form.label.passwordrepeat":  "Reescriviu per confirmar",
+
+  // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+  "forgot-password.form.error.empty-password":  "Introduïu una contrasenya al cap a continuació.",
+
+  // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
+  "forgot-password.form.error.matching-passwords":  "Les contrasenyes no coincideixen.",
+
+  // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
+  "forgot-password.form.notification.error.title":  "Error en intentar enviar una contrasenya nova",
+
+  // "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 restabliment de la contrasenya ha sigut exitós. Heu iniciat sessió com a l'usuari creat.",
+
+  // "forgot-password.form.notification.success.title": "Password reset completed",
+  "forgot-password.form.notification.success.title":  "S'ha completat el restabliment de la contrasenya",
+
+  // "forgot-password.form.submit": "Submit password",
+  "forgot-password.form.submit":  "Envia contrasenya",
+
+
+  // "form.add": "Add more",
+  "form.add":  "Afegir més",
+
+  // "form.add-help": "Click here to add the current entry and to add another one",
+  "form.add-help":  "Feu clic aquí per afegir l'entrada actual i per afegir-ne una altra",
+
+  // "form.cancel": "Cancel",
+  "form.cancel":  "Cancel·lar",
+
+  // "form.clear": "Clear",
+  "form.clear":  "Netejar",
+
+  // "form.clear-help": "Click here to remove the selected value",
+  "form.clear-help":  "Feu clic aquí per eliminar el valor seleccionat",
+
+  // "form.discard": "Discard",
+  "form.discard":  "Descartar",
+
+  // "form.drag": "Drag",
+  "form.drag":  "Arrossegar",
+
+  // "form.edit": "Edit",
+  "form.edit":  "Editar",
+
+  // "form.edit-help": "Click here to edit the selected value",
+  "form.edit-help":  "Feu clic aquí per editar el valor seleccionat",
+
+  // "form.first-name": "First name",
+  "form.first-name":  "Nom",
+
+  // "form.group-collapse": "Collapse",
+  "form.group-collapse":  "Contraure",
+
+  // "form.group-collapse-help": "Click here to collapse",
+  "form.group-collapse-help":  "Feu clic aquí per contraure",
+
+  // "form.group-expand": "Expand",
+  "form.group-expand":  "Expandir",
+
+  // "form.group-expand-help": "Click here to expand and add more elements",
+  "form.group-expand-help":  "Feu clic aquí per expandir i afegir més elements",
+
+  // "form.last-name": "Last name",
+  "form.last-name":  "Cognoms",
+
+  // "form.loading": "Loading...",
+  "form.loading":  "Carregant...",
+
+  // "form.lookup": "Lookup",
+  "form.lookup":  "Cercar",
+
+  // "form.lookup-help": "Click here to look up an existing relation",
+  "form.lookup-help":  "Feu clic aquí per cercar una relació existent",
+
+  // "form.no-results": "No results found",
+  "form.no-results":  "No s'han trobat resultats",
+
+  // "form.no-value": "No value entered",
+  "form.no-value":  "No s'ha introduït cap valor",
+
+  // "form.other-information": {},
+  "form.other-information":  {},
+
+  // "form.remove": "Remove",
+  "form.remove":  "Eliminar",
+
+  // "form.save": "Save",
+  "form.save":  "Guardar",
+
+  // "form.save-help": "Save changes",
+  "form.save-help":  "Desa els canvis",
+
+  // "form.search": "Search",
+  "form.search":  "Cercar",
+
+  // "form.search-help": "Click here to look for an existing correspondence",
+  "form.search-help":  "Feu clic aquí per cercar una correspondència existent",
+
+  // "form.submit": "Save",
+  "form.submit":  "Guardar",
+
+  // "form.repeatable.sort.tip": "Drop the item in the new position",
+  "form.repeatable.sort.tip":  "Deixeu anar l'ítem a la nova posició",
+
+
+
+  // "grant-deny-request-copy.deny": "Don't send copy",
+  "grant-deny-request-copy.deny":  "No envieu còpia",
+
+  // "grant-deny-request-copy.email.back": "Back",
+  "grant-deny-request-copy.email.back":  "Enrere",
+
+  // "grant-deny-request-copy.email.message": "Message",
+  "grant-deny-request-copy.email.message":  "Missatge",
+
+  // "grant-deny-request-copy.email.message.empty": "Please enter a message",
+  "grant-deny-request-copy.email.message.empty":  "Si us plau, introduïu un missatge",
+
+  // "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": "Podeu aprofitar aquesta ocasió per reconsiderar les restriccions d'accés del document, per evitar haver de respondre a aquestes sol·licituds. Si voleu demanar als administradors del dipòsit que eliminen aquestes restriccions, marqueu la casella següent.",
+
+  // "grant-deny-request-copy.email.permissions.label": "Change to open access",
+  "grant-deny-request-copy.email.permissions.label":  "Canvi a Accés Obert",
+
+  // "grant-deny-request-copy.email.send": "Send",
+  "grant-deny-request-copy.email.send":  "Enviar",
+
+  // "grant-deny-request-copy.email.subject": "Subject",
+  "grant-deny-request-copy.email.subject":  "Assumpte",
+
+  // "grant-deny-request-copy.email.subject.empty": "Please enter a subject",
+  "grant-deny-request-copy.email.subject.empty":  "Si us plau, introduïu un assumpte",
+
+  // "grant-deny-request-copy.grant": "Send copy",
+  "grant-deny-request-copy.grant":  "Enviar còpia",
+
+  // "grant-deny-request-copy.header": "Document copy request",
+  "grant-deny-request-copy.header":  "Sol·licitud de còpia de document",
+
+  // "grant-deny-request-copy.home-page": "Take me to the home page",
+  "grant-deny-request-copy.home-page":  "Porta'm a la pàgina d'inici",
+
+  // "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 sou un dels autors del document <a href='{{ url }}'>{{ name }}</a>, utilitzeu els botons inferiors per respondre la sol·licitud de l'usuari",
+
+  // "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":  "Després de triar una opció, us suggerirem un text de correu electrònic que podeu editar.",
+
+  // "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":  "Aquesta sol·licitud ja ha estat processada. Podeu utilitzar els botons inferiors per tornar a la pàgina inicial",
+
+
+
+  // "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":  "Estimat {{ recipientName }},\nResponent a la vostra sol·licitud, us envio annexada una còpia del fitxer corresponent al document: \"{{ itemUrl }}\" ({{ itemName }} .\n\nUna cordial salutació,\n{{ authorName }} <{{ authorEmail }}>",
+
+  // "grant-request-copy.email.subject": "Request copy of document",
+  "grant-request-copy.email.subject":  "Sol·licitar còpia de document",
+
+  // "grant-request-copy.error": "An error occurred",
+  "grant-request-copy.error":  "S'ha produït un error",
+
+  // "grant-request-copy.header": "Grant document copy request",
+  "grant-request-copy.header":  "Concedir sol·licitud de còpia de document",
+
+  // "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":  "Aquest missatge s'enviarà al sol·licitant de la còpia. Se us annexarà una còpia del document.",
+
+  // "grant-request-copy.success": "Successfully granted item request",
+  "grant-request-copy.success":  "Sol·licitud d'ítem concedida amb èxit",
+
+
+  // "health.breadcrumbs": "Health",
+  "health.breadcrumbs":  "Revisió de salut",
+
+  // "health-page.heading" : "Health",
+  "health-page.heading":  "Revisió de salut",
+
+  // "health-page.info-tab" : "Info",
+  "health-page.info-tab":  "Informació",
+
+  // "health-page.status-tab" : "Status",
+  "health-page.status-tab":  "Estat",
+
+  // "health-page.error.msg": "The health check service is temporarily unavailable",
+  "health-page.error.msg":  "El servei de comprovació de salud no està temporalment disponible",
+
+  // "health-page.property.status": "Status code",
+  "health-page.property.status":  "Codi d'estat",
+
+  // "health-page.section.db.title": "Database",
+  "health-page.section.db.title":  "Database",
+
+  // "health-page.section.geoIp.title": "GeoIp",
+  "health-page.section.geoIp.title":  "GeoIp",
+
+  // "health-page.section.solrAuthorityCore.title": "Solr: authority core",
+  "health-page.section.solrAuthorityCore.title":  "Solr: authority core",
+
+  // "health-page.section.solrOaiCore.title": "Solr: oai core",
+  "health-page.section.solrOaiCore.title":  "Solr: oai core",
+
+  // "health-page.section.solrSearchCore.title": "Solr: search core",
+  "health-page.section.solrSearchCore.title":  "Solr: search core",
+
+  // "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
+  "health-page.section.solrStatisticsCore.title":  "Solr: statistics core",
+
+  // "health-page.section-info.app.title": "Application Backend",
+  "health-page.section-info.app.title":  "Backend de l'aplicació",
+
+  // "health-page.section-info.java.title": "Java",
+  "health-page.section-info.java.title":  "Java",
+
+  // "health-page.status": "Status",
+  "health-page.status":  "Estat",
+
+  // "health-page.status.ok.info": "Operational",
+  "health-page.status.ok.info":  "Operatiu",
+
+  // "health-page.status.error.info": "Problems detected",
+  "health-page.status.error.info":  "Problemes detectats",
+
+  // "health-page.status.warning.info": "Possible issues detected",
+  "health-page.status.warning.info":  "Detectats problemes potencials",
+
+  // "health-page.title": "Health",
+  "health-page.title":  "Revisió de salut",
+
+  // "health-page.section.no-issues": "No issues detected",
+  "health-page.section.no-issues":  "No s'han detectat problemes",
+
+
+  // "home.description": "",
+  "home.description":  "",
+
+  // "home.breadcrumbs": "Home",
+  "home.breadcrumbs":  "Inici",
+
+  // "home.search-form.placeholder": "Search the repository ...",
+  "home.search-form.placeholder":  "Cerca al repositori ...",
+
+  // "home.title": "Home",
+  "home.title":  "Inici",
+
+  // "home.top-level-communities.head": "Communities in DSpace",
+  "home.top-level-communities.head":  "Comunitats a DSpace",
+
+  // "home.top-level-communities.help": "Select a community to browse its collections.",
+  "home.top-level-communities.help":  "Seleccioneu una comunitat per explorar les seves col·leccions.",
+
+
+
+  // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
+  "info.end-user-agreement.accept":  "He llegit i accepto l'Acord d'usuari final.",
+
+  // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
+  "info.end-user-agreement.accept.error":  "S'ha produït un error en acceptar l'Acord d'usuari final.",
+
+  // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
+  "info.end-user-agreement.accept.success":  "S'ha actualitzat correctament l'Acord d'usuari final.",
+
+  // "info.end-user-agreement.breadcrumbs": "End User Agreement",
+  "info.end-user-agreement.breadcrumbs":  "Acord d'usuari final",
+
+  // "info.end-user-agreement.buttons.cancel": "Cancel",
+  "info.end-user-agreement.buttons.cancel":  "Cancel·lar",
+
+  // "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":  "Acord d'usuari final",
+
+  // "info.end-user-agreement.title": "End User Agreement",
+  "info.end-user-agreement.title":  "Acord d'usuari final",
+
+  // "info.privacy.breadcrumbs": "Privacy Statement",
+  "info.privacy.breadcrumbs":  "Declaració de privadesa",
+
+  // "info.privacy.head": "Privacy Statement",
+  "info.privacy.head":  "Declaració de privadesa",
+
+  // "info.privacy.title": "Privacy Statement",
+  "info.privacy.title":  "Declaració de privadesa",
+
+  // "info.feedback.breadcrumbs": "Feedback",
+  "info.feedback.breadcrumbs":  "Suggeriments",
+
+  // "info.feedback.head": "Feedback",
+  "info.feedback.head":  "Suggeriments",
+
+  // "info.feedback.title": "Feedback",
+  "info.feedback.title":  "Suggeriments",
+
+  // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
+  "info.feedback.info":  "Gràcies per compartir els vostres suggeriments sobre el repositori. Tindrem en compte els vostres comentaris!",
+
+  // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+  "info.feedback.email_help":  "Aquesta adreça s'utilitzarà per al seguiment del vostre suggeriment.",
+
+  // "info.feedback.send": "Send Feedback",
+  "info.feedback.send":  "Enviar suggeriment",
+
+  // "info.feedback.comments": "Comments",
+  "info.feedback.comments":  "Comentaris",
+
+  // "info.feedback.email-label": "Your Email",
+  "info.feedback.email-label":  "El vostre correu electrònic",
+
+  // "info.feedback.create.success" : "Feedback Sent Successfully!",
+  "info.feedback.create.success":  "Enviament exitós de suggeriment",
+
+  // "info.feedback.error.email.required" : "A valid email address is required",
+  "info.feedback.error.email.required":  "es requereix una adreça vàlida de correu electrònic",
+
+  // "info.feedback.error.message.required" : "A comment is required",
+  "info.feedback.error.message.required":  "Es requereix un comentari",
+
+  // "info.feedback.page-label" : "Page",
+  "info.feedback.page-label":  "Pàgina",
+
+  // "info.feedback.page_help" : "Tha page related to your feedback",
+  "info.feedback.page_help":  "La pàgina relacionada amb el vostre suggeriment",
+
+
+
+  // "item.alerts.private": "This item is non-discoverable",
+  "item.alerts.private":  "Aquest ítem és privat",
+
+  // "item.alerts.withdrawn": "This item has been withdrawn",
+  "item.alerts.withdrawn":  "Aquest ítem ha estat retirat",
+
+
+
+  // "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":  "Amb aquest editor pot veure i modificar les polítiques d'un ítem, a més de modificar les polítiques dels components individuals de l'ítem: paquets i fitxers. Breument, un ítem és un contenidor de paquets i els paquets són contenidors d'arxius. Els contenidors solen tenir polítiques AFEGIR/ELIMINAR/LLEGIR/ESCRIURE, mentre que els fitxers només tenen polítiques LLEGIR/ESCRIURE.",
+
+  // "item.edit.authorizations.title": "Edit item's Policies",
+  "item.edit.authorizations.title":  "Editar les polítiques de l'ítem",
+
+
+
+  // "item.badge.private": "Non-discoverable",
+  "item.badge.private":  "Privat",
+
+  // "item.badge.withdrawn": "Withdrawn",
+  "item.badge.withdrawn":  "Retirat",
+
+
+
+  // "item.bitstreams.upload.bundle": "Bundle",
+  "item.bitstreams.upload.bundle":  "Paquet",
+
+  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle or input new bundle name",
+  "item.bitstreams.upload.bundle.placeholder":  "Seleccioneu un paquet o introduïu un nou nom de paquet",
+
+  // "item.bitstreams.upload.bundle.new": "Create bundle",
+  "item.bitstreams.upload.bundle.new":  "Crear paquet",
+
+  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+  "item.bitstreams.upload.bundles.empty":  "Aquest ítem no conté cap paquet per carregar un fitxer.",
+
+  // "item.bitstreams.upload.cancel": "Cancel",
+  "item.bitstreams.upload.cancel":  "Cancel·lar",
+
+  // "item.bitstreams.upload.drop-message": "Drop a file to upload",
+  "item.bitstreams.upload.drop-message":  "Deixeu anar un fitxer per pujar",
+
+  // "item.bitstreams.upload.item": "Item: ",
+  "item.bitstreams.upload.item":  "Ítem: ",
+
+  // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
+  "item.bitstreams.upload.notifications.bundle.created.content":  "Nou paquet creat amb èxit.",
+
+  // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
+  "item.bitstreams.upload.notifications.bundle.created.title":  "Paquet creat",
+
+  // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
+  "item.bitstreams.upload.notifications.upload.failed":  "Pujada fallida. Verifiqueu el contingut abans de tornar-ho a provar.",
+
+  // "item.bitstreams.upload.title": "Upload bitstream",
+  "item.bitstreams.upload.title":  "Pujar fitxer",
+
+
+
+  // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
+  "item.edit.bitstreams.bundle.edit.buttons.upload":  "Pujar",
+
+  // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
+  "item.edit.bitstreams.bundle.displaying":  "Actualment es mostren {{ amount }} fitxers de {{ total }}.",
+
+  // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
+  "item.edit.bitstreams.bundle.load.all":  "Carregar tot ({{ total }})",
+
+  // "item.edit.bitstreams.bundle.load.more": "Load more",
+  "item.edit.bitstreams.bundle.load.more":  "Càrrega més",
+
+  // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
+  "item.edit.bitstreams.bundle.name":  "PAQUET: {{ name }}",
+
+  // "item.edit.bitstreams.discard-button": "Discard",
+  "item.edit.bitstreams.discard-button":  "Descartar",
+
+  // "item.edit.bitstreams.edit.buttons.download": "Download",
+  "item.edit.bitstreams.edit.buttons.download":  "Descarregar",
+
+  // "item.edit.bitstreams.edit.buttons.drag": "Drag",
+  "item.edit.bitstreams.edit.buttons.drag":  "Arrossegar",
+
+  // "item.edit.bitstreams.edit.buttons.edit": "Edit",
+  "item.edit.bitstreams.edit.buttons.edit":  "Editar",
+
+  // "item.edit.bitstreams.edit.buttons.remove": "Remove",
+  "item.edit.bitstreams.edit.buttons.remove":  "Eliminar",
+
+  // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
+  "item.edit.bitstreams.edit.buttons.undo":  "Desfer canvis",
+
+  // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
+  "item.edit.bitstreams.empty":  "Aquest ítem no conté cap fitxer. Feu clic al botó de càrrega per crear-ne un.",
+
+  // "item.edit.bitstreams.headers.actions": "Actions",
+  "item.edit.bitstreams.headers.actions":  "Accions",
+
+  // "item.edit.bitstreams.headers.bundle": "Bundle",
+  "item.edit.bitstreams.headers.bundle":  "Paquet",
+
+  // "item.edit.bitstreams.headers.description": "Description",
+  "item.edit.bitstreams.headers.description":  "Descripció",
+
+  // "item.edit.bitstreams.headers.format": "Format",
+  "item.edit.bitstreams.headers.format":  "Format",
+
+  // "item.edit.bitstreams.headers.name": "Name",
+  "item.edit.bitstreams.headers.name":  "Nom",
+
+  // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.bitstreams.notifications.discarded.content":  "Els teus canvis han sigut descartats. Per restaurar els teus canvis feu clic al botó 'Desfer'",
+
+  // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
+  "item.edit.bitstreams.notifications.discarded.title":  "Canvis descartats",
+
+  // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
+  "item.edit.bitstreams.notifications.move.failed.title":  "Error en moure fitxers",
+
+  // "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":  "S'han desat els canvis de moviments als fitxers i paquets d'aquest ítem.",
+
+  // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
+  "item.edit.bitstreams.notifications.move.saved.title":  "Canvis de moviments desats",
+
+  // "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":  "Un altre usuari ha canviat l'ítem en què està treballant actualment. Els teus canvis han estat descartats per evitar conflictes",
+
+  // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
+  "item.edit.bitstreams.notifications.outdated.title":  "Canvis desactualitzats",
+
+  // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
+  "item.edit.bitstreams.notifications.remove.failed.title":  "Error en suprimir fitxer",
+
+  // "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":  "S'han desat els canvis d'eliminació dels fitxers d'aquest ítem.",
+
+  // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
+  "item.edit.bitstreams.notifications.remove.saved.title":  "S'han desat els canvis d'eliminació",
+
+  // "item.edit.bitstreams.reinstate-button": "Undo",
+  "item.edit.bitstreams.reinstate-button":  "Desfer",
+
+  // "item.edit.bitstreams.save-button": "Save",
+  "item.edit.bitstreams.save-button":  "Guardar",
+
+  // "item.edit.bitstreams.upload-button": "Upload",
+  "item.edit.bitstreams.upload-button":  "Pujar",
+
+
+
+  // "item.edit.delete.cancel": "Cancel",
+  "item.edit.delete.cancel":  "Cancel·lar",
+
+  // "item.edit.delete.confirm": "Delete",
+  "item.edit.delete.confirm":  "Esborrar",
+
+  // "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 segur que aquest ítem s'ha d'eliminar completament? Precaució: actualment no es deixaria cap rastre.",
+
+  // "item.edit.delete.error": "An error occurred while deleting the item",
+  "item.edit.delete.error":  "S'ha produït un error en eliminar l'ítem.",
+
+  // "item.edit.delete.header": "Delete item: {{ id }}",
+  "item.edit.delete.header":  "Eliminar ítem: {{ id }}",
+
+  // "item.edit.delete.success": "The item has been deleted",
+  "item.edit.delete.success":  "L'ítem ha estat eliminat",
+
+  // "item.edit.head": "Edit Item",
+  "item.edit.head":  "Editar ítem",
+
+  // "item.edit.breadcrumbs": "Edit Item",
+  "item.edit.breadcrumbs":  "Editar ítem",
+
+  // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
+  "item.edit.tabs.disabled.tooltip":  "No tens autorització per accedir a aquesta pestanya",
+
+
+  // "item.edit.tabs.mapper.head": "Collection Mapper",
+  "item.edit.tabs.mapper.head":  "Mapejador de col·leccions",
+
+  // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
+  "item.edit.tabs.item-mapper.title":  "Edició d'ítem - Mapeador de col·leccions",
+
+  // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
+  "item.edit.item-mapper.buttons.add":  "Assignar ítem a col·leccions seleccionades",
+
+  // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
+  "item.edit.item-mapper.buttons.remove":  "Eliminar l'assignació d'ítem per a les col·leccions seleccionades",
+
+  // "item.edit.item-mapper.cancel": "Cancel",
+  "item.edit.item-mapper.cancel":  "Cancel·lar",
+
+  // "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":  "Aquesta és l'eina d'assignació d'ítems que permet als administradors assignar aquest ítem a altres col·leccions. Podeu cercar col·leccions i mapejar-les, o explorar la llista de col·leccions a les quals l'ítem està mapejat actualment.",
+
+  // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
+  "item.edit.item-mapper.head":  "Assignador d'ítems: assigna ítems a col·leccions",
+
+  // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
+  "item.edit.item-mapper.item":  "Ítem: \"<b>{{ name }}</b>\"",
+
+  // "item.edit.item-mapper.no-search": "Please enter a query to search",
+  "item.edit.item-mapper.no-search":  "Introduïu una consulta per cercar",
+
+  // "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":  "S'han produït errors en mapejar l'ítem a {{ amount }} col·leccions.",
+
+  // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
+  "item.edit.item-mapper.notifications.add.error.head":  "Errors de mapatge",
+
+  // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.add.success.content":  "L'ítem s'ha assignat correctament a {{ amount }} col·leccions.",
+
+  // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
+  "item.edit.item-mapper.notifications.add.success.head":  "Mapeig completat",
+
+  // "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":  "S'han produït errors en l'eliminació de l'assignació a {{ amount }} col·leccions.",
+
+  // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
+  "item.edit.item-mapper.notifications.remove.error.head":  "Errors a l'eliminació de mapatge",
+
+  // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.success.content":  "S'ha eliminat correctament l'assignació de l'ítem a {{ amount }} col·leccions.",
+
+  // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
+  "item.edit.item-mapper.notifications.remove.success.head":  "Eliminació del mapatge completat",
+
+  // "item.edit.item-mapper.search-form.placeholder": "Search collections...",
+  "item.edit.item-mapper.search-form.placeholder":  "Cerca col·leccions...",
+
+  // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
+  "item.edit.item-mapper.tabs.browse":  "Examinar col·leccions mapejades",
+
+  // "item.edit.item-mapper.tabs.map": "Map new collections",
+  "item.edit.item-mapper.tabs.map":  "Mapejar noves col·leccions",
+
+
+
+  // "item.edit.metadata.add-button": "Add",
+  "item.edit.metadata.add-button":  "Afegir",
+
+  // "item.edit.metadata.discard-button": "Discard",
+  "item.edit.metadata.discard-button":  "Descartar",
+
+  // "item.edit.metadata.edit.buttons.edit": "Edit",
+  "item.edit.metadata.edit.buttons.edit":  "Editar",
+
+  // "item.edit.metadata.edit.buttons.remove": "Remove",
+  "item.edit.metadata.edit.buttons.remove":  "Eliminar",
+
+  // "item.edit.metadata.edit.buttons.undo": "Undo changes",
+  "item.edit.metadata.edit.buttons.undo":  "Desfer canvis",
+
+  // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "item.edit.metadata.edit.buttons.unedit":  "Deixar d'editar",
+
+  // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "item.edit.metadata.empty":  "Actualment, l'ítem no conté metadades. Feu clic a Afegir per començar a afegir un valor de metadades.",
+
+  // "item.edit.metadata.headers.edit": "Edit",
+  "item.edit.metadata.headers.edit":  "Editar",
+
+  // "item.edit.metadata.headers.field": "Field",
+  "item.edit.metadata.headers.field":  "Camp",
+
+  // "item.edit.metadata.headers.language": "Lang",
+  "item.edit.metadata.headers.language":  "Idioma",
+
+  // "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":  "Trieu un camp de metadades vàlid",
+
+  // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.metadata.notifications.discarded.content":  "Els teus canvis han sigut descartats. ",
+
+  // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "item.edit.metadata.notifications.discarded.title":  "Canvis descartats",
+
+  // "item.edit.metadata.notifications.error.title": "An error occurred",
+  "item.edit.metadata.notifications.error.title":  "S'ha produït un error",
+
+  // "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":  "Els canvis no s'han desat. Assegureu-vos que tots els camps siguin vàlids abans de desar.",
+
+  // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "item.edit.metadata.notifications.invalid.title":  "Metadades invàlides",
+
+  // "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":  "Un altre usuari ha canviat l'ítem en què està treballant actualment. Els teus canvis han estat descartats per evitar conflictes",
+
+  // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "item.edit.metadata.notifications.outdated.title":  "Canvis desactualitzats",
+
+  // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
+  "item.edit.metadata.notifications.saved.content":  "S'han desat els canvis a les metadades d'aquest ítem.",
+
+  // "item.edit.metadata.notifications.saved.title": "Metadata saved",
+  "item.edit.metadata.notifications.saved.title":  "Metadades desades",
+
+  // "item.edit.metadata.reinstate-button": "Undo",
+  "item.edit.metadata.reinstate-button":  "Desfer",
+
+  // "item.edit.metadata.save-button": "Save",
+  "item.edit.metadata.save-button":  "Guardar",
+
+
+
+  // "item.edit.modify.overview.field": "Field",
+  "item.edit.modify.overview.field":  "Camp",
+
+  // "item.edit.modify.overview.language": "Language",
+  "item.edit.modify.overview.language":  "Idioma",
+
+  // "item.edit.modify.overview.value": "Value",
+  "item.edit.modify.overview.value":  "Valor",
+
+
+
+  // "item.edit.move.cancel": "Back",
+  "item.edit.move.cancel":  "Enrere",
+
+  // "item.edit.move.save-button": "Save",
+  "item.edit.move.save-button":  "Guardar",
+
+  // "item.edit.move.discard-button": "Discard",
+  "item.edit.move.discard-button":  "Descartar",
+
+  // "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":  "Seleccioneu la col·lecció a la qual voleu moure aquest ítem. Per reduir la llista de col·leccions mostrades, podeu introduir una cerca al camp.",
+
+  // "item.edit.move.error": "An error occurred when attempting to move the item",
+  "item.edit.move.error":  "S'ha produït un error en intentar moure l'ítem.",
+
+  // "item.edit.move.head": "Move item: {{id}}",
+  "item.edit.move.head":  "Moure ítem: {{ id }}",
+
+  // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
+  "item.edit.move.inheritpolicies.checkbox":  "Heretar polítiques",
+
+  // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
+  "item.edit.move.inheritpolicies.description":  "Hereta les polítiques predeterminades de la col·lecció de destinació",
+
+  // "item.edit.move.move": "Move",
+  "item.edit.move.move":  "Moure",
+
+  // "item.edit.move.processing": "Moving...",
+  "item.edit.move.processing":  "Movent...",
+
+  // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
+  "item.edit.move.search.placeholder":  "Introduïu una consulta de cerca per cercar col·leccions",
+
+  // "item.edit.move.success": "The item has been moved successfully",
+  "item.edit.move.success":  "L'ítem s'ha mogut correctament.",
+
+  // "item.edit.move.title": "Move item",
+  "item.edit.move.title":  "Moure ítem",
+
+
+
+  // "item.edit.private.cancel": "Cancel",
+  "item.edit.private.cancel":  "Cancel·lar",
+
+  // "item.edit.private.confirm": "Make it non-discoverable",
+  "item.edit.private.confirm":  "Convertir-ho en privat",
+
+  // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?",
+  "item.edit.private.description":  "Està segur que aquest ítem s'ha de convertir en privat?",
+
+  // "item.edit.private.error": "An error occurred while making the item non-discoverable",
+  "item.edit.private.error":  "S'ha produït un error en convertir l'ítem en privat.",
+
+  // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
+  "item.edit.private.header":  "Convertir l'ítem a privat: {{ id }}",
+
+  // "item.edit.private.success": "The item is now non-discoverable",
+  "item.edit.private.success":  "L'ítem ara és privat",
+
+
+
+  // "item.edit.public.cancel": "Cancel",
+  "item.edit.public.cancel":  "Cancel·lar",
+
+  // "item.edit.public.confirm": "Make it discoverable",
+  "item.edit.public.confirm":  "Convertir-ho en públic",
+
+  // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?",
+  "item.edit.public.description":  "Està segur que aquest ítem s'ha de convertir en públic?",
+
+  // "item.edit.public.error": "An error occurred while making the item discoverable",
+  "item.edit.public.error":  "S'ha produït un error en convertir l'ítem en públic.",
+
+  // "item.edit.public.header": "Make item discoverable: {{ id }}",
+  "item.edit.public.header":  "Convertir l'ítem en públic: {{ id }}",
+
+  // "item.edit.public.success": "The item is now discoverable",
+  "item.edit.public.success":  "L'ítem ara és públic",
+
+
+
+  // "item.edit.reinstate.cancel": "Cancel",
+  "item.edit.reinstate.cancel":  "Cancel·lar",
+
+  // "item.edit.reinstate.confirm": "Reinstate",
+  "item.edit.reinstate.confirm":  "Reintegrar",
+
+  // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
+  "item.edit.reinstate.description":  "Està segur que aquest ítem s'ha de reintegrar?",
+
+  // "item.edit.reinstate.error": "An error occurred while reinstating the item",
+  "item.edit.reinstate.error":  "S'ha produït un error en reintegrar l'ítem",
+
+  // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
+  "item.edit.reinstate.header":  "Reintegrar l'ítem: {{ id }}",
+
+  // "item.edit.reinstate.success": "The item was reinstated successfully",
+  "item.edit.reinstate.success":  "L'ítem s'ha reintegrat correctament",
+
+
+
+  // "item.edit.relationships.discard-button": "Discard",
+  "item.edit.relationships.discard-button":  "Descartar",
+
+  // "item.edit.relationships.edit.buttons.add": "Add",
+  "item.edit.relationships.edit.buttons.add":  "Afegir",
+
+  // "item.edit.relationships.edit.buttons.remove": "Remove",
+  "item.edit.relationships.edit.buttons.remove":  "Eliminar",
+
+  // "item.edit.relationships.edit.buttons.undo": "Undo changes",
+  "item.edit.relationships.edit.buttons.undo":  "Desfer canvis",
+
+  // "item.edit.relationships.no-relationships": "No relationships",
+  "item.edit.relationships.no-relationships":  "Sense relacions",
+
+  // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.relationships.notifications.discarded.content":  "Els seus canvis han sigut descartats. Per recuperar els canvis premi el botó 'Desfer'",
+
+  // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
+  "item.edit.relationships.notifications.discarded.title":  "Canvis descartats",
+
+  // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
+  "item.edit.relationships.notifications.failed.title":  "Error en editar les relacions",
+
+  // "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":  "Un altre usuari ha canviat l'ítem en què està treballant actualment. Els seus canvis es descartaran per prevenir conflictes",
+
+  // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
+  "item.edit.relationships.notifications.outdated.title":  "Canvis desactualitzats",
+
+  // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
+  "item.edit.relationships.notifications.saved.content":  "S'han desat els canvis en les relacions d'aquest ítem.",
+
+  // "item.edit.relationships.notifications.saved.title": "Relationships saved",
+  "item.edit.relationships.notifications.saved.title":  "Relacions guardades",
+
+  // "item.edit.relationships.reinstate-button": "Undo",
+  "item.edit.relationships.reinstate-button":  "Desfer",
+
+  // "item.edit.relationships.save-button": "Save",
+  "item.edit.relationships.save-button":  "Guardar",
+
+  // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
+  "item.edit.relationships.no-entity-type":  "Afegiu la metadada 'dspace.entity.type' per habilitar les relacions per a aquest ítem",
+
+
+  // "item.edit.return": "Back",
+  "item.edit.return":  "Enrere",
+
+
+  // "item.edit.tabs.bitstreams.head": "Bitstreams",
+  "item.edit.tabs.bitstreams.head":  "Fitxers",
+
+  // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
+  "item.edit.tabs.bitstreams.title":  "Edició d'ítems: fitxers",
+
+  // "item.edit.tabs.curate.head": "Curate",
+  "item.edit.tabs.curate.head":  "Curar",
+
+  // "item.edit.tabs.curate.title": "Item Edit - Curate",
+  "item.edit.tabs.curate.title":  "Edició d'ítem: Curar",
+
+  // "item.edit.tabs.metadata.head": "Metadata",
+  "item.edit.tabs.metadata.head":  "Metadades",
+
+  // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
+  "item.edit.tabs.metadata.title":  "Edició d'ítem: Metadades",
+
+  // "item.edit.tabs.relationships.head": "Relationships",
+  "item.edit.tabs.relationships.head":  "Relacions",
+
+  // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
+  "item.edit.tabs.relationships.title":  "Edició d'ítem: Relacions",
+
+  // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
+  "item.edit.tabs.status.buttons.authorizations.button":  "Autoritzacions...",
+
+  // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
+  "item.edit.tabs.status.buttons.authorizations.label":  "Editar privilegis d'autorització de l'ítem:",
+
+  // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
+  "item.edit.tabs.status.buttons.delete.button":  "Esborrar permanentment",
+
+  // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
+  "item.edit.tabs.status.buttons.delete.label":  "Esborrar completament l'ítem:",
+
+  // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.button":  "Col·leccions mapejades",
+
+  // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.label":  "Administra col·leccions mapejades",
+
+  // "item.edit.tabs.status.buttons.move.button": "Move...",
+  "item.edit.tabs.status.buttons.move.button":  "Moure...",
+
+  // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
+  "item.edit.tabs.status.buttons.move.label":  "Moure ítem a una altra col·lecció",
+
+  // "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...",
+  "item.edit.tabs.status.buttons.private.button":  "Convertir-ho en privat...",
+
+  // "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable",
+  "item.edit.tabs.status.buttons.private.label":  "Convertir l'ítem a privat",
+
+  // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...",
+  "item.edit.tabs.status.buttons.public.button":  "Convertir-ho en públic...",
+
+  // "item.edit.tabs.status.buttons.public.label": "Make item discoverable",
+  "item.edit.tabs.status.buttons.public.label":  "Convertir l'ítem en públic",
+
+  // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
+  "item.edit.tabs.status.buttons.reinstate.button":  "Reintegrar...",
+
+  // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
+  "item.edit.tabs.status.buttons.reinstate.label":  "Restablir l'ítem al repositori",
+
+  // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
+  "item.edit.tabs.status.buttons.unauthorized":  "No estàs autoritzat a realitzar aquesta acció.",
+
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
+  "item.edit.tabs.status.buttons.withdraw.button":  "Retira...",
+
+  // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
+  "item.edit.tabs.status.buttons.withdraw.label":  "Retirar ítem del repositori",
+
+  // "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":  "Benvingut a la pàgina d'administració d'ítems. Des d'aquí podeu retirar, restablir, moure o eliminar l'ítem. També podeu actualitzar o afegir noves metadades / fitxers a les altres pestanyes.",
+
+  // "item.edit.tabs.status.head": "Status",
+  "item.edit.tabs.status.head":  "Estat",
+
+  // "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":  "ID intern de l'ítem",
+
+  // "item.edit.tabs.status.labels.itemPage": "Item Page",
+  "item.edit.tabs.status.labels.itemPage":  "Pàgina de l'ítem",
+
+  // "item.edit.tabs.status.labels.lastModified": "Last Modified",
+  "item.edit.tabs.status.labels.lastModified":  "Última modificació",
+
+  // "item.edit.tabs.status.title": "Item Edit -  Status",
+  "item.edit.tabs.status.title":  "Edició d'ítem: Estat",
+
+  // "item.edit.tabs.versionhistory.head": "Version History",
+  "item.edit.tabs.versionhistory.head":  "Historial de versions",
+
+  // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
+  "item.edit.tabs.versionhistory.title":  "Edició d'ítems: Historial de versions",
+
+  // "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":  "Encara no és possible editar o afegir noves versions en aquesta interfície d'usuari.",
+
+  // "item.edit.tabs.view.head": "View Item",
+  "item.edit.tabs.view.head":  "Veure ítem",
+
+  // "item.edit.tabs.view.title": "Item Edit -  View",
+  "item.edit.tabs.view.title":  "Edició d'ítem - Visualitza",
+
+
+
+  // "item.edit.withdraw.cancel": "Cancel",
+  "item.edit.withdraw.cancel":  "Cancel·lar",
+
+  // "item.edit.withdraw.confirm": "Withdraw",
+  "item.edit.withdraw.confirm":  "Retirar",
+
+  // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
+  "item.edit.withdraw.description":  "Esteu segur que aquest ítem s'ha de retirar del fitxer?",
+
+  // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
+  "item.edit.withdraw.error":  "S'ha produït un error en retirar l'ítem",
+
+  // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
+  "item.edit.withdraw.header":  "Retira l'ítem: {{ id }}",
+
+  // "item.edit.withdraw.success": "The item was withdrawn successfully",
+  "item.edit.withdraw.success":  "L'ítem s'ha retirat amb èxit",
+
+  // "item.orcid.return": "Back",
+  "item.orcid.return":  "Enrere",
+
+
+  // "item.listelement.badge": "Item",
+  "item.listelement.badge":  "Ítem",
+
+  // "item.page.description": "Description",
+  "item.page.description":  "Descripció",
+
+  // "item.page.journal-issn": "Journal ISSN",
+  "item.page.journal-issn":  "ISSN de la revista",
+
+  // "item.page.journal-title": "Journal Title",
+  "item.page.journal-title":  "Títol de la revista",
+
+  // "item.page.publisher": "Publisher",
+  "item.page.publisher":  "Editor",
+
+  // "item.page.titleprefix": "Item: ",
+  "item.page.titleprefix":  "Ítem: ",
+
+  // "item.page.volume-title": "Volume Title",
+  "item.page.volume-title":  "Títol del volum",
+
+  // "item.search.results.head": "Item Search Results",
+  "item.search.results.head":  "Resultats de la cerca d'ítems",
+
+  // "item.search.title": "Item Search",
+  "item.search.title":  "Cerca d'ítems",
+
+  // "item.truncatable-part.show-more": "Show more",
+  "item.truncatable-part.show-more":  "Més...",
+
+  // "item.truncatable-part.show-less": "Collapse",
+  "item.truncatable-part.show-less":  "Contraure",
+
+
+
+  // "item.page.abstract": "Abstract",
+  "item.page.abstract":  "Resum",
+
+  // "item.page.author": "Authors",
+  "item.page.author":  "Autors",
+
+  // "item.page.citation": "Citation",
+  "item.page.citation":  "Citació",
+
+  // "item.page.collections": "Collections",
+  "item.page.collections":  "Col·leccions",
+
+  // "item.page.collections.loading": "Loading...",
+  "item.page.collections.loading":  "Carregant...",
+
+  // "item.page.collections.load-more": "Load more",
+  "item.page.collections.load-more":  "Carregar més",
+
+  // "item.page.date": "Date",
+  "item.page.date":  "Data",
+
+  // "item.page.edit": "Edit this item",
+  "item.page.edit":  "Editar aquest ítem",
+
+  // "item.page.files": "Files",
+  "item.page.files":  "Fitxers",
+
+  // "item.page.filesection.description": "Description:",
+  "item.page.filesection.description":  "Descripció:",
+
+  // "item.page.filesection.download": "Download",
+  "item.page.filesection.download":  "Descarregar",
+
+  // "item.page.filesection.format": "Format:",
+  "item.page.filesection.format":  "Format:",
+
+  // "item.page.filesection.name": "Name:",
+  "item.page.filesection.name":  "Nom:",
+
+  // "item.page.filesection.size": "Size:",
+  "item.page.filesection.size":  "Mida:",
+
+  // "item.page.journal.search.title": "Articles in this journal",
+  "item.page.journal.search.title":  "Ítems d'aquesta revista",
+
+  // "item.page.link.full": "Full item page",
+  "item.page.link.full":  "Pàgina completa de l'ítem",
+
+  // "item.page.link.simple": "Simple item page",
+  "item.page.link.simple":  "Vista senzilla d'ítem",
+
+  // "item.page.orcid.title": "ORCID",
+  "item.page.orcid.title":  "ORCID",
+
+  // "item.page.orcid.tooltip": "Open ORCID setting page",
+  "item.page.orcid.tooltip":  "Obrir la pàgina de configuració de ORCID",
+
+  // "item.page.person.search.title": "Articles by this author",
+  "item.page.person.search.title":  "Ítems d'aquest autor",
+
+  // "item.page.related-items.view-more": "Show {{ amount }} more",
+  "item.page.related-items.view-more":  "Mostra {{ amount }} més",
+
+  // "item.page.related-items.view-less": "Hide last {{ amount }}",
+  "item.page.related-items.view-less":  "Ocultar els últims {{ amount }}",
+
+  // "item.page.relationships.isAuthorOfPublication": "Publications",
+  "item.page.relationships.isAuthorOfPublication":  "Publicacions",
+
+  // "item.page.relationships.isJournalOfPublication": "Publications",
+  "item.page.relationships.isJournalOfPublication":  "Publicacions",
+
+  // "item.page.relationships.isOrgUnitOfPerson": "Authors",
+  "item.page.relationships.isOrgUnitOfPerson":  "Autors",
+
+  // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
+  "item.page.relationships.isOrgUnitOfProject":  "Projectes de recerca",
+
+  // "item.page.subject": "Keywords",
+  "item.page.subject":  "Paraules clau",
+
+  // "item.page.uri": "URI",
+  "item.page.uri":  "URI",
+
+  // "item.page.bitstreams.view-more": "Show more",
+  "item.page.bitstreams.view-more":  "Mostrar més",
+
+  // "item.page.bitstreams.collapse": "Collapse",
+  "item.page.bitstreams.collapse":  "Contraure",
+
+  // "item.page.filesection.original.bundle" : "Original bundle",
+  "item.page.filesection.original.bundle":  "Paquet original",
+
+  // "item.page.filesection.license.bundle" : "License bundle",
+  "item.page.filesection.license.bundle":  "Paquet de llicències",
+
+  // "item.page.return": "Back",
+  "item.page.return":  "Enrere",
+
+  // "item.page.version.create": "Create new version",
+  "item.page.version.create":  "Crear una nova versió",
+
+  // "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 es pot crear una nova versió perquè a l'historial de versions hi ha un enviament en curs",
+
+  // "item.page.claim.button": "Claim",
+  "item.page.claim.button":  "Reclamar",
+
+  // "item.page.claim.tooltip": "Claim this item as profile",
+  "item.page.claim.tooltip":  "Reclamar aquest ítem com a perfil",
+
+  // "item.preview.dc.identifier.uri": "Identifier:",
+  "item.preview.dc.identifier.uri":  "Identificador:",
+
+  // "item.preview.dc.contributor.author": "Authors:",
+  "item.preview.dc.contributor.author":  "Autors:",
+
+  // "item.preview.dc.date.issued": "Published date:",
+  "item.preview.dc.date.issued":  "Data de publicació:",
+
+  // "item.preview.dc.description.abstract": "Abstract:",
+  "item.preview.dc.description.abstract":  "Resum:",
+
+  // "item.preview.dc.identifier.other": "Other identifier:",
+  "item.preview.dc.identifier.other":  "Un altre identificador:",
+
+  // "item.preview.dc.language.iso": "Language:",
+  "item.preview.dc.language.iso":  "Idioma:",
+
+  // "item.preview.dc.subject": "Subjects:",
+  "item.preview.dc.subject":  "Matèries:",
+
+  // "item.preview.dc.title": "Title:",
+  "item.preview.dc.title":  "Títol:",
+
+  // "item.preview.dc.type": "Type:",
+  "item.preview.dc.type":  "Tipus:",
+
+  // "item.preview.oaire.citation.issue" : "Issue",
+  "item.preview.oaire.citation.issue":  "Número",
+
+  // "item.preview.oaire.citation.volume" : "Volume",
+  "item.preview.oaire.citation.volume":  "Volum",
+
+  // "item.preview.dc.relation.issn" : "ISSN",
+  "item.preview.dc.relation.issn":  "ISSN",
+
+  // "item.preview.dc.identifier.isbn" : "ISBN",
+  "item.preview.dc.identifier.isbn":  "ISBN",
+
+  // "item.preview.dc.identifier": "Identifier:",
+  "item.preview.dc.identifier":  "Identificador:",
+
+  // "item.preview.dc.relation.ispartof" : "Journal or Serie",
+  "item.preview.dc.relation.ispartof":  "Revista o Sèrie",
+
+  // "item.preview.dc.identifier.doi" : "DOI",
+  "item.preview.dc.identifier.doi":  "DOI",
+
+  // "item.preview.person.familyName": "Surname:",
+  "item.preview.person.familyName":  "Cognoms:",
+
+  // "item.preview.person.givenName": "Name:",
+  "item.preview.person.givenName":  "Nom:",
+
+  // "item.preview.person.identifier.orcid": "ORCID:",
+  "item.preview.person.identifier.orcid":  "ORCID:",
+
+  // "item.preview.project.funder.name": "Funder:",
+  "item.preview.project.funder.name":  "Finançador:",
+
+  // "item.preview.project.funder.identifier": "Funder Identifier:",
+  "item.preview.project.funder.identifier":  "Identificador del finançador:",
+
+  // "item.preview.oaire.awardNumber": "Funding ID:",
+  "item.preview.oaire.awardNumber":  "ID de finançament:",
+
+  // "item.preview.dc.title.alternative": "Acronym:",
+  "item.preview.dc.title.alternative":  "Acrònim:",
+
+  // "item.preview.dc.coverage.spatial": "Jurisdiction:",
+  "item.preview.dc.coverage.spatial":  "Jurisdicció:",
+
+  // "item.preview.oaire.fundingStream": "Funding Stream:",
+  "item.preview.oaire.fundingStream":  "Línia de finançament:",
+
+
+
+  // "item.select.confirm": "Confirm selected",
+  "item.select.confirm":  "Confirmar seleccionat",
+
+  // "item.select.empty": "No items to show",
+  "item.select.empty":  "No hi ha elements per mostrar",
+
+  // "item.select.table.author": "Author",
+  "item.select.table.author":  "Autor",
+
+  // "item.select.table.collection": "Collection",
+  "item.select.table.collection":  "Col·lecció",
+
+  // "item.select.table.title": "Title",
+  "item.select.table.title":  "Títol",
+
+
+  // "item.version.history.empty": "There are no other versions for this item yet.",
+  "item.version.history.empty":  "Encara no hi ha altres versions per a aquest ítem.",
+
+  // "item.version.history.head": "Version History",
+  "item.version.history.head":  "Historial de versions",
+
+  // "item.version.history.return": "Back",
+  "item.version.history.return":  "Enrere",
+
+  // "item.version.history.selected": "Selected version",
+  "item.version.history.selected":  "Versió seleccionada",
+
+  // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
+  "item.version.history.selected.alert":  "Esta veient la versió {{version}} de l'ítem.",
+
+  // "item.version.history.table.version": "Version",
+  "item.version.history.table.version":  "Versió",
+
+  // "item.version.history.table.item": "Item",
+  "item.version.history.table.item":  "Ítem",
+
+  // "item.version.history.table.editor": "Editor",
+  "item.version.history.table.editor":  "Editor",
+
+  // "item.version.history.table.date": "Date",
+  "item.version.history.table.date":  "Data",
+
+  // "item.version.history.table.summary": "Summary",
+  "item.version.history.table.summary":  "Resum",
+
+  // "item.version.history.table.workspaceItem": "Workspace item",
+  "item.version.history.table.workspaceItem":  "Ítem de l'espai de treball",
+
+  // "item.version.history.table.workflowItem": "Workflow item",
+  "item.version.history.table.workflowItem":  "Ítem del flux de treball",
+
+  // "item.version.history.table.actions": "Action",
+  "item.version.history.table.actions":  "Acció",
+
+  // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
+  "item.version.history.table.action.editWorkspaceItem":  "Editar ítem de l'espai de treball",
+
+  // "item.version.history.table.action.editSummary": "Edit summary",
+  "item.version.history.table.action.editSummary":  "Editar resum",
+
+  // "item.version.history.table.action.saveSummary": "Save summary edits",
+  "item.version.history.table.action.saveSummary":  "Salvar resum",
+
+  // "item.version.history.table.action.discardSummary": "Discard summary edits",
+  "item.version.history.table.action.discardSummary":  "Descartar canvis del resum",
+
+  // "item.version.history.table.action.newVersion": "Create new version from this one",
+  "item.version.history.table.action.newVersion":  "Crear nova versió a partir d'aquesta",
+
+  // "item.version.history.table.action.deleteVersion": "Delete version",
+  "item.version.history.table.action.deleteVersion":  "Esborrar versió",
+
+  // "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 és possible crear una nova versió ja que existeix a l'historial de versions un enviament pendent",
+
+
+  // "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":  "Aquesta no és l'última versió d'aquest ítem. L'última versió es pot trobar <a href='{{destination}}'>aquí</a>.",
+
+
+  // "item.version.create.modal.header": "New version",
+  "item.version.create.modal.header":  "Nova versió",
+
+  // "item.version.create.modal.text": "Create a new version for this item",
+  "item.version.create.modal.text":  "Crear una nova versió d'aquest ítem",
+
+  // "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
+  "item.version.create.modal.text.startingFrom":  "començant des de versió {{version}}",
+
+  // "item.version.create.modal.button.confirm": "Create",
+  "item.version.create.modal.button.confirm":  "Crear",
+
+  // "item.version.create.modal.button.confirm.tooltip": "Create new version",
+  "item.version.create.modal.button.confirm.tooltip":  "Crear nova versió",
+
+  // "item.version.create.modal.button.cancel": "Cancel",
+  "item.version.create.modal.button.cancel":  "Cancel·lar",
+
+  // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
+  "item.version.create.modal.button.cancel.tooltip":  "No crear una nova versió",
+
+  // "item.version.create.modal.form.summary.label": "Summary",
+  "item.version.create.modal.form.summary.label":  "Resum",
+
+  // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+  "item.version.create.modal.form.summary.placeholder":  "Introduïu el resum d'aquesta nova versió",
+
+  // "item.version.create.modal.submitted.header": "Creating new version...",
+  "item.version.create.modal.submitted.header":  "Creant nova versió...",
+
+  // "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":  "S'està creant la nova versió. Si l'ítem té moltes relacions, aquest procés podria trigar.",
+
+  // "item.version.create.notification.success" : "New version has been created with version number {{version}}",
+  "item.version.create.notification.success":  "S'ha creat una nova versió amb número {{version}}",
+
+  // "item.version.create.notification.failure" : "New version has not been created",
+  "item.version.create.notification.failure":  "No s'ha creat una nova versió",
+
+  // "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 és possible crear una nova versió ja que existeix a l'historial de versions un enviament pendent",
+
+
+  // "item.version.delete.modal.header": "Delete version",
+  "item.version.delete.modal.header":  "Esborrar versió",
+
+  // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
+  "item.version.delete.modal.text":  "Vol esborrar la versió {{version}}?",
+
+  // "item.version.delete.modal.button.confirm": "Delete",
+  "item.version.delete.modal.button.confirm":  "Esborrar",
+
+  // "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
+  "item.version.delete.modal.button.confirm.tooltip":  "Esborrar aquesta versió",
+
+  // "item.version.delete.modal.button.cancel": "Cancel",
+  "item.version.delete.modal.button.cancel":  "Cancel·lar",
+
+  // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
+  "item.version.delete.modal.button.cancel.tooltip":  "No esborrar aquesta versió",
+
+  // "item.version.delete.notification.success" : "Version number {{version}} has been deleted",
+  "item.version.delete.notification.success":  "S'ha esborrat la versió número {{version}}",
+
+  // "item.version.delete.notification.failure" : "Version number {{version}} has not been deleted",
+  "item.version.delete.notification.failure":  "No s'ha esborrat la versió número {{version}}",
+
+
+  // "item.version.edit.notification.success" : "The summary of version number {{version}} has been changed",
+  "item.version.edit.notification.success":  "Ha canviat el resum de la versió número {{version}}",
+
+  // "item.version.edit.notification.failure" : "The summary of version number {{version}} has not been changed",
+  "item.version.edit.notification.failure":  "No ha canviat el resum de la versió número {{version}}",
+
+
+
+  // "journal.listelement.badge": "Journal",
+  "journal.listelement.badge":  "Revista",
+
+  // "journal.page.description": "Description",
+  "journal.page.description":  "Descripció",
+
+  // "journal.page.edit": "Edit this item",
+  "journal.page.edit":  "Editar aquest ítem",
+
+  // "journal.page.editor": "Editor-in-Chief",
+  "journal.page.editor":  "Editor en cap",
+
+  // "journal.page.issn": "ISSN",
+  "journal.page.issn":  "ISSN",
+
+  // "journal.page.publisher": "Publisher",
+  "journal.page.publisher":  "Editor",
+
+  // "journal.page.titleprefix": "Journal: ",
+  "journal.page.titleprefix":  "Revista: ",
+
+  // "journal.search.results.head": "Journal Search Results",
+  "journal.search.results.head":  "Resultats de la cerca de revistes",
+
+  // "journal-relationships.search.results.head": "Journal Search Results",
+  "journal-relationships.search.results.head":  "Resultats de la cerca de revistes",
+
+  // "journal.search.title": "Journal Search",
+  "journal.search.title":  "Cerca de revistes",
+
+
+
+  // "journalissue.listelement.badge": "Journal Issue",
+  "journalissue.listelement.badge":  "Número de la revista",
+
+  // "journalissue.page.description": "Description",
+  "journalissue.page.description":  "Descripció",
+
+  // "journalissue.page.edit": "Edit this item",
+  "journalissue.page.edit":  "Editar aquest ítem",
+
+  // "journalissue.page.issuedate": "Issue Date",
+  "journalissue.page.issuedate":  "Data de publicació",
+
+  // "journalissue.page.journal-issn": "Journal ISSN",
+  "journalissue.page.journal-issn":  "ISSN de la revista",
+
+  // "journalissue.page.journal-title": "Journal Title",
+  "journalissue.page.journal-title":  "Títol de la revista",
+
+  // "journalissue.page.keyword": "Keywords",
+  "journalissue.page.keyword":  "Paraules clau",
+
+  // "journalissue.page.number": "Number",
+  "journalissue.page.number":  "Número",
+
+  // "journalissue.page.titleprefix": "Journal Issue: ",
+  "journalissue.page.titleprefix":  "Número de la revista: ",
+
+
+
+  // "journalvolume.listelement.badge": "Journal Volume",
+  "journalvolume.listelement.badge":  "Volum de la revista",
+
+  // "journalvolume.page.description": "Description",
+  "journalvolume.page.description":  "Descripció",
+
+  // "journalvolume.page.edit": "Edit this item",
+  "journalvolume.page.edit":  "Editar aquest ítem",
+
+  // "journalvolume.page.issuedate": "Issue Date",
+  "journalvolume.page.issuedate":  "Data de publicació",
+
+  // "journalvolume.page.titleprefix": "Journal Volume: ",
+  "journalvolume.page.titleprefix":  "Volum de la revista: ",
+
+  // "journalvolume.page.volume": "Volume",
+  "journalvolume.page.volume":  "Volum",
+
+
+  // "iiifsearchable.listelement.badge": "Document Media",
+  "iiifsearchable.listelement.badge":  "Suport del document",
+
+  // "iiifsearchable.page.titleprefix": "Document: ",
+  "iiifsearchable.page.titleprefix":  "Document: ",
+
+  // "iiifsearchable.page.doi": "Permanent Link: ",
+  "iiifsearchable.page.doi":  "Enllaç permanent: ",
+
+  // "iiifsearchable.page.issue": "Issue: ",
+  "iiifsearchable.page.issue":  "Número: ",
+
+  // "iiifsearchable.page.description": "Description: ",
+  "iiifsearchable.page.description":  "Descripció: ",
+
+  // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
+  "iiifviewer.fullscreen.notice":  "Per visualitzar millor, utilitzeu el mode pantalla completa.",
+
+  // "iiif.listelement.badge": "Image Media",
+  "iiif.listelement.badge":  "Image Media",
+
+  // "iiif.page.titleprefix": "Image: ",
+  "iiif.page.titleprefix":  "Imatge: ",
+
+  // "iiif.page.doi": "Permanent Link: ",
+  "iiif.page.doi":  "Enllaç permanent: ",
+
+  // "iiif.page.issue": "Issue: ",
+  "iiif.page.issue":  "Número: ",
+
+  // "iiif.page.description": "Description: ",
+  "iiif.page.description":  "Descripció: ",
+
+
+  // "loading.bitstream": "Loading bitstream...",
+  "loading.bitstream":  "Carregant fitxer...",
+
+  // "loading.bitstreams": "Loading bitstreams...",
+  "loading.bitstreams":  "Carregant fitxers...",
+
+  // "loading.browse-by": "Loading items...",
+  "loading.browse-by":  "Carregant ítems...",
+
+  // "loading.browse-by-page": "Loading page...",
+  "loading.browse-by-page":  "Carregant pàgina...",
+
+  // "loading.collection": "Loading collection...",
+  "loading.collection":  "Carregant col·lecció...",
+
+  // "loading.collections": "Loading collections...",
+  "loading.collections":  "Carregant col·leccions...",
+
+  // "loading.content-source": "Loading content source...",
+  "loading.content-source":  "Carregant font de contingut...",
+
+  // "loading.community": "Loading community...",
+  "loading.community":  "Carregant comunitat...",
+
+  // "loading.default": "Loading...",
+  "loading.default":  "Carregant...",
+
+  // "loading.item": "Loading item...",
+  "loading.item":  "Carregant ítem...",
+
+  // "loading.items": "Loading items...",
+  "loading.items":  "Carregant ítems...",
+
+  // "loading.mydspace-results": "Loading items...",
+  "loading.mydspace-results":  "Carregant ítems...",
+
+  // "loading.objects": "Loading...",
+  "loading.objects":  "Carregant...",
+
+  // "loading.recent-submissions": "Loading recent submissions...",
+  "loading.recent-submissions":  "Carregant enviaments recents...",
+
+  // "loading.search-results": "Loading search results...",
+  "loading.search-results":  "Carregant resultats de cerca...",
+
+  // "loading.sub-collections": "Loading sub-collections...",
+  "loading.sub-collections":  "Carregant subcol·leccions...",
+
+  // "loading.sub-communities": "Loading sub-communities...",
+  "loading.sub-communities":  "Carregant subcomunitats...",
+
+  // "loading.top-level-communities": "Loading top-level communities...",
+  "loading.top-level-communities":  "Carregant comunitats de primer nivell...",
+
+
+
+  // "login.form.email": "Email address",
+  "login.form.email":  "Correu electrònic",
+
+  // "login.form.forgot-password": "Have you forgotten your password?",
+  "login.form.forgot-password":  "Has oblidat la teva contrasenya?",
+
+  // "login.form.header": "Please log in to DSpace",
+  "login.form.header":  "Inicia sessió a DSpace",
+
+  // "login.form.new-user": "New user? Click here to register.",
+  "login.form.new-user":  "Nou Usuari? Feu clic aquí per registrar-se",
+
+  // "login.form.or-divider": "or",
+  "login.form.or-divider":  "o",
+
+  // "login.form.oidc": "Log in with OIDC",
+  "login.form.oidc":  "Iniciar sessió amb OIDC",
+
+  // "login.form.orcid": "Log in with ORCID",
+  "login.form.orcid":  "Iniciar sessió amb ORCID",
+
+  // "login.form.password": "Password",
+  "login.form.password":  "Contrasenya",
+
+  // "login.form.shibboleth": "Log in with Shibboleth",
+  "login.form.shibboleth":  "Iniciar sessió amb Shibboleth",
+
+  // "login.form.submit": "Log in",
+  "login.form.submit":  "Iniciar sessió",
+
+  // "login.title": "Login",
+  "login.title":  "Iniciar sessió",
+
+  // "login.breadcrumbs": "Login",
+  "login.breadcrumbs":  "Iniciar sessió",
+
+
+
+  // "logout.form.header": "Log out from DSpace",
+  "logout.form.header":  "Tancar sessió a DSpace",
+
+  // "logout.form.submit": "Log out",
+  "logout.form.submit":  "Tancar sessió",
+
+  // "logout.title": "Logout",
+  "logout.title":  "Tancar sessió",
+
+
+
+  // "menu.header.admin": "Management",
+  "menu.header.admin":  "Administració",
+
+  // "menu.header.image.logo": "Repository logo",
+  "menu.header.image.logo":  "Logotip del repositori",
+
+  // "menu.header.admin.description": "Management menu",
+  "menu.header.admin.description":  "Menú d'administració",
+
+
+
+  // "menu.section.access_control": "Access Control",
+  "menu.section.access_control":  "Control d'accés",
+
+  // "menu.section.access_control_authorizations": "Authorizations",
+  "menu.section.access_control_authorizations":  "Autoritzacions",
+
+  // "menu.section.access_control_groups": "Groups",
+  "menu.section.access_control_groups":  "Grups",
+
+  // "menu.section.access_control_people": "People",
+  "menu.section.access_control_people":  "Usuaris",
+
+
+
+  // "menu.section.admin_search": "Admin Search",
+  "menu.section.admin_search":  "Cerca d'administrador",
+
+
+
+  // "menu.section.browse_community": "This Community",
+  "menu.section.browse_community":  "Aquesta comunitat",
+
+  // "menu.section.browse_community_by_author": "By Author",
+  "menu.section.browse_community_by_author":  "Per autor",
+
+  // "menu.section.browse_community_by_issue_date": "By Issue Date",
+  "menu.section.browse_community_by_issue_date":  "Per data de publicació",
+
+  // "menu.section.browse_community_by_title": "By Title",
+  "menu.section.browse_community_by_title":  "Per títol",
+
+  // "menu.section.browse_global": "All of DSpace",
+  "menu.section.browse_global":  "Tot DSpace",
+
+  // "menu.section.browse_global_by_author": "By Author",
+  "menu.section.browse_global_by_author":  "Per autor",
+
+  // "menu.section.browse_global_by_dateissued": "By Issue Date",
+  "menu.section.browse_global_by_dateissued":  "Per data de publicació",
+
+  // "menu.section.browse_global_by_subject": "By Subject",
+  "menu.section.browse_global_by_subject":  "Per tema",
+
+  // "menu.section.browse_global_by_title": "By Title",
+  "menu.section.browse_global_by_title":  "Per títol",
+
+  // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
+  "menu.section.browse_global_communities_and_collections":  "Comunitats i col·leccions",
+
+
+
+  // "menu.section.control_panel": "Control Panel",
+  "menu.section.control_panel":  "Panel de control",
+
+  // "menu.section.curation_task": "Curation Task",
+  "menu.section.curation_task":  "Tasques de curació",
+
+
+
+  // "menu.section.edit": "Edit",
+  "menu.section.edit":  "Editar",
+
+  // "menu.section.edit_collection": "Collection",
+  "menu.section.edit_collection":  "Col·lecció",
+
+  // "menu.section.edit_community": "Community",
+  "menu.section.edit_community":  "Comunitat",
+
+  // "menu.section.edit_item": "Item",
+  "menu.section.edit_item":  "Ítem",
+
+
+
+  // "menu.section.export": "Export",
+  "menu.section.export":  "Exportar",
+
+  // "menu.section.export_collection": "Collection",
+  "menu.section.export_collection":  "Col·lecció",
+
+  // "menu.section.export_community": "Community",
+  "menu.section.export_community":  "Comunitat",
+
+  // "menu.section.export_item": "Item",
+  "menu.section.export_item":  "Ítem",
+
+  // "menu.section.export_metadata": "Metadata",
+  "menu.section.export_metadata":  "Metadades",
+
+  // "menu.section.export_batch": "Batch Export (ZIP)",
+  "menu.section.export_batch":  "Exportació per lots (ZIP)",
+
+
+  // "menu.section.icon.access_control": "Access Control menu section",
+  "menu.section.icon.access_control":  "Secció del menú de control d'accés",
+
+  // "menu.section.icon.admin_search": "Admin search menu section",
+  "menu.section.icon.admin_search":  "Secció del menú de cerca d'administrador",
+
+  // "menu.section.icon.control_panel": "Control Panel menu section",
+  "menu.section.icon.control_panel":  "Secció del menú del Tauler de control",
+
+  // "menu.section.icon.curation_tasks": "Curation Task menu section",
+  "menu.section.icon.curation_tasks":  "Secció del menú de Tasques de curació",
+
+  // "menu.section.icon.edit": "Edit menu section",
+  "menu.section.icon.edit":  "Secció del menú d'edició",
+
+  // "menu.section.icon.export": "Export menu section",
+  "menu.section.icon.export":  "Secció de menú d'exportació",
+
+  // "menu.section.icon.find": "Find menu section",
+  "menu.section.icon.find":  "Secció de menú de cerca",
+
+  // "menu.section.icon.health": "Health check menu section",
+  "menu.section.icon.health":  "Secció de menú de Revisió de salut",
+
+  // "menu.section.icon.import": "Import menu section",
+  "menu.section.icon.import":  "Secció de menú d'importació",
+
+  // "menu.section.icon.new": "New menu section",
+  "menu.section.icon.new":  "Secció de menú de creació",
+
+  // "menu.section.icon.pin": "Pin sidebar",
+  "menu.section.icon.pin":  "Ancorar barra lateral",
+
+  // "menu.section.icon.processes": "Processes Health",
+  "menu.section.icon.processes":  "Secció de menú de Processos de revisió",
+
+  // "menu.section.icon.registries": "Registries menu section",
+  "menu.section.icon.registries":  "Secció de menú de Registres",
+
+  // "menu.section.icon.statistics_task": "Statistics Task menu section",
+  "menu.section.icon.statistics_task":  "Secció del menú de Tasques d'estadístiques",
+
+  // "menu.section.icon.workflow": "Administer workflow menu section",
+  "menu.section.icon.workflow":  "Secció del menú d'Administració de fluxos de treball",
+
+  // "menu.section.icon.unpin": "Unpin sidebar",
+  "menu.section.icon.unpin":  "Desanclar la barra lateral",
+
+
+
+  // "menu.section.import": "Import",
+  "menu.section.import":  "Importar",
+
+  // "menu.section.import_batch": "Batch Import (ZIP)",
+  "menu.section.import_batch":  "Importació per lots (ZIP)",
+
+  // "menu.section.import_metadata": "Metadata",
+  "menu.section.import_metadata":  "Metadades",
+
+
+
+  // "menu.section.new": "New",
+  "menu.section.new":  "Nou",
+
+  // "menu.section.new_collection": "Collection",
+  "menu.section.new_collection":  "Col·lecció",
+
+  // "menu.section.new_community": "Community",
+  "menu.section.new_community":  "Comunitat",
+
+  // "menu.section.new_item": "Item",
+  "menu.section.new_item":  "Ítem",
+
+  // "menu.section.new_item_version": "Item Version",
+  "menu.section.new_item_version":  "Versió de l'ítem",
+
+  // "menu.section.new_process": "Process",
+  "menu.section.new_process":  "Procés",
+
+
+
+  // "menu.section.pin": "Pin sidebar",
+  "menu.section.pin":  "Ancorar barra lateral",
+
+  // "menu.section.unpin": "Unpin sidebar",
+  "menu.section.unpin":  "Desancorar la barra lateral",
+
+
+
+  // "menu.section.processes": "Processes",
+  "menu.section.processes":  "Processos",
+
+  // "menu.section.health": "Health",
+  "menu.section.health":  "Revisió de salut",
+
+
+
+  // "menu.section.registries": "Registries",
+  "menu.section.registries":  "Registres",
+
+  // "menu.section.registries_format": "Format",
+  "menu.section.registries_format":  "Format",
+
+  // "menu.section.registries_metadata": "Metadata",
+  "menu.section.registries_metadata":  "Metadades",
+
+
+
+  // "menu.section.statistics": "Statistics",
+  "menu.section.statistics":  "Estadístiques",
+
+  // "menu.section.statistics_task": "Statistics Task",
+  "menu.section.statistics_task":  "Tasques d'estadístiques",
+
+
+
+  // "menu.section.toggle.access_control": "Toggle Access Control section",
+  "menu.section.toggle.access_control":  "Alternar secció de Control d'accés",
+
+  // "menu.section.toggle.control_panel": "Toggle Control Panel section",
+  "menu.section.toggle.control_panel":  "Alternar la secció del Panell de control",
+
+  // "menu.section.toggle.curation_task": "Toggle Curation Task section",
+  "menu.section.toggle.curation_task":  "Alternar la secció Tasques de curació",
+
+  // "menu.section.toggle.edit": "Toggle Edit section",
+  "menu.section.toggle.edit":  "Alternar secció d'Edició",
+
+  // "menu.section.toggle.export": "Toggle Export section",
+  "menu.section.toggle.export":  "Alternar secció d'Exportació",
+
+  // "menu.section.toggle.find": "Toggle Find section",
+  "menu.section.toggle.find":  "Alternar secció de Cerca",
+
+  // "menu.section.toggle.import": "Toggle Import section",
+  "menu.section.toggle.import":  "Alternar secció d'Importació",
+
+  // "menu.section.toggle.new": "Toggle New section",
+  "menu.section.toggle.new":  "Alternar secció de Creació",
+
+  // "menu.section.toggle.registries": "Toggle Registries section",
+  "menu.section.toggle.registries":  "Alternar secció de Registres",
+
+  // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
+  "menu.section.toggle.statistics_task":  "Alternar secció de Tasca d'estadístiques",
+
+
+  // "menu.section.workflow": "Administer Workflow",
+  "menu.section.workflow":  "Administrar flux de treball",
+
+
+  // "metadata-export-search.tooltip": "Export search results as CSV",
+  "metadata-export-search.tooltip":  "Exporta els resultats de cerca a CSV",
+  // "metadata-export-search.submit.success": "The export was started successfully",
+  "metadata-export-search.submit.success":  "L'exportació s'ha iniciat satisfactòriament",
+  // "metadata-export-search.submit.error": "Starting the export has failed",
+  "metadata-export-search.submit.error":  "Ha fallat l'inici de l'exportació",
+
+
+  // "mydspace.breadcrumbs": "MyDSpace",
+  "mydspace.breadcrumbs":  "El meu DSpace",
+
+  // "mydspace.description": "",
+  "mydspace.description":  "",
+
+  // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
+  "mydspace.messages.controller-help":  "Seleccioneu aquesta opció per enviar un missatge al remitent de l'ítem.",
+
+  // "mydspace.messages.description-placeholder": "Insert your message here...",
+  "mydspace.messages.description-placeholder":  "Insereix el teu missatge aquí...",
+
+  // "mydspace.messages.hide-msg": "Hide message",
+  "mydspace.messages.hide-msg":  "Amagar missatge",
+
+  // "mydspace.messages.mark-as-read": "Mark as read",
+  "mydspace.messages.mark-as-read":  "Marcar com a llegit",
+
+  // "mydspace.messages.mark-as-unread": "Mark as unread",
+  "mydspace.messages.mark-as-unread":  "Marcar com no llegit",
+
+  // "mydspace.messages.no-content": "No content.",
+  "mydspace.messages.no-content":  "Sense contingut.",
+
+  // "mydspace.messages.no-messages": "No messages yet.",
+  "mydspace.messages.no-messages":  "Encara no hi ha missatges.",
+
+  // "mydspace.messages.send-btn": "Send",
+  "mydspace.messages.send-btn":  "Enviar",
+
+  // "mydspace.messages.show-msg": "Show message",
+  "mydspace.messages.show-msg":  "Mostrar missatge",
+
+  // "mydspace.messages.subject-placeholder": "Subject...",
+  "mydspace.messages.subject-placeholder":  "Assumpte...",
+
+  // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
+  "mydspace.messages.submitter-help":  "Seleccioneu aquesta opció per enviar un missatge al controlador.",
+
+  // "mydspace.messages.title": "Messages",
+  "mydspace.messages.title":  "Missatges",
+
+  // "mydspace.messages.to": "To",
+  "mydspace.messages.to":  "Per",
+
+  // "mydspace.new-submission": "New submission",
+  "mydspace.new-submission":  "Nou enviament",
+
+  // "mydspace.new-submission-external": "Import metadata from external source",
+  "mydspace.new-submission-external":  "Importa metadades d'una font externa",
+
+  // "mydspace.new-submission-external-short": "Import metadata",
+  "mydspace.new-submission-external-short":  "Importa metadades",
+
+  // "mydspace.results.head": "Your submissions",
+  "mydspace.results.head":  "Els teus enviaments",
+
+  // "mydspace.results.no-abstract": "No Abstract",
+  "mydspace.results.no-abstract":  "Sense resum",
+
+  // "mydspace.results.no-authors": "No Authors",
+  "mydspace.results.no-authors":  "Sense autors",
+
+  // "mydspace.results.no-collections": "No Collections",
+  "mydspace.results.no-collections":  "No hi ha col·leccions",
+
+  // "mydspace.results.no-date": "No Date",
+  "mydspace.results.no-date":  "Sense data",
+
+  // "mydspace.results.no-files": "No Files",
+  "mydspace.results.no-files":  "Sense fitxers",
+
+  // "mydspace.results.no-results": "There were no items to show",
+  "mydspace.results.no-results":  "No hi ha elements per mostrar",
+
+  // "mydspace.results.no-title": "No title",
+  "mydspace.results.no-title":  "Sense títol",
+
+  // "mydspace.results.no-uri": "No Uri",
+  "mydspace.results.no-uri":  "Sense URI",
+
+  // "mydspace.search-form.placeholder": "Search in mydspace...",
+  "mydspace.search-form.placeholder":  "Cerca al meu DSpace...",
+
+  // "mydspace.show.workflow": "Workflow tasks",
+  "mydspace.show.workflow":  "Tasques del flux de treball",
+
+  // "mydspace.show.workspace": "Your Submissions",
+  "mydspace.show.workspace":  "Els seus enviaments",
+
+  // "mydspace.status.archived": "Archived",
+  "mydspace.status.archived":  "Arxivat",
+
+  // "mydspace.status.validation": "Validation",
+  "mydspace.status.validation":  "Validació",
+
+  // "mydspace.status.waiting-for-controller": "Waiting for controller",
+  "mydspace.status.waiting-for-controller":  "Esperant el controlador",
+
+  // "mydspace.status.workflow": "Workflow",
+  "mydspace.status.workflow":  "Flux de treball",
+
+  // "mydspace.status.workspace": "Workspace",
+  "mydspace.status.workspace":  "Espai de treball",
+
+  // "mydspace.title": "MyDSpace",
+  "mydspace.title":  "El meu DSpace",
+
+  // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
+  "mydspace.upload.upload-failed":  "Error en crear un nou ítem de l'espai de treball. Verifiqueu el contingut carregat abans de tornar-ho a provar.",
+
+  // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
+  "mydspace.upload.upload-failed-manyentries":  "Fitxer no processable. S'han detectat massa entrades, però només se'n permet una per fitxer.",
+
+  // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
+  "mydspace.upload.upload-failed-moreonefile":  "Sol·licitud no processable. Només es permet un fitxer.",
+
+  // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
+  "mydspace.upload.upload-multiple-successful":  "S'han creat {{ qty }} nous ítems de l'espai de treball.",
+
+  // "mydspace.view-btn": "View",
+  "mydspace.view-btn":  "Veure",
+
+
+
+  // "nav.browse.header": "All of DSpace",
+  "nav.browse.header":  "Tot DSpace",
+
+  // "nav.community-browse.header": "By Community",
+  "nav.community-browse.header":  "Per comunitat",
+
+  // "nav.language": "Language switch",
+  "nav.language":  "Canvi d'idioma",
+
+  // "nav.login": "Log In",
+  "nav.login":  "Iniciar sessió",
+
+  // "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  "nav.user-profile-menu-and-logout": "Menú de perfil d'usuari i tancament de sessió",
+
+  // "nav.logout": "Log Out",
+  "nav.logout":  "Tancar sessió",
+
+  // "nav.main.description": "Main navigation bar",
+  "nav.main.description":  "Barra de navegació principal",
+
+  // "nav.mydspace": "MyDSpace",
+  "nav.mydspace":  "El meu DSpace",
+
+  // "nav.profile": "Profile",
+  "nav.profile":  "Perfil",
+
+  // "nav.search": "Search",
+  "nav.search":  "Cerca",
+
+  // "nav.statistics.header": "Statistics",
+  "nav.statistics.header":  "Estadístiques",
+
+  // "nav.stop-impersonating": "Stop impersonating EPerson",
+  "nav.stop-impersonating":  "Deixeu de fer-vos passar per usuari",
+
+  // "nav.toggle" : "Toggle navigation",
+  "nav.toggle":  "Alternar navegació",
+
+  // "nav.user.description" : "User profile bar",
+  "nav.user.description":  "Barra de perfil d'usuari",
+
+  // "none.listelement.badge": "Item",
+  "none.listelement.badge":  "Ítem",
+
+
+  // "orgunit.listelement.badge": "Organizational Unit",
+  "orgunit.listelement.badge":  "Unitat organitzativa",
+
+  // "orgunit.listelement.no-title": "Untitled",
+  "orgunit.listelement.no-title":  "Sense títol",
+
+  // "orgunit.page.city": "City",
+  "orgunit.page.city":  "Ciutat",
+
+  // "orgunit.page.country": "Country",
+  "orgunit.page.country":  "País",
+
+  // "orgunit.page.dateestablished": "Date established",
+  "orgunit.page.dateestablished":  "Data d'establiment",
+
+  // "orgunit.page.description": "Description",
+  "orgunit.page.description":  "Descripció",
+
+  // "orgunit.page.edit": "Edit this item",
+  "orgunit.page.edit":  "Editar aquest ítem",
+
+  // "orgunit.page.id": "ID",
+  "orgunit.page.id":  "ID",
+
+  // "orgunit.page.titleprefix": "Organizational Unit: ",
+  "orgunit.page.titleprefix":  "Unitat organitzativa: ",
+
+
+
+  // "pagination.options.description": "Pagination options",
+  "pagination.options.description":  "Opcions de paginació",
+
+  // "pagination.results-per-page": "Results Per Page",
+  "pagination.results-per-page":  "Resultats per pàgina",
+
+  // "pagination.showing.detail": "{{ range }} of {{ total }}",
+  "pagination.showing.detail":  "{{ range }} de {{ total }}",
+
+  // "pagination.showing.label": "Now showing ",
+  "pagination.showing.label":  "Mostrant ",
+
+  // "pagination.sort-direction": "Sort Options",
+  "pagination.sort-direction":  "Opcions d'ordenació",
+
+
+
+  // "person.listelement.badge": "Person",
+  "person.listelement.badge":  "Persona",
+
+  // "person.listelement.no-title": "No name found",
+  "person.listelement.no-title":  "No s'ha trobat cap nom",
+
+  // "person.page.birthdate": "Birth Date",
+  "person.page.birthdate":  "Data de naixement",
+
+  // "person.page.edit": "Edit this item",
+  "person.page.edit":  "Editar aquest ítem",
+
+  // "person.page.email": "Email Address",
+  "person.page.email":  "Adreça de correu electrònic",
+
+  // "person.page.firstname": "First Name",
+  "person.page.firstname":  "Nom",
+
+  // "person.page.jobtitle": "Job Title",
+  "person.page.jobtitle":  "Lloc de treball",
+
+  // "person.page.lastname": "Last Name",
+  "person.page.lastname":  "Cognoms",
+
+  // "person.page.name": "Name",
+  "person.page.name":  "Nom",
+
+  // "person.page.link.full": "Show all metadata",
+  "person.page.link.full":  "Mostra totes les metadades",
+
+  // "person.page.orcid": "ORCID",
+  "person.page.orcid":  "ORCID",
+
+  // "person.page.staffid": "Staff ID",
+  "person.page.staffid":  "Identificació de Personal",
+
+  // "person.page.titleprefix": "Person: ",
+  "person.page.titleprefix":  "Persona: ",
+
+  // "person.search.results.head": "Person Search Results",
+  "person.search.results.head":  "Resultats de cerca de persones",
+
+  // "person-relationships.search.results.head": "Person Search Results",
+  "person-relationships.search.results.head":  "Resultats de cerca de persones",
+
+  // "person.search.title": "Person Search",
+  "person.search.title":  "Cerca de persones",
+
+
+
+  // "process.new.select-parameters": "Parameters",
+  "process.new.select-parameters":  "Paràmetres",
+
+  // "process.new.cancel": "Cancel",
+  "process.new.cancel":  "Cancel·lar",
+
+  // "process.new.submit": "Save",
+  "process.new.submit":  "Guardar",
+
+  // "process.new.select-script": "Script",
+  "process.new.select-script":  "Script",
+
+  // "process.new.select-script.placeholder": "Choose a script...",
+  "process.new.select-script.placeholder":  "Trieu un script...",
+
+  // "process.new.select-script.required": "Script is required",
+  "process.new.select-script.required":  "Es requereix un script",
+
+  // "process.new.parameter.file.upload-button": "Select file...",
+  "process.new.parameter.file.upload-button":  "Selecciona fitxer...",
+
+  // "process.new.parameter.file.required": "Please select a file",
+  "process.new.parameter.file.required":  "Si us plau seleccioneu un fitxer",
+
+  // "process.new.parameter.string.required": "Parameter value is required",
+  "process.new.parameter.string.required":  "Es requereix el valor del paràmetre",
+
+  // "process.new.parameter.type.value": "value",
+  "process.new.parameter.type.value":  "valor",
+
+  // "process.new.parameter.type.file": "file",
+  "process.new.parameter.type.file":  "arxiu",
+
+  // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
+  "process.new.parameter.required.missing":  "Els paràmetres següents són obligatoris però encara falten:",
+
+  // "process.new.notification.success.title": "Success",
+  "process.new.notification.success.title":  "Èxit",
+
+  // "process.new.notification.success.content": "The process was successfully created",
+  "process.new.notification.success.content":  "El procés s'ha creat amb èxit",
+
+  // "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":  "S'ha produït un error en crear aquest procés.",
+
+  // "process.new.header": "Create a new process",
+  "process.new.header":  "Crea un nou procés",
+
+  // "process.new.title": "Create a new process",
+  "process.new.title":  "Crea un nou procés",
+
+  // "process.new.breadcrumbs": "Create a new process",
+  "process.new.breadcrumbs":  "Crea un nou procés",
+
+
+
+  // "process.detail.arguments" : "Arguments",
+  "process.detail.arguments":  "Arguments",
+
+  // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
+  "process.detail.arguments.empty":  "Aquest procés no conté cap argument",
+
+  // "process.detail.back" : "Back",
+  "process.detail.back":  "Enrere",
+
+  // "process.detail.output" : "Process Output",
+  "process.detail.output":  "Sortida del procés",
+
+  // "process.detail.logs.button": "Retrieve process output",
+  "process.detail.logs.button":  "Recuperar la sortida del procés",
+
+  // "process.detail.logs.loading": "Retrieving",
+  "process.detail.logs.loading":  "Recuperant",
+
+  // "process.detail.logs.none": "This process has no output",
+  "process.detail.logs.none":  "Aquest procés no té sortida",
+
+  // "process.detail.output-files" : "Output Files",
+  "process.detail.output-files":  "Fitxers de sortida",
+
+  // "process.detail.output-files.empty" : "This process doesn't contain any output files",
+  "process.detail.output-files.empty":  "Aquest procés no conté cap fitxer de sortida",
+
+  // "process.detail.script" : "Script",
+  "process.detail.script":  "Seqüència d'ordres",
+
+  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
+  "process.detail.title":  "Procés: {{ id }} - {{ name }}",
+
+  // "process.detail.start-time" : "Start time",
+  "process.detail.start-time":  "Hora d'inici",
+
+  // "process.detail.end-time" : "Finish time",
+  "process.detail.end-time":  "Hora de finalització",
+
+  // "process.detail.status" : "Status",
+  "process.detail.status":  "Estat",
+
+  // "process.detail.create" : "Create similar process",
+  "process.detail.create":  "Crear un procés similar",
+
+  // "process.detail.actions": "Actions",
+  "process.detail.actions":  "Accions",
+
+  // "process.detail.delete.button": "Delete process",
+  "process.detail.delete.button":  "Eliminar procés",
+
+  // "process.detail.delete.header": "Delete process",
+  "process.detail.delete.header":  "Eliminar procés",
+
+  // "process.detail.delete.body": "Are you sure you want to delete the current process?",
+  "process.detail.delete.body":  "Esteu segur que voleu eliminar el procés actual?",
+
+  // "process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel":  "Cancel·lar",
+
+  // "process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm":  "Eliminar procés",
+
+  // "process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success":  "Procés eliminat satisfactòriament.",
+
+  // "process.detail.delete.error": "Something went wrong when deleting the process",
+  "process.detail.delete.error":  "Alguna cosa ha fallat eliminant el procés",
+
+
+
+  // "process.overview.table.finish" : "Finish time (UTC)",
+  "process.overview.table.finish":  "Hora de finalització (UTC)",
+
+  // "process.overview.table.id" : "Process ID",
+  "process.overview.table.id":  "ID de procés",
+
+  // "process.overview.table.name" : "Name",
+  "process.overview.table.name":  "Nom",
+
+  // "process.overview.table.start" : "Start time (UTC)",
+  "process.overview.table.start":  "Hora d'inici (UTC)",
+
+  // "process.overview.table.status" : "Status",
+  "process.overview.table.status":  "Estat",
+
+  // "process.overview.table.user" : "User",
+  "process.overview.table.user":  "Usuari",
+
+  // "process.overview.title": "Processes Overview",
+  "process.overview.title":  "Resum de processos",
+
+  // "process.overview.breadcrumbs": "Processes Overview",
+  "process.overview.breadcrumbs":  "Resum de processos",
+
+  // "process.overview.new": "New",
+  "process.overview.new":  "Nou",
+
+  // "process.overview.table.actions": "Actions",
+  "process.overview.table.actions":  "Accions",
+
+  // "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete":  "Eliminar {{count}} processos",
+
+  // "process.overview.delete.clear": "Clear delete selection",
+  "process.overview.delete.clear":  "Netejar la selecció",
+
+  // "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.processing":  "S'eliminen {{count}} procés(sos). Espereu que l'eliminació es completi completament. Tingueu en compte que això pot trigar un temps.",
+
+  // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+  "process.overview.delete.body":  "Està segur que voleu eliminar {{count}} procés(sos)?",
+
+  // "process.overview.delete.header": "Delete processes",
+  "process.overview.delete.header":  "Elimina processos",
+
+  // "process.bulk.delete.error.head": "Error on deleteing process",
+  "process.bulk.delete.error.head":  "Error eliminant procés",
+
+  // "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ",
+  "process.bulk.delete.error.body":  "No s'ha pogut eliminar el procés amb ID {{processId}}. La resta de processos es continuaran eliminant. ",
+
+  // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
+  "process.bulk.delete.success":  "{{count}} procés(sos) s'han eliminat correctament",
+
+
+
+  // "profile.breadcrumbs": "Update Profile",
+  "profile.breadcrumbs":  "Actualització del perfil",
+
+  // "profile.card.identify": "Identify",
+  "profile.card.identify":  "Identitat",
+
+  // "profile.card.security": "Security",
+  "profile.card.security":  "Seguretat",
+
+  // "profile.form.submit": "Save",
+  "profile.form.submit":  "Guardar",
+
+  // "profile.groups.head": "Authorization groups you belong to",
+  "profile.groups.head":  "Grups d'autorització als quals pertanys",
+
+  // "profile.special.groups.head": "Authorization special groups you belong to",
+  "profile.special.groups.head":  "Grups d'autorització especials als quals pertanys",
+
+  // "profile.head": "Update Profile",
+  "profile.head":  "Actualització del perfil",
+
+  // "profile.metadata.form.error.firstname.required": "First Name is required",
+  "profile.metadata.form.error.firstname.required":  "Es requereix el nom",
+
+  // "profile.metadata.form.error.lastname.required": "Last Name is required",
+  "profile.metadata.form.error.lastname.required":  "Es requereix el cognom",
+
+  // "profile.metadata.form.label.email": "Email Address",
+  "profile.metadata.form.label.email":  "Adreça de correu electrònic",
+
+  // "profile.metadata.form.label.firstname": "First Name",
+  "profile.metadata.form.label.firstname":  "Nom",
+
+  // "profile.metadata.form.label.language": "Language",
+  "profile.metadata.form.label.language":  "Idioma",
+
+  // "profile.metadata.form.label.lastname": "Last Name",
+  "profile.metadata.form.label.lastname":  "Cognoms",
+
+  // "profile.metadata.form.label.phone": "Contact Telephone",
+  "profile.metadata.form.label.phone":  "Telèfon de contacte",
+
+  // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
+  "profile.metadata.form.notifications.success.content":  "S'han desat els vostres canvis al perfil.",
+
+  // "profile.metadata.form.notifications.success.title": "Profile saved",
+  "profile.metadata.form.notifications.success.title":  "Perfil desat",
+
+  // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
+  "profile.notifications.warning.no-changes.content":  "No s'han fet canvis al perfil.",
+
+  // "profile.notifications.warning.no-changes.title": "No changes",
+  "profile.notifications.warning.no-changes.title":  "Sense canvis",
+
+  // "profile.security.form.error.matching-passwords": "The passwords do not match.",
+  "profile.security.form.error.matching-passwords":  "Les contrasenyes no coincideixen.",
+
+  // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box.",
+  "profile.security.form.info":  "Opcionalment, podeu introduir una nova contrasenya al quadre a continuació i confirmar-la escrivint-la novament al segon quadre.",
+
+  // "profile.security.form.label.password": "Password",
+  "profile.security.form.label.password":  "Contrasenya",
+
+  // "profile.security.form.label.passwordrepeat": "Retype to confirm",
+  "profile.security.form.label.passwordrepeat":  "Rescriviu per confirmar",
+
+  // "profile.security.form.label.current-password": "Current password",
+  "profile.security.form.label.current-password":  "Contrasenya actual",
+
+  // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
+  "profile.security.form.notifications.success.content":  "S'han desat els canvis de contrasenya.",
+
+  // "profile.security.form.notifications.success.title": "Password saved",
+  "profile.security.form.notifications.success.title":  "Contrasenya desada",
+
+  // "profile.security.form.notifications.error.title": "Error changing passwords",
+  "profile.security.form.notifications.error.title":  "Error en canviar la contrasenya",
+
+  // "profile.security.form.notifications.error.change-failed": "An error occurred while trying to change the password. Please check if the current password is correct.",
+  "profile.security.form.notifications.error.change-failed":  "S'ha produït un error en intentar canviar la contrasenya. Si us plau, comproveu si la contrasenya actual és correcta.",
+
+  // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
+  "profile.security.form.notifications.error.not-same":  "Les contrasenyes proporcionades no coincideixen.",
+
+  // "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
+  "profile.security.form.notifications.error.general":  "Si us plau, ompliu els camps obligatoris del formulari de seguretat.",
+
+  // "profile.title": "Update Profile",
+  "profile.title":  "Actualització del perfil",
+
+  // "profile.card.researcher": "Researcher Profile",
+  "profile.card.researcher":  "Perfil d'investigador",
+
+  // "project.listelement.badge": "Research Project",
+  "project.listelement.badge":  "Projecte de Recerca",
+
+  // "project.page.contributor": "Contributors",
+  "project.page.contributor":  "Col·laboradors",
+
+  // "project.page.description": "Description",
+  "project.page.description":  "Descripció",
+
+  // "project.page.edit": "Edit this item",
+  "project.page.edit":  "Editar aquest ítem",
+
+  // "project.page.expectedcompletion": "Expected Completion",
+  "project.page.expectedcompletion":  "Finalització prevista",
+
+  // "project.page.funder": "Funders",
+  "project.page.funder":  "Finançadors",
+
+  // "project.page.id": "ID",
+  "project.page.id":  "ID",
+
+  // "project.page.keyword": "Keywords",
+  "project.page.keyword":  "Paraules clau",
+
+  // "project.page.status": "Status",
+  "project.page.status":  "Estat",
+
+  // "project.page.titleprefix": "Research Project: ",
+  "project.page.titleprefix":  "Projecte de recerca: ",
+
+  // "project.search.results.head": "Project Search Results",
+  "project.search.results.head":  "Resultats de cerca de projectes",
+
+  // "project-relationships.search.results.head": "Project Search Results",
+  "project-relationships.search.results.head":  "Resultats de cerca de projectes",
+
+
+
+  // "publication.listelement.badge": "Publication",
+  "publication.listelement.badge":  "Publicació",
+
+  // "publication.page.description": "Description",
+  "publication.page.description":  "Descripció",
+
+  // "publication.page.edit": "Edit this item",
+  "publication.page.edit":  "Editar aquest ítem",
+
+  // "publication.page.journal-issn": "Journal ISSN",
+  "publication.page.journal-issn":  "ISSN de la revista",
+
+  // "publication.page.journal-title": "Journal Title",
+  "publication.page.journal-title":  "Títol de la revista",
+
+  // "publication.page.publisher": "Publisher",
+  "publication.page.publisher":  "Editor",
+
+  // "publication.page.titleprefix": "Publication: ",
+  "publication.page.titleprefix":  "Publicació: ",
+
+  // "publication.page.volume-title": "Volume Title",
+  "publication.page.volume-title":  "Títol del volum",
+
+  // "publication.search.results.head": "Publication Search Results",
+  "publication.search.results.head":  "Resultats de la cerca de publicacions",
+
+  // "publication-relationships.search.results.head": "Publication Search Results",
+  "publication-relationships.search.results.head":  "Resultats de la cerca de publicacions",
+
+  // "publication.search.title": "Publication Search",
+  "publication.search.title":  "Cerca de publicacions",
+
+
+  // "media-viewer.next": "Next",
+  "media-viewer.next":  "Següent",
+
+  // "media-viewer.previous": "Previous",
+  "media-viewer.previous":  "Anterior",
+
+  // "media-viewer.playlist": "Playlist",
+  "media-viewer.playlist":  "Llista de reproducció",
+
+
+  // "register-email.title": "New user registration",
+  "register-email.title":  "Registre de nou usuari",
+
+  // "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":  "Identitat",
+
+  // "register-page.create-profile.identification.email": "Email Address",
+  "register-page.create-profile.identification.email":  "Adreça de correu electrònic",
+
+  // "register-page.create-profile.identification.first-name": "First Name *",
+  "register-page.create-profile.identification.first-name":  "Nom *",
+
+  // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
+  "register-page.create-profile.identification.first-name.error":  "Si us plau introduïu el Nom",
+
+  // "register-page.create-profile.identification.last-name": "Last Name *",
+  "register-page.create-profile.identification.last-name":  "Cognoms *",
+
+  // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
+  "register-page.create-profile.identification.last-name.error":  "Si us plau introduïu els Cognoms",
+
+  // "register-page.create-profile.identification.contact": "Contact Telephone",
+  "register-page.create-profile.identification.contact":  "Telèfon de contacte",
+
+  // "register-page.create-profile.identification.language": "Language",
+  "register-page.create-profile.identification.language":  "Idioma",
+
+  // "register-page.create-profile.security.header": "Security",
+  "register-page.create-profile.security.header":  "Seguretat",
+
+  // "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box.",
+  "register-page.create-profile.security.info":  "Introduïu una contrasenya al quadre següent i confirmeu-la escrivint-la novament al segon quadre. ",
+
+  // "register-page.create-profile.security.label.password": "Password *",
+  "register-page.create-profile.security.label.password":  "Contrasenya *",
+
+  // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
+  "register-page.create-profile.security.label.passwordrepeat":  "Rescriviu per confirmar *",
+
+  // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
+  "register-page.create-profile.security.error.empty-password":  "Introduïu una contrasenya al quadre a continuació.",
+
+  // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
+  "register-page.create-profile.security.error.matching-passwords":  "Les contrasenyes no coincideixen.",
+
+  // "register-page.create-profile.submit": "Complete Registration",
+  "register-page.create-profile.submit":  "Registre complet",
+
+  // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
+  "register-page.create-profile.submit.error.content":  "S'ha produït un error en registrar un nou usuari.",
+
+  // "register-page.create-profile.submit.error.head": "Registration failed",
+  "register-page.create-profile.submit.error.head":  "El registre ha fallat",
+
+  // "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 registre s'ha fet correctament. Heu iniciat sessió com a usuari creat.",
+
+  // "register-page.create-profile.submit.success.head": "Registration completed",
+  "register-page.create-profile.submit.success.head":  "Registre completat",
+
+
+  // "register-page.registration.header": "New user registration",
+  "register-page.registration.header":  "Registre de nou usuari",
+
+  // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+  "register-page.registration.info":  "Registreu un compte per subscriure's a col·leccions i rebre actualitzacions per correu electrònic, així com enviar nous ítems a DSpace.",
+
+  // "register-page.registration.email": "Email Address *",
+  "register-page.registration.email":  "Adreça de correu electrònic *",
+
+  // "register-page.registration.email.error.required": "Please fill in an email address",
+  "register-page.registration.email.error.required":  "Si us plau, introduïu una adreça de correu electrònic",
+
+  // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
+  "register-page.registration.email.error.pattern":  "Si us plau, introduïu una adreça de correu electrònic vàlida",
+
+  // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
+  "register-page.registration.email.hint":  "Aquesta adreça serà verificada i utilitzada com a nom d'inici de sessió.",
+
+  // "register-page.registration.submit": "Register",
+  "register-page.registration.submit":  "Registrar-se",
+
+  // "register-page.registration.success.head": "Verification email sent",
+  "register-page.registration.success.head":  "El missatge de verificació ha estat enviat",
+
+  // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "register-page.registration.success.content":  "S'ha enviat un correu electrònic a {{ email }} que conté una URL especial i més instruccions.",
+
+  // "register-page.registration.error.head": "Error when trying to register email",
+  "register-page.registration.error.head":  "Error en intentar registrar el correu electrònic",
+
+  // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  "register-page.registration.error.content":  "S'ha produït un error en registrar la següent adreça de correu electrònic: {{ email }}",
+
+  // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
+  "register-page.registration.error.recaptcha":  "Error en intentar autenticar amb recaptcha",
+
+  // "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the <b>Registration and Password recovery</b> (Google reCaptcha) cookies.",
+  "register-page.registration.google-recaptcha.must-accept-cookies":  "Per registrar-se heu d'acceptar les cookies de <b>Registre i recuperació de contrasenya</b> (Google reCaptcha).",
+
+  // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
+  "register-page.registration.google-recaptcha.open-cookie-settings":  "Obrir configuració de cookies",
+
+  // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+  "register-page.registration.google-recaptcha.notification.title":  "Google reCaptcha",
+
+  // "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification",
+  "register-page.registration.google-recaptcha.notification.message.error":  "S'ha produït un error durant la verificació de reCaptcha",
+
+  // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
+  "register-page.registration.google-recaptcha.notification.message.expired":  "Verificació caducada. Verifiqueu de nou.",
+
+  // "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 s'ha pogut trobar una coincidència adequada per al tipus de relació {{ type }} entre els dos ítems",
+
+  // "relationships.add.error.server.content": "The server returned an error",
+  "relationships.add.error.server.content":  "El servidor ha tornat un error",
+
+  // "relationships.add.error.title": "Unable to add relationship",
+  "relationships.add.error.title":  "No es pot afegir una relació",
+
+  // "relationships.isAuthorOf": "Authors",
+  "relationships.isAuthorOf":  "Autors",
+
+  // "relationships.isAuthorOf.Person": "Authors (persons)",
+  "relationships.isAuthorOf.Person":  "Autors (persones)",
+
+  // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
+  "relationships.isAuthorOf.OrgUnit":  "Autors (unitats organitzatives)",
+
+  // "relationships.isIssueOf": "Journal Issues",
+  "relationships.isIssueOf":  "Números de revista",
+
+  // "relationships.isJournalIssueOf": "Journal Issue",
+  "relationships.isJournalIssueOf":  "Número de la revista",
+
+  // "relationships.isJournalOf": "Journals",
+  "relationships.isJournalOf":  "Revistes",
+
+  // "relationships.isOrgUnitOf": "Organizational Units",
+  "relationships.isOrgUnitOf":  "Unitats organitzatives",
+
+  // "relationships.isPersonOf": "Authors",
+  "relationships.isPersonOf":  "Autors",
+
+  // "relationships.isProjectOf": "Research Projects",
+  "relationships.isProjectOf":  "Projectes de recerca",
+
+  // "relationships.isPublicationOf": "Publications",
+  "relationships.isPublicationOf":  "Publicacions",
+
+  // "relationships.isPublicationOfJournalIssue": "Articles",
+  "relationships.isPublicationOfJournalIssue":  "Articles",
+
+  // "relationships.isSingleJournalOf": "Journal",
+  "relationships.isSingleJournalOf":  "Revista",
+
+  // "relationships.isSingleVolumeOf": "Journal Volume",
+  "relationships.isSingleVolumeOf":  "Volum de la revista",
+
+  // "relationships.isVolumeOf": "Journal Volumes",
+  "relationships.isVolumeOf":  "Volums de revistes",
+
+  // "relationships.isContributorOf": "Contributors",
+  "relationships.isContributorOf":  "Col·laboradors",
+
+  // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
+  "relationships.isContributorOf.OrgUnit":  "Col·laborador (Unitat organitzativa)",
+
+  // "relationships.isContributorOf.Person": "Contributor",
+  "relationships.isContributorOf.Person":  "Contribuïdor",
+
+  // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
+  "relationships.isFundingAgencyOf.OrgUnit":  "Finançador",
+
+
+  // "repository.image.logo": "Repository logo",
+  "repository.image.logo":  "Logotip del repositori",
+
+  // "repository.title.prefix": "DSpace Angular :: ",
+  "repository.title.prefix":  "DSpace Angular :: ",
+
+  // "repository.title.prefixDSpace": "DSpace Angular ::",
+  "repository.title.prefixDSpace":  "DSpace Angular ::",
+
+
+  // "resource-policies.add.button": "Add",
+  "resource-policies.add.button":  "Afegir",
+
+  // "resource-policies.add.for.": "Add a new policy",
+  "resource-policies.add.for.":  "Afegir una política nova",
+
+  // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
+  "resource-policies.add.for.bitstream":  "Afegir una nova política d'arxiu",
+
+  // "resource-policies.add.for.bundle": "Add a new Bundle policy",
+  "resource-policies.add.for.bundle":  "Afegir una nova política de paquet",
+
+  // "resource-policies.add.for.item": "Add a new Item policy",
+  "resource-policies.add.for.item":  "Afegir una nova política d'Item",
+
+  // "resource-policies.add.for.community": "Add a new Community policy",
+  "resource-policies.add.for.community":  "Afegir una nova política de Comunitat",
+
+  // "resource-policies.add.for.collection": "Add a new Collection policy",
+  "resource-policies.add.for.collection":  "Afegir una nova política de col·lecció",
+
+  // "resource-policies.create.page.heading": "Create new resource policy for ",
+  "resource-policies.create.page.heading":  "Crear una nova política de recursos per a ",
+
+  // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
+  "resource-policies.create.page.failure.content":  "S'ha produït un error en crear la política de recursos.",
+
+  // "resource-policies.create.page.success.content": "Operation successful",
+  "resource-policies.create.page.success.content":  "Operació completada amb èxit",
+
+  // "resource-policies.create.page.title": "Create new resource policy",
+  "resource-policies.create.page.title":  "Crear nova política de recursos",
+
+  // "resource-policies.delete.btn": "Delete selected",
+  "resource-policies.delete.btn":  "Eliminar seleccionat",
+
+  // "resource-policies.delete.btn.title": "Delete selected resource policies",
+  "resource-policies.delete.btn.title":  "Eliminar les polítiques de recursos seleccionades",
+
+  // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
+  "resource-policies.delete.failure.content":  "S'ha produït un error en eliminar les polítiques de recursos seleccionades.",
+
+  // "resource-policies.delete.success.content": "Operation successful",
+  "resource-policies.delete.success.content":  "Operació completada amb èxit",
+
+  // "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":  "S'ha produït un error en editar la política de recursos.",
+
+  // "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":  "S'ha produït un error en editar el destinatari (usuari o grup) de la política de recursos.",
+
+  // "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":  "S'ha produït un error en editar la política de recursos. El destinatari (usuari o grup) ha estat actualitzat amb èxit",
+
+  // "resource-policies.edit.page.success.content": "Operation successful",
+  "resource-policies.edit.page.success.content":  "Operació completada amb èxit",
+
+  // "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":  "Seleccioneu el tipus d'acció",
+
+  // "resource-policies.form.action-type.required": "You must select the resource policy action.",
+  "resource-policies.form.action-type.required":  "Heu de seleccionar l'acció de la política de recursos.",
+
+  // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
+  "resource-policies.form.eperson-group-list.label":  "L'usuari o grup al qual se li atorgarà el permís",
+
+  // "resource-policies.form.eperson-group-list.select.btn": "Select",
+  "resource-policies.form.eperson-group-list.select.btn":  "Seleccionar",
+
+  // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
+  "resource-policies.form.eperson-group-list.tab.eperson":  "Cerca un usuari",
+
+  // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
+  "resource-policies.form.eperson-group-list.tab.group":  "Cerca un grup",
+
+  // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
+  "resource-policies.form.eperson-group-list.table.headers.action":  "Acció",
+
+  // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
+  "resource-policies.form.eperson-group-list.table.headers.id":  "ID",
+
+  // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
+  "resource-policies.form.eperson-group-list.table.headers.name":  "Nom",
+
+  // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
+  "resource-policies.form.eperson-group-list.modal.header":  "No es pot canviar el tipus",
+
+  // "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 és possible canviar un usuari per un grup.",
+
+  // "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 és possible canviar un grup per un usuari.",
+
+  // "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":  "Esborra la política de recursos actual i creeu-ne una de nova amb el tipus desitjat.",
+
+  // "resource-policies.form.eperson-group-list.modal.close": "Ok",
+  "resource-policies.form.eperson-group-list.modal.close":  "D'acord",
+
+  // "resource-policies.form.date.end.label": "End Date",
+  "resource-policies.form.date.end.label":  "Data de finalització",
+
+  // "resource-policies.form.date.start.label": "Start Date",
+  "resource-policies.form.date.start.label":  "Data d'inici",
+
+  // "resource-policies.form.description.label": "Description",
+  "resource-policies.form.description.label":  "Descripció",
+
+  // "resource-policies.form.name.label": "Name",
+  "resource-policies.form.name.label":  "Nom",
+
+  // "resource-policies.form.policy-type.label": "Select the policy type",
+  "resource-policies.form.policy-type.label":  "Seleccioneu el tipus de política",
+
+  // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
+  "resource-policies.form.policy-type.required":  "Heu de seleccionar el tipus de política de recursos.",
+
+  // "resource-policies.table.headers.action": "Action",
+  "resource-policies.table.headers.action":  "Acció",
+
+  // "resource-policies.table.headers.date.end": "End Date",
+  "resource-policies.table.headers.date.end":  "Data final",
+
+  // "resource-policies.table.headers.date.start": "Start Date",
+  "resource-policies.table.headers.date.start":  "Data d'inici",
+
+  // "resource-policies.table.headers.edit": "Edit",
+  "resource-policies.table.headers.edit":  "Editar",
+
+  // "resource-policies.table.headers.edit.group": "Edit group",
+  "resource-policies.table.headers.edit.group":  "Editar grup",
+
+  // "resource-policies.table.headers.edit.policy": "Edit policy",
+  "resource-policies.table.headers.edit.policy":  "Editar política",
+
+  // "resource-policies.table.headers.eperson": "EPerson",
+  "resource-policies.table.headers.eperson":  "Usuari",
+
+  // "resource-policies.table.headers.group": "Group",
+  "resource-policies.table.headers.group":  "Grup",
+
+  // "resource-policies.table.headers.id": "ID",
+  "resource-policies.table.headers.id":  "ID",
+
+  // "resource-policies.table.headers.name": "Name",
+  "resource-policies.table.headers.name":  "Nom",
+
+  // "resource-policies.table.headers.policyType": "type",
+  "resource-policies.table.headers.policyType":  "Tipus",
+
+  // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
+  "resource-policies.table.headers.title.for.bitstream":  "Polítiques per a Arxius",
+
+  // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
+  "resource-policies.table.headers.title.for.bundle":  "Polítiques per al paquet",
+
+  // "resource-policies.table.headers.title.for.item": "Policies for Item",
+  "resource-policies.table.headers.title.for.item":  "Polítiques per a l'ítem",
+
+  // "resource-policies.table.headers.title.for.community": "Policies for Community",
+  "resource-policies.table.headers.title.for.community":  "Polítiques per a la comunitat",
+
+  // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
+  "resource-policies.table.headers.title.for.collection":  "Polítiques per a la col·lecció",
+
+
+
+  // "search.description": "",
+  "search.description":  "",
+
+  // "search.switch-configuration.title": "Show",
+  "search.switch-configuration.title":  "Mostrar",
+
+  // "search.title": "Search",
+  "search.title":  "Cerca",
+
+  // "search.breadcrumbs": "Search",
+  "search.breadcrumbs":  "Cerca",
+
+  // "search.search-form.placeholder": "Search the repository ...",
+  "search.search-form.placeholder":  "Cerca al repositori ...",
+
+
+  // "search.filters.applied.f.author": "Author",
+  "search.filters.applied.f.author":  "Autor",
+
+  // "search.filters.applied.f.dateIssued.max": "End date",
+  "search.filters.applied.f.dateIssued.max":  "Data de finalització",
+
+  // "search.filters.applied.f.dateIssued.min": "Start date",
+  "search.filters.applied.f.dateIssued.min":  "Data d'inici",
+
+  // "search.filters.applied.f.dateSubmitted": "Date submitted",
+  "search.filters.applied.f.dateSubmitted":  "Data d'enviament",
+
+  // "search.filters.applied.f.discoverable": "Non-discoverable",
+  "search.filters.applied.f.discoverable":  "Privat",
+
+  // "search.filters.applied.f.entityType": "Item Type",
+  "search.filters.applied.f.entityType":  "Tipus d'ítem",
+
+  // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
+  "search.filters.applied.f.has_content_in_original_bundle":  "Té fitxers",
+
+  // "search.filters.applied.f.itemtype": "Type",
+  "search.filters.applied.f.itemtype":  "Tipus",
+
+  // "search.filters.applied.f.namedresourcetype": "Status",
+  "search.filters.applied.f.namedresourcetype":  "Estat",
+
+  // "search.filters.applied.f.subject": "Subject",
+  "search.filters.applied.f.subject":  "Matèria",
+
+  // "search.filters.applied.f.submitter": "Submitter",
+  "search.filters.applied.f.submitter":  "Remitent",
+
+  // "search.filters.applied.f.jobTitle": "Job Title",
+  "search.filters.applied.f.jobTitle":  "Lloc de treball",
+
+  // "search.filters.applied.f.birthDate.max": "End birth date",
+  "search.filters.applied.f.birthDate.max":  "Data de naixement, final",
+
+  // "search.filters.applied.f.birthDate.min": "Start birth date",
+  "search.filters.applied.f.birthDate.min":  "Data de naixement, inicial",
+
+  // "search.filters.applied.f.withdrawn": "Withdrawn",
+  "search.filters.applied.f.withdrawn":  "Retirat",
+
+
+
+  // "search.filters.filter.author.head": "Author",
+  "search.filters.filter.author.head":  "Autor",
+
+  // "search.filters.filter.author.placeholder": "Author name",
+  "search.filters.filter.author.placeholder":  "Nom d'autor",
+
+  // "search.filters.filter.author.label": "Search author name",
+  "search.filters.filter.author.label":  "Cerca per nom d'autor",
+
+  // "search.filters.filter.birthDate.head": "Birth Date",
+  "search.filters.filter.birthDate.head":  "Data de naixement",
+
+  // "search.filters.filter.birthDate.placeholder": "Birth Date",
+  "search.filters.filter.birthDate.placeholder":  "Data de naixement",
+
+  // "search.filters.filter.birthDate.label": "Search birth date",
+  "search.filters.filter.birthDate.label":  "Cerca per data de naixement",
+
+  // "search.filters.filter.collapse": "Collapse filter",
+  "search.filters.filter.collapse":  "Contraure filtre",
+
+  // "search.filters.filter.creativeDatePublished.head": "Date Published",
+  "search.filters.filter.creativeDatePublished.head":  "Data de publicació",
+
+  // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
+  "search.filters.filter.creativeDatePublished.placeholder":  "Data de publicació",
+
+  // "search.filters.filter.creativeDatePublished.label": "Search date published",
+  "search.filters.filter.creativeDatePublished.label":  "Cerca per data de publicació",
+
+  // "search.filters.filter.creativeWorkEditor.head": "Editor",
+  "search.filters.filter.creativeWorkEditor.head":  "Editor",
+
+  // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
+  "search.filters.filter.creativeWorkEditor.placeholder":  "Editor",
+
+  // "search.filters.filter.creativeWorkEditor.label": "Search editor",
+  "search.filters.filter.creativeWorkEditor.label":  "Cerca per Editor",
+
+  // "search.filters.filter.creativeWorkKeywords.head": "Subject",
+  "search.filters.filter.creativeWorkKeywords.head":  "Matèries",
+
+  // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
+  "search.filters.filter.creativeWorkKeywords.placeholder":  "Matèries",
+
+  // "search.filters.filter.creativeWorkKeywords.label": "Search subject",
+  "search.filters.filter.creativeWorkKeywords.label":  "Cerca per Matèries",
+
+  // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.head":  "Editor",
+
+  // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.placeholder":  "Editor",
+
+  // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
+  "search.filters.filter.creativeWorkPublisher.label":  "Cerca per Editor",
+
+  // "search.filters.filter.dateIssued.head": "Date",
+  "search.filters.filter.dateIssued.head":  "Data",
+
+  // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
+  "search.filters.filter.dateIssued.max.placeholder":  "Data màxima",
+
+  // "search.filters.filter.dateIssued.max.label": "End",
+  "search.filters.filter.dateIssued.max.label":  "Fi",
+
+  // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
+  "search.filters.filter.dateIssued.min.placeholder":  "Data mínima",
+
+  // "search.filters.filter.dateIssued.min.label": "Start",
+  "search.filters.filter.dateIssued.min.label":  "Començament",
+
+  // "search.filters.filter.dateSubmitted.head": "Date submitted",
+  "search.filters.filter.dateSubmitted.head":  "Data d'enviament",
+
+  // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
+  "search.filters.filter.dateSubmitted.placeholder":  "Data d'enviament",
+
+  // "search.filters.filter.dateSubmitted.label": "Search date submitted",
+  "search.filters.filter.dateSubmitted.label":  "Cerca per Data d'enviament",
+
+  // "search.filters.filter.discoverable.head": "Non-discoverable",
+  "search.filters.filter.discoverable.head":  "Privat",
+
+  // "search.filters.filter.withdrawn.head": "Withdrawn",
+  "search.filters.filter.withdrawn.head":  "Retirat",
+
+  // "search.filters.filter.entityType.head": "Item Type",
+  "search.filters.filter.entityType.head":  "Tipus d'ítem",
+
+  // "search.filters.filter.entityType.placeholder": "Item Type",
+  "search.filters.filter.entityType.placeholder":  "Tipus d'ítem",
+
+  // "search.filters.filter.entityType.label": "Search item type",
+  "search.filters.filter.entityType.label":  "Cerca per tipus d'ítem",
+
+  // "search.filters.filter.expand": "Expand filter",
+  "search.filters.filter.expand":  "Expandir filtre",
+
+  // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
+  "search.filters.filter.has_content_in_original_bundle.head":  "Té fitxers",
+
+  // "search.filters.filter.itemtype.head": "Type",
+  "search.filters.filter.itemtype.head":  "Tipus",
+
+  // "search.filters.filter.itemtype.placeholder": "Type",
+  "search.filters.filter.itemtype.placeholder":  "Tipus",
+
+  // "search.filters.filter.itemtype.label": "Search type",
+  "search.filters.filter.itemtype.label":  "Cerca per Tipus",
+
+  // "search.filters.filter.jobTitle.head": "Job Title",
+  "search.filters.filter.jobTitle.head":  "Lloc de treball",
+
+  // "search.filters.filter.jobTitle.placeholder": "Job Title",
+  "search.filters.filter.jobTitle.placeholder":  "Lloc de treball",
+
+  // "search.filters.filter.jobTitle.label": "Search job title",
+  "search.filters.filter.jobTitle.label":  "Cerca per lloc de treball",
+
+  // "search.filters.filter.knowsLanguage.head": "Known language",
+  "search.filters.filter.knowsLanguage.head":  "Idioma conegut",
+
+  // "search.filters.filter.knowsLanguage.placeholder": "Known language",
+  "search.filters.filter.knowsLanguage.placeholder":  "Idioma conegut",
+
+  // "search.filters.filter.knowsLanguage.label": "Search known language",
+  "search.filters.filter.knowsLanguage.label":  "Cerca per idioma conegut",
+
+  // "search.filters.filter.namedresourcetype.head": "Status",
+  "search.filters.filter.namedresourcetype.head":  "Estat",
+
+  // "search.filters.filter.namedresourcetype.placeholder": "Status",
+  "search.filters.filter.namedresourcetype.placeholder":  "Estat",
+
+  // "search.filters.filter.namedresourcetype.label": "Search status",
+  "search.filters.filter.namedresourcetype.label":  "Cerca per Estat",
+
+  // "search.filters.filter.objectpeople.head": "People",
+  "search.filters.filter.objectpeople.head":  "Persones",
+
+  // "search.filters.filter.objectpeople.placeholder": "People",
+  "search.filters.filter.objectpeople.placeholder":  "Persones",
+
+  // "search.filters.filter.objectpeople.label": "Search people",
+  "search.filters.filter.objectpeople.label":  "Cerca per Persones",
+
+  // "search.filters.filter.organizationAddressCountry.head": "Country",
+  "search.filters.filter.organizationAddressCountry.head":  "País",
+
+  // "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":  "Cerca per País",
+
+  // "search.filters.filter.organizationAddressLocality.head": "City",
+  "search.filters.filter.organizationAddressLocality.head":  "Ciutat",
+
+  // "search.filters.filter.organizationAddressLocality.placeholder": "City",
+  "search.filters.filter.organizationAddressLocality.placeholder":  "Ciutat",
+
+  // "search.filters.filter.organizationAddressLocality.label": "Search city",
+  "search.filters.filter.organizationAddressLocality.label":  "Cerca per ciutat",
+
+  // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.head":  "Data de fundació",
+
+  // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.placeholder":  "Data de fundació",
+
+  // "search.filters.filter.organizationFoundingDate.label": "Search date founded",
+  "search.filters.filter.organizationFoundingDate.label":  "Cerca per Data de fundació",
+
+  // "search.filters.filter.scope.head": "Scope",
+  "search.filters.filter.scope.head":  "Abast",
+
+  // "search.filters.filter.scope.placeholder": "Scope filter",
+  "search.filters.filter.scope.placeholder":  "Filtre d'abast",
+
+  // "search.filters.filter.scope.label": "Search scope filter",
+  "search.filters.filter.scope.label":  "Filtre d'abast de cerca",
+
+  // "search.filters.filter.show-less": "Collapse",
+  "search.filters.filter.show-less":  "Contraure",
+
+  // "search.filters.filter.show-more": "Show more",
+  "search.filters.filter.show-more":  "Mostrar més",
+
+  // "search.filters.filter.subject.head": "Subject",
+  "search.filters.filter.subject.head":  "Matèries",
+
+  // "search.filters.filter.subject.placeholder": "Subject",
+  "search.filters.filter.subject.placeholder":  "Matèries",
+
+  // "search.filters.filter.subject.label": "Search subject",
+  "search.filters.filter.subject.label":  "Cerca de matèries",
+
+  // "search.filters.filter.submitter.head": "Submitter",
+  "search.filters.filter.submitter.head":  "Remitent",
+
+  // "search.filters.filter.submitter.placeholder": "Submitter",
+  "search.filters.filter.submitter.placeholder":  "Remitent",
+
+  // "search.filters.filter.submitter.label": "Search submitter",
+  "search.filters.filter.submitter.label":  "Remitent de cerca",
+
+  // "search.filters.filter.show-tree": "Browse {{ name }} tree",
+  "search.filters.filter.show-tree": "Navega per l'arbre {{ name }}",
+
+
+  // "search.filters.entityType.JournalIssue": "Journal Issue",
+  "search.filters.entityType.JournalIssue":  "Número de la revista",
+
+  // "search.filters.entityType.JournalVolume": "Journal Volume",
+  "search.filters.entityType.JournalVolume":  "Volum de la revista",
+
+  // "search.filters.entityType.OrgUnit": "Organizational Unit",
+  "search.filters.entityType.OrgUnit":  "Unitat organitzativa",
+
+  // "search.filters.has_content_in_original_bundle.true": "Yes",
+  "search.filters.has_content_in_original_bundle.true":  "Sí",
+
+  // "search.filters.has_content_in_original_bundle.false": "No",
+  "search.filters.has_content_in_original_bundle.false":  "No",
+
+  // "search.filters.discoverable.true": "No",
+  "search.filters.discoverable.true":  "No",
+
+  // "search.filters.discoverable.false": "Yes",
+  "search.filters.discoverable.false":  "Sí",
+
+  // "search.filters.withdrawn.true": "Yes",
+  "search.filters.withdrawn.true":  "Sí",
+
+  // "search.filters.withdrawn.false": "No",
+  "search.filters.withdrawn.false":  "No",
+
+
+  // "search.filters.head": "Filters",
+  "search.filters.head":  "Filtres",
+
+  // "search.filters.reset": "Reset filters",
+  "search.filters.reset":  "Restablir filtres",
+
+  // "search.filters.search.submit": "Submit",
+  "search.filters.search.submit":  "Enviar",
+
+
+
+  // "search.form.search": "Search",
+  "search.form.search":  "Cerca",
+
+  // "search.form.search_dspace": "All repository",
+  "search.form.search_dspace":  "Tot el repositori",
+
+  // "search.form.scope.all": "All of DSpace",
+  "search.form.scope.all":  "Tot DSpace",
+
+
+
+  // "search.results.head": "Search Results",
+  "search.results.head":  "Resultats de la cerca",
+
+  // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
+  "search.results.no-results":  "La cerca no ha produït resultats. Té problemes per trobar el que busca? Intenteu posar",
+
+  // "search.results.no-results-link": "quotes around it",
+  "search.results.no-results-link":  "cites al seu voltant",
+
+  // "search.results.empty": "Your search returned no results.",
+  "search.results.empty":  "La vostra cerca no ha produït resultats.",
+
+  // "search.results.view-result": "View",
+  "search.results.view-result":  "Veure",
+
+  // "search.results.response.500": "An error occurred during query execution, please try again later",
+  "search.results.response.500":  "S'ha produït un error durant l'execució de la consulta, torneu a provar més tard",
+
+  // "default.search.results.head": "Search Results",
+  "default.search.results.head":  "Resultats de la cerca",
+
+  // "default-relationships.search.results.head": "Search Results",
+  "default-relationships.search.results.head":  "Resultats de la cerca",
+
+
+  // "search.sidebar.close": "Back to results",
+  "search.sidebar.close":  "Tornar a resultats",
+
+  // "search.sidebar.filters.title": "Filters",
+  "search.sidebar.filters.title":  "Filtres",
+
+  // "search.sidebar.open": "Search Tools",
+  "search.sidebar.open":  "Eines de cerca",
+
+  // "search.sidebar.results": "results",
+  "search.sidebar.results":  "resultats",
+
+  // "search.sidebar.settings.rpp": "Results per page",
+  "search.sidebar.settings.rpp":  "Resultats per pàgina",
+
+  // "search.sidebar.settings.sort-by": "Sort By",
+  "search.sidebar.settings.sort-by":  "Ordenar per",
+
+  // "search.sidebar.settings.title": "Settings",
+  "search.sidebar.settings.title":  "Configuració",
+
+
+
+  // "search.view-switch.show-detail": "Show detail",
+  "search.view-switch.show-detail":  "Mostrar detall",
+
+  // "search.view-switch.show-grid": "Show as grid",
+  "search.view-switch.show-grid":  "Mostra com a quadrícula",
+
+  // "search.view-switch.show-list": "Show as list",
+  "search.view-switch.show-list":  "Mostra com a llista",
+
+
+
+  // "sorting.ASC": "Ascending",
+  "sorting.ASC":  "Ascendent",
+
+  // "sorting.DESC": "Descending",
+  "sorting.DESC":  "Descendent",
+
+  // "sorting.dc.title.ASC": "Title Ascending",
+  "sorting.dc.title.ASC":  "Títol Ascendent",
+
+  // "sorting.dc.title.DESC": "Title Descending",
+  "sorting.dc.title.DESC":  "Títol descendent",
+
+  // "sorting.score.ASC": "Least Relevant",
+  "sorting.score.ASC":  "El menys rellevant",
+
+  // "sorting.score.DESC": "Most Relevant",
+  "sorting.score.DESC":  "El més rellevant",
+
+  // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
+  "sorting.dc.date.issued.ASC":  "Data de publicació Ascendent",
+
+  // "sorting.dc.date.issued.DESC": "Date Issued Descending",
+  "sorting.dc.date.issued.DESC":  "Data de publicació Descendent",
+
+  // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
+  "sorting.dc.date.accessioned.ASC":  "Data d'enviament Ascendent",
+
+  // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
+  "sorting.dc.date.accessioned.DESC":  "Data d'enviament Descendent",
+
+  // "sorting.lastModified.ASC": "Last modified Ascending",
+  "sorting.lastModified.ASC":  "Última modificació Ascendent",
+
+  // "sorting.lastModified.DESC": "Last modified Descending",
+  "sorting.lastModified.DESC":  "Última modificació Descendent",
+
+
+  // "statistics.title": "Statistics",
+  "statistics.title":  "Estadístiques",
+
+  // "statistics.header": "Statistics for {{ scope }}",
+  "statistics.header":  "Estadístiques de {{ scope }}",
+
+  // "statistics.breadcrumbs": "Statistics",
+  "statistics.breadcrumbs":  "Estadístiques",
+
+  // "statistics.page.no-data": "No data available",
+  "statistics.page.no-data":  "Dades no disponibles",
+
+  // "statistics.table.no-data": "No data available",
+  "statistics.table.no-data":  "Dades no disponibles",
+
+  // "statistics.table.title.TotalVisits": "Total visits",
+  "statistics.table.title.TotalVisits":  "Visites totals",
+
+  // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
+  "statistics.table.title.TotalVisitsPerMonth":  "Visites totals per mes",
+
+  // "statistics.table.title.TotalDownloads": "File Visits",
+  "statistics.table.title.TotalDownloads":  "Visites del fitxer",
+
+  // "statistics.table.title.TopCountries": "Top country views",
+  "statistics.table.title.TopCountries":  "Vistes principals per país",
+
+  // "statistics.table.title.TopCities": "Top city views",
+  "statistics.table.title.TopCities":  "Visites principals per ciutat",
+
+  // "statistics.table.header.views": "Views",
+  "statistics.table.header.views":  "Visites",
+
+
+
+  // "submission.edit.breadcrumbs": "Edit Submission",
+  "submission.edit.breadcrumbs":  "Editar enviament",
+
+  // "submission.edit.title": "Edit Submission",
+  "submission.edit.title":  "Editar enviament",
+
+  // "submission.general.cancel": "Cancel",
+  "submission.general.cancel":  "Cancel·lar",
+
+  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
+  "submission.general.cannot_submit":  "No teniu els permisos per fer un enviament nou.",
+
+  // "submission.general.deposit": "Deposit",
+  "submission.general.deposit":  "Dipositar",
+
+  // "submission.general.discard.confirm.cancel": "Cancel",
+  "submission.general.discard.confirm.cancel":  "Cancel·lar",
+
+  // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.general.discard.confirm.info":  "Aquesta operació no es pot desfer. Esteu segur?",
+
+  // "submission.general.discard.confirm.submit": "Yes, I'm sure",
+  "submission.general.discard.confirm.submit":  "Sí que estic segur",
+
+  // "submission.general.discard.confirm.title": "Discard submission",
+  "submission.general.discard.confirm.title":  "Descartar enviament",
+
+  // "submission.general.discard.submit": "Discard",
+  "submission.general.discard.submit":  "Descartar",
+
+  // "submission.general.info.saved": "Saved",
+  "submission.general.info.saved":  "Guardat",
+
+  // "submission.general.info.pending-changes": "Unsaved changes",
+  "submission.general.info.pending-changes":  "Canvis no desats",
+
+  // "submission.general.save": "Save",
+  "submission.general.save":  "Guardar",
+
+  // "submission.general.save-later": "Save for later",
+  "submission.general.save-later":  "Desa per més endavant",
+
+
+  // "submission.import-external.page.title": "Import metadata from an external source",
+  "submission.import-external.page.title":  "Importar metadades des d'una font externa",
+
+  // "submission.import-external.title": "Import metadata from an external source",
+  "submission.import-external.title":  "Importar metadades des d'una font externa",
+
+  // "submission.import-external.title.Journal": "Import a journal from an external source",
+  "submission.import-external.title.Journal":  "Importar una revista des d'una font 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 des d'una font externa",
+
+  // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
+  "submission.import-external.title.JournalVolume":  "Importar un volum de revista des d'una font externa",
+
+  // "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
+  "submission.import-external.title.OrgUnit":  "Importar editor des d'una font externa",
+
+  // "submission.import-external.title.Person": "Import a person from an external source",
+  "submission.import-external.title.Person":  "Importar una persona des d'una font externa",
+
+  // "submission.import-external.title.Project": "Import a project from an external source",
+  "submission.import-external.title.Project":  "Importar projectes des d'una font externa",
+
+  // "submission.import-external.title.Publication": "Import a publication from an external source",
+  "submission.import-external.title.Publication":  "Importar una publicació des d'una font externa",
+
+  // "submission.import-external.title.none": "Import metadata from an external source",
+  "submission.import-external.title.none":  "Importar metadades des d'una font 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":  "Introduïu una consulta a dalt per buscar ítems de la web per importar-los a DSpace.",
+
+  // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
+  "submission.import-external.back-to-my-dspace":  "Tornar al meu DSpace",
+
+  // "submission.import-external.search.placeholder": "Search the external source",
+  "submission.import-external.search.placeholder":  "Cerca font externa",
+
+  // "submission.import-external.search.button": "Search",
+  "submission.import-external.search.button":  "Cerca",
+
+  // "submission.import-external.search.button.hint": "Write some words to search",
+  "submission.import-external.search.button.hint":  "Escriviu algunes paraules per cercar",
+
+  // "submission.import-external.search.source.hint": "Pick an external source",
+  "submission.import-external.search.source.hint":  "Trieu una font 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.datacite": "DataCite",
+  "submission.import-external.source.datacite": "DataCite",
+
+  // "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 Patents (EPO)",
+
+  // "submission.import-external.source.loading": "Loading ...",
+  "submission.import-external.source.loading":  "Carregant ...",
+
+  // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
+  "submission.import-external.source.sherpaJournal":  "Revistes SHERPA",
+
+  // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
+  "submission.import-external.source.sherpaJournalIssn":  "Revistes SHERPA per ISSN",
+
+  // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+  "submission.import-external.source.sherpaPublisher":  "Editors SHERPA",
+
+  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
+  "submission.import-external.source.openAIREFunding":  "API de Finançament d'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":  "Noms de la Biblioteca del Congrés",
+
+  // "submission.import-external.preview.title": "Item Preview",
+  "submission.import-external.preview.title":  "Vista prèvia de l'ítem",
+
+  // "submission.import-external.preview.title.Publication": "Publication Preview",
+  "submission.import-external.preview.title.Publication":  "Previsualització de Publicació",
+
+  // "submission.import-external.preview.title.none": "Item Preview",
+  "submission.import-external.preview.title.none":  "Previsualització d'Ítem",
+
+  // "submission.import-external.preview.title.Journal": "Journal Preview",
+  "submission.import-external.preview.title.Journal":  "Previsualització de Revista",
+
+  // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
+  "submission.import-external.preview.title.OrgUnit":  "Previsualització d'Unitat organitzativa",
+
+  // "submission.import-external.preview.title.Person": "Person Preview",
+  "submission.import-external.preview.title.Person":  "Previsualització de Persona",
+
+  // "submission.import-external.preview.title.Project": "Project Preview",
+  "submission.import-external.preview.title.Project":  "Previsualització de Projecte",
+
+  // "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":  "Les metadades següents s'han importat d'una font externa. S'omplirà prèviament quan inicieu l'enviament.",
+
+  // "submission.import-external.preview.button.import": "Start submission",
+  "submission.import-external.preview.button.import":  "Iniciar enviament",
+
+  // "submission.import-external.preview.error.import.title": "Submission error",
+  "submission.import-external.preview.error.import.title":  "Error d'enviament",
+
+  // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
+  "submission.import-external.preview.error.import.body":  "S'ha produït un error durant el procés d'importació de l'entrada de font externa.",
+
+  // "submission.sections.describe.relationship-lookup.close": "Close",
+  "submission.sections.describe.relationship-lookup.close":  "Tancar",
+
+  // "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 afegida amb èxit a la selecció",
+
+  // "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ó remota d'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ó 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ó 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ó remota de volum 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":  "Projecte",
+
+  // "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ó remota d'í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ó remota d'esdeveniment",
+
+  // "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ó remota de producte",
+
+  // "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ó remota d'equipament",
+
+  // "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ó remota d'unitat organitzativa",
+
+  // "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ó remota de finançament",
+
+  // "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ó 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ó remota de patent",
+
+  // "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ó remota de projecte",
+
+  // "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ó remota de publicació",
+
+  // "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":  "Nova entitat afegida!",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title":  "Projecte",
+
+  // "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 Finançament",
+
+  // "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ó remota d'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 afegit amb èxit a la selecció",
+
+  // "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 extern importat i afegit amb èxit a la selecció",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority":  "Autoritat",
+
+  // "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":  "Importa com una nova entrada d'autoritat local",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel":  "Cancel·lar",
+
+  // "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":  "Seleccioneu una col·lecció per importar entrades noves",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities":  "Entitats",
+
+  // "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 com una nova entitat 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":  "Importa des de 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":  "Important des d'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 des de 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 des de 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":  "Importa des de 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":  "Important des d'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ó 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 afegida amb èxit a la selecció",
+
+  // "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 i afegida amb èxit a la selecció",
+
+  // "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ó remota de número 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":  "S'ha afegit localment un número de revista a la selecció.",
+
+  // "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":  "S'ha importat amb èxit i s'ha afegit externament un número de revista a la selecció.",
+
+  // "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ó remota de volum 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":  "S'ha afegit amb èxit el volum de la revista local a la selecció.",
+
+  // "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":  "S'ha importat i afegit amb èxit un volum de revista extern a la selecció",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select":  "Seleccioneu una coincidència local:",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all":  "Deseleccionar tot",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page":  "Desseleccionar pàgina",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
+  "submission.sections.describe.relationship-lookup.search-tab.loading":  "Carregant...",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder":  "Consulta de cerca",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
+  "submission.sections.describe.relationship-lookup.search-tab.search":  "Anar",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder":  "Cerca...",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
+  "submission.sections.describe.relationship-lookup.search-tab.select-all":  "Seleccionar tot",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
+  "submission.sections.describe.relationship-lookup.search-tab.select-page":  "Selecciona la pàgina",
+
+  // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
+  "submission.sections.describe.relationship-lookup.selected":  "{{ size }} ítems seleccionats",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication":  "Autors locals ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication":  "Revistes locals ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project":  "Projectes locals ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication":  "Publicacions locals ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person":  "Autors locals ({{ 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":  "Unitats organitzatives locals ({{ 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":  "Paquets de dades locals ({{ 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":  "Fitxers de dades locals ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal":  "Revistes locals ({{ 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 locals ({{ 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 locals ({{ 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":  "Volums de revista locals ({{ 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":  "Volums de revista locals ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal":  "Revistes 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":  "Editors 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":  "LC Names ({{ 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":  "Cerca d'agències de finançament",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication":  "Cerca de finançament",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf":  "Cerca d'unitats organitzatives",
+
+  // "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 Finançament",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication":  "Projectes",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject":  "Finançador del Projecte",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publicació de l'autor",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding":  "API OpenAIRE de Finançament",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication":  "Projecte",
+
+  // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication":  "Projectes",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject":  "Finançador del Projecte",
+
+
+
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder":  "Cerca...",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title":  "Selecció actual ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication":  "Números de revista",
+  // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue":  "Números de revista",
+
+  // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication":  "Volums de revista",
+  // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume":  "Volums de revista",
+
+  // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication":  "Revistes",
+
+  // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication":  "Autors",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication":  "Agència finançadora",
+  // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
+  "submission.sections.describe.relationship-lookup.title.Project":  "Projectes",
+
+  // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
+  "submission.sections.describe.relationship-lookup.title.Publication":  "Publicacions",
+
+  // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
+  "submission.sections.describe.relationship-lookup.title.Person":  "Autors",
+
+  // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit":  "Unitats organitzatives",
+
+  // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
+  "submission.sections.describe.relationship-lookup.title.DataPackage":  "Paquets de dades",
+
+  // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
+  "submission.sections.describe.relationship-lookup.title.DataFile":  "Fitxers d'informació",
+
+  // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency":  "Agència finançadora",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication":  "Finançament",
+
+  // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf":  "Unitat organitzativa matriu",
+
+  // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publicació",
+
+  // "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":  "Configuració",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection":  "La vostra selecció està actualment buida.",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication":  "Autors seleccionats",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication":  "Revistes seleccionades",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication":  "Volum de revista seleccionada",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project":  "Projectes seleccionats",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication":  "Publicacions seleccionades",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person":  "Autors seleccionats",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit":  "Unitats organitzatives seleccionades",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage":  "Paquets de dades seleccionades",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile":  "Fitxers de dades seleccionades",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal":  "Revistes seleccionades",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication":  "Número de revista seleccionat",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume":  "Volums de revista seleccionats",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication":  "Agències de finançament seleccionades",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication":  "Finançaments seleccionats",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue":  "Número seleccionat",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf":  "Unitat organitzativa seleccionada",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal":  "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher":  "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid":  "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2":  "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname":  "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed":  "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv":  "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref":  "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo":  "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus":  "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo":  "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos":  "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title":  "Resultats de la cerca",
+
+  // "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":  "Li agradaria desar \"{{ value }}\" com una variant de nom per a aquesta persona perquè vostè i altres puguin reutilitzar-lo per a enviaments futurs? Si no ho fa, encara pot usar-lo per a aquest enviament.",
+
+  // "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 nova variant de nom",
+
+  // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline":  "Usar només per a aquest enviament",
+
+  // "submission.sections.ccLicense.type": "License Type",
+  "submission.sections.ccLicense.type":  "Tipus de llicència",
+
+  // "submission.sections.ccLicense.select": "Select a license type…",
+  "submission.sections.ccLicense.select":  "Seleccioneu un tipus de llicència…",
+
+  // "submission.sections.ccLicense.change": "Change your license type…",
+  "submission.sections.ccLicense.change":  "Canvieu el vostre tipus de llicència…",
+
+  // "submission.sections.ccLicense.none": "No licenses available",
+  "submission.sections.ccLicense.none":  "No hi ha llicències disponibles",
+
+  // "submission.sections.ccLicense.option.select": "Select an option…",
+  "submission.sections.ccLicense.option.select":  "Seleccioneu una opció…",
+
+  // "submission.sections.ccLicense.link": "You’ve selected the following license:",
+  "submission.sections.ccLicense.link":  "Ha seleccionat la llicència següent:",
+
+  // "submission.sections.ccLicense.confirmation": "I grant the license above",
+  "submission.sections.ccLicense.confirmation":  "Concedeixo la llicència",
+
+  // "submission.sections.general.add-more": "Add more",
+  "submission.sections.general.add-more":  "Afegir 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": "El dipòsit no s'ha pogut completar per errors al formulari.<br>Omple tots els camps obligatoris per completar el dipòsit",
+
+  // "submission.sections.general.collection": "Collection",
+  "submission.sections.general.collection":  "Col·lecció",
+
+  // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
+  "submission.sections.general.deposit_error_notice":  "S'ha produït un problema en enviar l'ítem. Torneu-ho a provar més tard.",
+
+  // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
+  "submission.sections.general.deposit_success_notice":  "Enviament dipositat amb èxit.",
+
+  // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
+  "submission.sections.general.discard_error_notice":  "S'ha produït un problema en descartar l'ítem. Torneu-ho a provar més tard.",
+
+  // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
+  "submission.sections.general.discard_success_notice":  "Enviament descartat amb èxit.",
+
+  // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
+  "submission.sections.general.metadata-extracted":  "S'han extret i han afegit noves metadades a la secció <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":  "S'ha afegit una nova secció <strong>{{ sectionId }}</strong> a l'enviament.",
+
+  // "submission.sections.general.no-collection": "No collection found",
+  "submission.sections.general.no-collection":  "No s'ha trobat cap col·lecció",
+
+  // "submission.sections.general.no-sections": "No options available",
+  "submission.sections.general.no-sections":  "No hi ha opcions 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":  "S'ha produït un problema en desar l'ítem. Torneu-ho a provar més tard.",
+
+  // "submission.sections.general.save_success_notice": "Submission saved successfully.",
+  "submission.sections.general.save_success_notice":  "Enviament desat amb èxit.",
+
+  // "submission.sections.general.search-collection": "Search for a collection",
+  "submission.sections.general.search-collection":  "Cerca una col·lecció",
+
+  // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
+  "submission.sections.general.sections_not_valid":  "Hi ha seccions incompletes.",
+
+
+
+  // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
+  "submission.sections.submit.progressbar.accessCondition":  "Condicions d'accés a l'ítem",
+
+  // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
+  "submission.sections.submit.progressbar.CClicense":  "Llicència 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":  "Descriure",
+
+  // "submission.sections.submit.progressbar.describe.stepone": "Describe",
+  "submission.sections.submit.progressbar.describe.stepone":  "Descriure",
+
+  // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
+  "submission.sections.submit.progressbar.describe.steptwo":  "Descriure",
+
+  // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
+  "submission.sections.submit.progressbar.detect-duplicate":  "Possibles duplicats",
+
+  // "submission.sections.submit.progressbar.license": "Deposit license",
+  "submission.sections.submit.progressbar.license":  "Llicència de dipòsit",
+
+  // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
+  "submission.sections.submit.progressbar.sherpapolicy":  "Polítiques Sherpa",
+
+  // "submission.sections.submit.progressbar.upload": "Upload files",
+  "submission.sections.submit.progressbar.upload":  "Pujar fitxers",
+
+  // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
+  "submission.sections.submit.progressbar.sherpaPolicies":  "Informació sobre polítiques editorials d'accés obert",
+
+
+  // "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 es troba disponible la informació sobre política editorial. Si teniu un ISSN associat, introduïu-lo a dalt per veure informació sobre polítiques editorials d'accés obert.",
+
+  // "submission.sections.status.errors.title": "Errors",
+  "submission.sections.status.errors.title":  "Errors",
+
+  // "submission.sections.status.valid.title": "Valid",
+  "submission.sections.status.valid.title":  "Vàlid",
+
+  // "submission.sections.status.warnings.title": "Warnings",
+  "submission.sections.status.warnings.title":  "Avisos",
+
+  // "submission.sections.status.errors.aria": "has errors",
+  "submission.sections.status.errors.aria":  "amb errors",
+
+  // "submission.sections.status.valid.aria": "is valid",
+  "submission.sections.status.valid.aria":  "és vàlid",
+
+  // "submission.sections.status.warnings.aria": "has warnings",
+  "submission.sections.status.warnings.aria":  "amb avisos",
+
+  // "submission.sections.status.info.title": "Additional Information",
+  "submission.sections.status.info.title":  "Informació addicional",
+
+  // "submission.sections.status.info.aria": "Additional Information",
+  "submission.sections.status.info.aria":  "Informació addicional",
+
+  // "submission.sections.toggle.open": "Open section",
+  "submission.sections.toggle.open":  "Obrir secció",
+
+  // "submission.sections.toggle.close": "Close section",
+  "submission.sections.toggle.close":  "Tancar secció",
+
+  // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
+  "submission.sections.toggle.aria.open":  "Expandir secció {{sectionHeader}}",
+
+  // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
+  "submission.sections.toggle.aria.close":  "Contraure secció {{sectionHeader}}",
+
+  // "submission.sections.upload.delete.confirm.cancel": "Cancel",
+  "submission.sections.upload.delete.confirm.cancel":  "Cancel·lar",
+
+  // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.sections.upload.delete.confirm.info":  "Aquesta operació no es pot desfer. Esteu segur?",
+
+  // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
+  "submission.sections.upload.delete.confirm.submit":  "Sí, n'estic segur",
+
+  // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
+  "submission.sections.upload.delete.confirm.title":  "Eliminar fitxer",
+
+  // "submission.sections.upload.delete.submit": "Delete",
+  "submission.sections.upload.delete.submit":  "Esborrar",
+
+  // "submission.sections.upload.download.title": "Download bitstream",
+  "submission.sections.upload.download.title":  "Descarregar fitxer",
+
+  // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
+  "submission.sections.upload.drop-message":  "Deixeu anar fitxers per adjuntar-los a l'ítem",
+
+  // "submission.sections.upload.edit.title": "Edit bitstream",
+  "submission.sections.upload.edit.title":  "Editar fitxer",
+
+  // "submission.sections.upload.form.access-condition-label": "Access condition type",
+  "submission.sections.upload.form.access-condition-label":  "Tipus de condició d'accés",
+
+  // "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":  "Seleccioneu la condició d'accés que s'aplicarà als fitxers una vegada es dipositi l'ítem",
+
+  // "submission.sections.upload.form.date-required": "Date is required.",
+  "submission.sections.upload.form.date-required":  "Es requereix la data.",
+
+  // "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.upload.form.date-required-from":  "Per aplicar l'accés es requereix una data d'inici.",
+
+  // "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.upload.form.date-required-until":  "Per aplicar l'accés es requereix una data de finalització.",
+
+  // "submission.sections.upload.form.from-label": "Grant access from",
+  "submission.sections.upload.form.from-label":  "Permetre accés des de",
+
+  // "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.upload.form.from-hint":  "Seleccioneu la data a partir de la qual serà aplicada la condició d'accés",
+
+  // "submission.sections.upload.form.from-placeholder": "From",
+  "submission.sections.upload.form.from-placeholder":  "Des de",
+
+  // "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":  "Es requereix el grup.",
+
+  // "submission.sections.upload.form.until-label": "Grant access until",
+  "submission.sections.upload.form.until-label":  "Concedir accés fins",
+
+  // "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.upload.form.until-hint":  "Seleccioneu la data fins a la qual serà aplicada la condició d'accés",
+
+  // "submission.sections.upload.form.until-placeholder": "Until",
+  "submission.sections.upload.form.until-placeholder":  "Fins",
+
+  // "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":  "Es podrà accedir als fitxers carregats a la col·lecció {{ collectionName }} d'acord amb els grups següents:",
+
+  // "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":  "Tingueu en compte que els fitxers carregats a la col·lecció {{ collectionName }} seran accessibles, a més del que es decideixi explícitament per al fitxer, per als grups següents:",
+
+  // "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í trobareu tots els fitxers que es troben actualment a l'ítem. Podeu actualitzar les metadades del fitxer i les condicions d'accés o <strong>incloure fitxers addicionals simplement arrossegant i deixant anar a qualsevol lloc de 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":  "Encara no s'ha penjat cap fitxer.",
+
+  // "submission.sections.upload.save-metadata": "Save metadata",
+  "submission.sections.upload.save-metadata":  "Guardar metadades",
+
+  // "submission.sections.upload.undo": "Cancel",
+  "submission.sections.upload.undo":  "Cancel·lar",
+
+  // "submission.sections.upload.upload-failed": "Upload failed",
+  "submission.sections.upload.upload-failed":  "Pujada fallida",
+
+  // "submission.sections.upload.upload-successful": "Upload successful",
+  "submission.sections.upload.upload-successful":  "Pujada completada amb èxit",
+
+  // "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 el marca, l'ítem serà detectable al cercador/navegador. Si el desmarca, l'ítem només estarà disponible mitjançant l'enllaç directe, i no apareixerà al cercar/navegar.",
+
+  // "submission.sections.accesses.form.discoverable-label": "Discoverable",
+  "submission.sections.accesses.form.discoverable-label":  "Públic (Detectable)",
+
+  // "submission.sections.accesses.form.access-condition-label": "Access condition type",
+  "submission.sections.accesses.form.access-condition-label":  "Tipus de condició d'accés",
+
+  // "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":  "Seleccioneu la condició d'accés que s'aplicarà a l'ítem una vegada dipositat",
+
+  // "submission.sections.accesses.form.date-required": "Date is required.",
+  "submission.sections.accesses.form.date-required":  "Es requereix una data.",
+
+  // "submission.sections.accesses.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.accesses.form.date-required-from":  "Per aplicar l'accés cal una data d'inici.",
+
+  // "submission.sections.accesses.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.accesses.form.date-required-until":  "Per aplicar l'accés cal una data de finalització.",
+
+  // "submission.sections.accesses.form.from-label": "Grant access from",
+  "submission.sections.accesses.form.from-label":  "Permetre accés des de",
+
+  // "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.accesses.form.from-hint":  "Seleccioneu la data a partir de la qual serà aplicada la condició d'accés",
+
+  // "submission.sections.accesses.form.from-placeholder": "From",
+  "submission.sections.accesses.form.from-placeholder":  "Des de",
+
+  // "submission.sections.accesses.form.group-label": "Group",
+  "submission.sections.accesses.form.group-label":  "Grup",
+
+  // "submission.sections.accesses.form.group-required": "Group is required.",
+  "submission.sections.accesses.form.group-required":  "Es requereix un grup.",
+
+  // "submission.sections.accesses.form.until-label": "Grant access until",
+  "submission.sections.accesses.form.until-label":  "Permetre accés fins",
+
+  // "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.accesses.form.until-hint":  "Seleccioneu la data fins a quina serà aplicada la condició d'accés",
+
+  // "submission.sections.accesses.form.until-placeholder": "Until",
+  "submission.sections.accesses.form.until-placeholder":  "Fins",
+
+  // "submission.sections.license.granted-label": "I confirm the license above",
+  "submission.sections.license.granted-label":  "Confirmo la llicència",
+
+  // "submission.sections.license.required": "You must accept the license",
+  "submission.sections.license.required":  "Ha d'acceptar la llicència",
+
+  // "submission.sections.license.notgranted":  "You must accept the license",
+  "submission.sections.license.notgranted":  "Heu d'acceptar la llicència",
+
+
+  // "submission.sections.sherpa.publication.information": "Publication information",
+  "submission.sections.sherpa.publication.information":  "Informació de la Publicació",
+
+  // "submission.sections.sherpa.publication.information.title": "Title",
+  "submission.sections.sherpa.publication.information.title":  "Títol",
+
+  // "submission.sections.sherpa.publication.information.issns": "ISSNs",
+  "submission.sections.sherpa.publication.information.issns":  "ISSNs",
+
+  // "submission.sections.sherpa.publication.information.url": "URL",
+  "submission.sections.sherpa.publication.information.url":  "URL",
+
+  // "submission.sections.sherpa.publication.information.publishers": "Publisher",
+  "submission.sections.sherpa.publication.information.publishers":  "Editor",
+
+  // "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
+  "submission.sections.sherpa.publication.information.romeoPub":  "Romeo Pub",
+
+  // "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
+  "submission.sections.sherpa.publication.information.zetoPub":  "Zeto Pub",
+
+  // "submission.sections.sherpa.publisher.policy": "Publisher Policy",
+  "submission.sections.sherpa.publisher.policy":  "Política editorial",
+
+  // "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":  "La següent informacióm s'ha trobat via Sherpa Romeo. En base a aquestes polítiques, es proporcionen consells sobre les necessitats d'un embargament i d'aquells fitxers que podeu utilitzar. Si teniu dubtes, si us plau, contacteu amb l'administrador del repositori mitjançant el formulari de suggeriments.",
+
+  // "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":  "Els camins cap a l'accés Obert que aquesta revista permet es llisten a sota per versió d'article. Feu clic en un camí per a una visió més detallada",
+
+  // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
+  "submission.sections.sherpa.publisher.policy.more.information":  "Per a més informació, si us plau, seguiu els següents enllaços:",
+
+  // "submission.sections.sherpa.publisher.policy.version": "Version",
+  "submission.sections.sherpa.publisher.policy.version":  "Versió",
+
+  // "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
+  "submission.sections.sherpa.publisher.policy.embargo":  "Embargament",
+
+  // "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo",
+  "submission.sections.sherpa.publisher.policy.noembargo":  "Sense Embargament",
+
+  // "submission.sections.sherpa.publisher.policy.nolocation": "None",
+  "submission.sections.sherpa.publisher.policy.nolocation":  "Cap",
+
+  // "submission.sections.sherpa.publisher.policy.license": "License",
+  "submission.sections.sherpa.publisher.policy.license":  "Llicència",
+
+  // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
+  "submission.sections.sherpa.publisher.policy.prerequisites":  "Prerequisits",
+
+  // "submission.sections.sherpa.publisher.policy.location": "Location",
+  "submission.sections.sherpa.publisher.policy.location":  "Lloc",
+
+  // "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
+  "submission.sections.sherpa.publisher.policy.conditions":  "Condicions",
+
+  // "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
+  "submission.sections.sherpa.publisher.policy.refresh":  "Refrescar",
+
+  // "submission.sections.sherpa.record.information": "Record Information",
+  "submission.sections.sherpa.record.information":  "Informació del registre",
+
+  // "submission.sections.sherpa.record.information.id": "ID",
+  "submission.sections.sherpa.record.information.id":  "ID",
+
+  // "submission.sections.sherpa.record.information.date.created": "Date Created",
+  "submission.sections.sherpa.record.information.date.created":  "Data de creació",
+
+  // "submission.sections.sherpa.record.information.date.modified": "Last Modified",
+  "submission.sections.sherpa.record.information.date.modified":  "Última modificació",
+
+  // "submission.sections.sherpa.record.information.uri": "URI",
+  "submission.sections.sherpa.record.information.uri":  "URI",
+
+  // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
+  "submission.sections.sherpa.error.message":  "S'ha produït un error recuperant la informació de Sherpa",
+
+
+
+  // "submission.submit.breadcrumbs": "New submission",
+  "submission.submit.breadcrumbs":  "Nou enviament",
+
+  // "submission.submit.title": "New submission",
+  "submission.submit.title":  "Nou enviament",
+
+
+
+  // "submission.workflow.generic.delete": "Delete",
+  "submission.workflow.generic.delete":  "Eliminar",
+
+  // "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 voleu descartar aquest element, seleccioneu \"Eliminar\". Després se us demanarà que ho confirmeu.",
+
+  // "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":  "Seleccioneu aquesta opció per canviar les metadades de l'ítem.",
+
+  // "submission.workflow.generic.view": "View",
+  "submission.workflow.generic.view":  "Veure",
+
+  // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workflow.generic.view-help":  "Seleccioneu aquesta opció per veure les metadades de l'ítem.",
+
+
+
+  // "submission.workflow.tasks.claimed.approve": "Approve",
+  "submission.workflow.tasks.claimed.approve":  "Aprovar",
+
+  // "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 heu revisat l'ítem i és adequat per incloure'l a la col·lecció, seleccioneu \"Aprovar\".",
+
+  // "submission.workflow.tasks.claimed.edit": "Edit",
+  "submission.workflow.tasks.claimed.edit":  "Editar",
+
+  // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
+  "submission.workflow.tasks.claimed.edit_help":  "Seleccioneu aquesta opció per canviar les metadades de l'ítem.",
+
+  // "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":  "Introduïu el vostre motiu per rebutjar l'enviament al quadre a continuació, indicant si el remitent pot solucionar el problema i tornar-lo a enviar.",
+
+  // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
+  "submission.workflow.tasks.claimed.reject.reason.placeholder":  "Descriviu el motiu del rebuig.",
+
+  // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
+  "submission.workflow.tasks.claimed.reject.reason.submit":  "Rebutjar l'element",
+
+  // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
+  "submission.workflow.tasks.claimed.reject.reason.title":  "Raó",
+
+  // "submission.workflow.tasks.claimed.reject.submit": "Reject",
+  "submission.workflow.tasks.claimed.reject.submit":  "Rebutjar",
+
+  // "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 heu revisat l'ítem i heu trobat que <strong>no</strong> és adequat per a la seva inclusió a la col·lecció, seleccioneu \"Rebutjar\". Després, se us demanarà que introduïu un missatge que indiqui per què l'ítem no és adequat i si el remitent ha de canviar alguna cosa i tornar-ho a enviar.",
+
+  // "submission.workflow.tasks.claimed.return": "Return to pool",
+  "submission.workflow.tasks.claimed.return":  "Retornar 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":  "Torneu la tasca al pool perquè un altre usuari pugui realitzar-la.",
+
+
+
+  // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
+  "submission.workflow.tasks.generic.error":  "S'ha produït un error durant l'operació...",
+
+  // "submission.workflow.tasks.generic.processing": "Processing...",
+  "submission.workflow.tasks.generic.processing":  "Processant...",
+
+  // "submission.workflow.tasks.generic.submitter": "Submitter",
+  "submission.workflow.tasks.generic.submitter":  "Remitent",
+
+  // "submission.workflow.tasks.generic.success": "Operation successful",
+  "submission.workflow.tasks.generic.success":  "Operació completada amb èxit",
+
+
+
+  // "submission.workflow.tasks.pool.claim": "Claim",
+  "submission.workflow.tasks.pool.claim":  "Assumir tasca",
+
+  // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
+  "submission.workflow.tasks.pool.claim_help":  "Assignar aquesta tasca a vosaltres mateixos.",
+
+  // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
+  "submission.workflow.tasks.pool.hide-detail":  "Amagar detalls",
+
+  // "submission.workflow.tasks.pool.show-detail": "Show detail",
+  "submission.workflow.tasks.pool.show-detail":  "Mostrar detalls",
+
+
+  // "submission.workspace.generic.view": "View",
+  "submission.workspace.generic.view":  "Veure",
+
+  // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workspace.generic.view-help":  "Seleccioneu aquesta opció per veure les metadades de l'ítem.",
+
+
+  // "thumbnail.default.alt": "Thumbnail Image",
+  "thumbnail.default.alt":  "Miniatura",
+
+  // "thumbnail.default.placeholder": "No Thumbnail Available",
+  "thumbnail.default.placeholder":  "No hi ha miniatura disponible",
+
+  // "thumbnail.project.alt": "Project Logo",
+  "thumbnail.project.alt":  "Logotip del projecte",
+
+  // "thumbnail.project.placeholder": "Project Placeholder Image",
+  "thumbnail.project.placeholder":  "Imatge del projecte al marcador de posició",
+
+  // "thumbnail.orgunit.alt": "OrgUnit Logo",
+  "thumbnail.orgunit.alt":  "Logotip d'Unitat Organitzativa",
+
+  // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+  "thumbnail.orgunit.placeholder":  "Imatge d'Unitat Organitzativa al marcador de posició",
+
+  // "thumbnail.person.alt": "Profile Picture",
+  "thumbnail.person.alt":  "Foto de perfil",
+
+  // "thumbnail.person.placeholder": "No Profile Picture Available",
+  "thumbnail.person.placeholder":  "No hi ha imatge de perfil disponible",
+
+
+
+  // "title": "DSpace",
+  "title":  "DSpace",
+
+
+
+  // "vocabulary-treeview.header": "Hierarchical tree view",
+  "vocabulary-treeview.header":  "Vista d'arbre jeràrquic",
+
+  // "vocabulary-treeview.load-more": "Load more",
+  "vocabulary-treeview.load-more":  "Carregar més",
+
+  // "vocabulary-treeview.search.form.reset": "Reset",
+  "vocabulary-treeview.search.form.reset":  "Reiniciar",
+
+  // "vocabulary-treeview.search.form.search": "Search",
+  "vocabulary-treeview.search.form.search":  "Cerca",
+
+  // "vocabulary-treeview.search.no-result": "There were no items to show",
+  "vocabulary-treeview.search.no-result":  "No hi havia elements per mostrar",
+
+  // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+  "vocabulary-treeview.tree.description.nsi":  "Norwegian Science Index",
+
+  // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
+  "vocabulary-treeview.tree.description.srsc":  "Categories de temes de recerca",
+
+  // "vocabulary-treeview.info": "Select a subject to add as search filter",
+  "vocabulary-treeview.info": "Selecciona un tema per afegir com a filtre de cerca",
+
+  // "uploader.browse": "browse",
+  "uploader.browse":  "examinar",
+
+  // "uploader.drag-message": "Drag & Drop your files here",
+  "uploader.drag-message":  "Arrossegar i deixar anar els fitxers aquí",
+
+  // "uploader.delete.btn-title": "Delete",
+  "uploader.delete.btn-title":  "Esborrar",
+
+  // "uploader.or": ", or ",
+  "uploader.or":  ", o ",
+
+  // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
+  "uploader.processing":  "Processant pujada de fitxer(s), (ara és segur tancar aquesta pàgina)",
+
+  // "uploader.queue-length": "Queue length",
+  "uploader.queue-length":  "Longitud de la cua",
+
+  // "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":  "Seleccioneu els tipus per als quals voleu desar les metadades virtuals com a metadades reals",
+
+  // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
+  "virtual-metadata.delete-item.modal-head":  "Les metadades virtuals d'aquesta relació",
+
+  // "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":  "Seleccioneu els ítems per als quals voleu desar les metadades virtuals com a metadades reals",
+
+
+
+  // "workspace.search.results.head": "Your submissions",
+  "workspace.search.results.head":  "Els teus enviaments",
+
+  // "workflowAdmin.search.results.head": "Administer Workflow",
+  "workflowAdmin.search.results.head":  "Administrar flux de treball",
+
+  // "workflow.search.results.head": "Workflow tasks",
+  "workflow.search.results.head":  "Tasques del flux de treball",
+
+
+
+  // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
+  "workflow-item.edit.breadcrumbs":  "Editar ítem del flux de treball",
+
+  // "workflow-item.edit.title": "Edit workflowitem",
+  "workflow-item.edit.title":  "Editar ítem del flux de treball",
+
+  // "workflow-item.delete.notification.success.title": "Deleted",
+  "workflow-item.delete.notification.success.title":  "Eliminat",
+
+  // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
+  "workflow-item.delete.notification.success.content":  "Aquest ítem del flux de treball s'ha eliminat correctament",
+
+  // "workflow-item.delete.notification.error.title": "Something went wrong",
+  "workflow-item.delete.notification.error.title":  "Alguna cosa ha sortit malament",
+
+  // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
+  "workflow-item.delete.notification.error.content":  "No s'ha pogut eliminar l'ítem del flux de treball",
+
+  // "workflow-item.delete.title": "Delete workflow item",
+  "workflow-item.delete.title":  "Eliminar ítem del flux de treball",
+
+  // "workflow-item.delete.header": "Delete workflow item",
+  "workflow-item.delete.header":  "Eliminar ítem del flux de treball",
+
+  // "workflow-item.delete.button.cancel": "Cancel",
+  "workflow-item.delete.button.cancel":  "Cancel·lar",
+
+  // "workflow-item.delete.button.confirm": "Delete",
+  "workflow-item.delete.button.confirm":  "Esborrar",
+
+
+  // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
+  "workflow-item.send-back.notification.success.title":  "Tornar al remitent",
+
+  // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
+  "workflow-item.send-back.notification.success.content":  "Aquest ítem del flux de treball s'ha tornat correctament al remitent.",
+
+  // "workflow-item.send-back.notification.error.title": "Something went wrong",
+  "workflow-item.send-back.notification.error.title":  "Alguna cosa ha sortit malament",
+
+  // "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":  "L'ítem del flux de treball no s'ha pogut tornar al remitent.",
+
+  // "workflow-item.send-back.title": "Send workflow item back to submitter",
+  "workflow-item.send-back.title":  "Enviar l'ítem del flux de treball al remitent",
+
+  // "workflow-item.send-back.header": "Send workflow item back to submitter",
+  "workflow-item.send-back.header":  "Enviar l'ítem del flux de treball al remitent",
+
+  // "workflow-item.send-back.button.cancel": "Cancel",
+  "workflow-item.send-back.button.cancel":  "Cancel·lar",
+
+  // "workflow-item.send-back.button.confirm": "Send back",
+  "workflow-item.send-back.button.confirm":  "Tornar",
+
+  // "workflow-item.view.breadcrumbs": "Workflow View",
+  "workflow-item.view.breadcrumbs":  "Vista del flux de treball",
+
+  // "workspace-item.view.breadcrumbs": "Workspace View",
+  "workspace-item.view.breadcrumbs":  "Vista del flux de treball",
+
+  // "workspace-item.view.title": "Workspace View",
+  "workspace-item.view.title":  "Vista del flux de treball",
+
+  // "idle-modal.header": "Session will expire soon",
+  "idle-modal.header":  "La sessió caducarà aviat",
+
+  // "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":  "Per raons de seguretat, les sessions d'usuari caduquen després de {{ timeToExpire }} minuts d'inactivitat. La vostra sessió caducarà aviat. Voleu prolongar-la o tancar la sessió?",
+
+  // "idle-modal.log-out": "Log out",
+  "idle-modal.log-out":  "Tancar sessió",
+
+  // "idle-modal.extend-session": "Extend session",
+  "idle-modal.extend-session":  "Prolongar la sessió",
+
+  // "researcher.profile.action.processing" : "Processing...",
+  "researcher.profile.action.processing":  "Processant...",
+
+  // "researcher.profile.associated": "Researcher profile associated",
+  "researcher.profile.associated":  "Perfil associat d'investigador",
+
+  // "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+  "researcher.profile.change-visibility.fail":  "S'ha produït un error en canviar la visibilitat del perfil",
+
+  // "researcher.profile.create.new": "Create new",
+  "researcher.profile.create.new":  "Crear nou",
+
+  // "researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success":  "Perfil d'investigador creat amb èxit",
+
+  // "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
+  "researcher.profile.create.fail":  "S'ha produït un error en la creació del perfil d'investigador",
+
+  // "researcher.profile.delete": "Delete",
+  "researcher.profile.delete":  "Esborrar",
+
+  // "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 hi ha associat encara un perfil d'investigador",
+
+  // "researcher.profile.view": "View",
+  "researcher.profile.view":  "Veure",
+
+  // "researcher.profile.private.visibility" : "PRIVATE",
+  "researcher.profile.private.visibility":  "PRIVAT",
+
+  // "researcher.profile.public.visibility" : "PUBLIC",
+  "researcher.profile.public.visibility":  "PÚBLIC",
+
+  // "researcher.profile.status": "Status:",
+  "researcher.profile.status":  "Estat:",
+
+  // "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à autoritzat per reclamar aquest ítem. Contacteu amb l'administrador per a més detalls.",
+
+  // "researcherprofile.error.claim.body" : "An error occurred while claiming the profile, please try again later",
+  "researcherprofile.error.claim.body":  "S'ha produït un error reclamant el perfil, si us plau, intenteu-ho més tard",
+
+  // "researcherprofile.error.claim.title" : "Error",
+  "researcherprofile.error.claim.title":  "Error",
+
+  // "researcherprofile.success.claim.body" : "Profile claimed with success",
+  "researcherprofile.success.claim.body":  "Perfil reclamat amb èxit",
+
+  // "researcherprofile.success.claim.title" : "Success",
+  "researcherprofile.success.claim.title":  "Èxit",
+
+  // "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":  "Autoritzacions concedides",
+
+  // "person.page.orcid.grant-authorizations" : "Grant authorizations",
+  "person.page.orcid.grant-authorizations":  "Concedir autoritzacions",
+
+  // "person.page.orcid.link": "Connect to ORCID ID",
+  "person.page.orcid.link":  "Connectar amb ORCID ID",
+
+  // "person.page.orcid.link.processing": "Linking profile to ORCID...",
+  "person.page.orcid.link.processing":  "Connectant perfil amb 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":  "Alguna cosa ha fallat en connectar el perfil amb ORCID. Si el problema continua, contacteu amb l'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":  "L'ORCID iD d'aquest perfil ({{ orcid }}) encara no s'ha connectat amb un compte al registre ORCID o la connexió ha caducat.",
+
+  // "person.page.orcid.unlink": "Disconnect from ORCID",
+  "person.page.orcid.unlink":  "Desconectar d'ORCID",
+
+  // "person.page.orcid.unlink.processing": "Processing...",
+  "person.page.orcid.unlink.processing":  "Processant...",
+
+  // "person.page.orcid.missing-authorizations": "Missing authorizations",
+  "person.page.orcid.missing-authorizations":  "Falten autoritzacions",
+
+  // "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
+  "person.page.orcid.missing-authorizations-message":  "Falten les següents autoritzacions:",
+
+  // "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":  "Perfecte! Aquesta caixa està buida, per la qual cosa vostè ha concedit tots els permisos d'accés per a totes les funcions que utilitza la vostra institució.",
+
+  // "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":  "Encara no està associat amb un ORCID iD. En prémer el botó inferior pot enllaçar aquest perfil amb un compte ORCID.",
+
+  // "person.page.orcid.profile-preferences": "Profile preferences",
+  "person.page.orcid.profile-preferences":  "Preferències del perfil",
+
+  // "person.page.orcid.funding-preferences": "Funding preferences",
+  "person.page.orcid.funding-preferences":  "Preferències de finançament",
+
+  // "person.page.orcid.publications-preferences": "Publication preferences",
+  "person.page.orcid.publications-preferences":  "Preferències de publicació",
+
+  // "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 necessiteu retirar el vostre ORCID, contacteu si us plau amb l'administrador del repositori",
+
+  // "person.page.orcid.save.preference.changes": "Update settings",
+  "person.page.orcid.save.preference.changes":  "Actualitzar configuració",
+
+  // "person.page.orcid.sync-profile.affiliation" : "Affiliation",
+  "person.page.orcid.sync-profile.affiliation":  "Afiliació",
+
+  // "person.page.orcid.sync-profile.biographical" : "Biographical data",
+  "person.page.orcid.sync-profile.biographical":  "Biografia",
+
+  // "person.page.orcid.sync-profile.education" : "Education",
+  "person.page.orcid.sync-profile.education":  "Titulació",
+
+  // "person.page.orcid.sync-profile.identifiers" : "Identifiers",
+  "person.page.orcid.sync-profile.identifiers":  "Identificadors",
+
+  // "person.page.orcid.sync-fundings.all" : "All fundings",
+  "person.page.orcid.sync-fundings.all":  "Tots els finançaments",
+
+  // "person.page.orcid.sync-fundings.mine" : "My fundings",
+  "person.page.orcid.sync-fundings.mine":  "El meu finançament",
+
+  // "person.page.orcid.sync-fundings.my_selected" : "Selected fundings",
+  "person.page.orcid.sync-fundings.my_selected":  "Finançaments seleccionats",
+
+  // "person.page.orcid.sync-fundings.disabled" : "Disabled",
+  "person.page.orcid.sync-fundings.disabled":  "Deshabilitat",
+
+  // "person.page.orcid.sync-publications.all" : "All publications",
+  "person.page.orcid.sync-publications.all":  "Totes les publicacions",
+
+  // "person.page.orcid.sync-publications.mine" : "My publications",
+  "person.page.orcid.sync-publications.mine":  "Les meves publicacions",
+
+  // "person.page.orcid.sync-publications.my_selected" : "Selected publications",
+  "person.page.orcid.sync-publications.my_selected":  "Publicacions seleccionades",
+
+  // "person.page.orcid.sync-publications.disabled" : "Disabled",
+  "person.page.orcid.sync-publications.disabled":  "Deshabilitat",
+
+  // "person.page.orcid.sync-queue.discard" : "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard":  "Desfer el canvi i no sincronitzar amb ORCID",
+
+  // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+  "person.page.orcid.sync-queue.discard.error":  "No s'ha pogut descartar el registre de la cua ORCID",
+
+  // "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  "person.page.orcid.sync-queue.discard.success":  "El registre ORCID ha estat eliminat amb èxit de la cua",
+
+  // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  "person.page.orcid.sync-queue.empty-message":  "La cua del registre d'ORCID és buida",
+
+  // "person.page.orcid.sync-queue.table.header.type" : "Type",
+  "person.page.orcid.sync-queue.table.header.type":  "Tipus",
+
+  // "person.page.orcid.sync-queue.table.header.description" : "Description",
+  "person.page.orcid.sync-queue.table.header.description":  "Descripció",
+
+  // "person.page.orcid.sync-queue.table.header.action" : "Action",
+  "person.page.orcid.sync-queue.table.header.action":  "Acció",
+
+  // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+  "person.page.orcid.sync-queue.description.affiliation":  "Afiliacions",
+
+  // "person.page.orcid.sync-queue.description.country": "Country",
+  "person.page.orcid.sync-queue.description.country":  "País",
+
+  // "person.page.orcid.sync-queue.description.education": "Educations",
+  "person.page.orcid.sync-queue.description.education":  "Titulacions",
+
+  // "person.page.orcid.sync-queue.description.external_ids": "External ids",
+  "person.page.orcid.sync-queue.description.external_ids":  "IDs externs",
+
+  // "person.page.orcid.sync-queue.description.other_names": "Other names",
+  "person.page.orcid.sync-queue.description.other_names":  "Altres signatures",
+
+  // "person.page.orcid.sync-queue.description.qualification": "Qualifications",
+  "person.page.orcid.sync-queue.description.qualification":  "Qualificacions",
+
+  // "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+  "person.page.orcid.sync-queue.description.researcher_urls":  "URLs de l'investigador",
+
+  // "person.page.orcid.sync-queue.description.keywords": "Keywords",
+  "person.page.orcid.sync-queue.description.keywords":  "Paraules clau",
+
+  // "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.insert":  "Afegir una nova entrada al registre ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.update":  "Actualitzar aquesta entrada al registre ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.delete":  "Retira aquesta entrada del registre ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.publication": "Publication",
+  "person.page.orcid.sync-queue.tooltip.publication":  "Publicació",
+
+  // "person.page.orcid.sync-queue.tooltip.project": "Project",
+  "person.page.orcid.sync-queue.tooltip.project":  "Projecte",
+
+  // "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+  "person.page.orcid.sync-queue.tooltip.affiliation":  "Afiliació",
+
+  // "person.page.orcid.sync-queue.tooltip.education": "Education",
+  "person.page.orcid.sync-queue.tooltip.education":  "Titulació",
+
+  // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+  "person.page.orcid.sync-queue.tooltip.qualification":  "Qualificació",
+
+  // "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
+  "person.page.orcid.sync-queue.tooltip.other_names":  "Altres signatures",
+
+  // "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":  "Paraules clau",
+
+  // "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
+  "person.page.orcid.sync-queue.tooltip.external_ids":  "Identificador extern",
+
+  // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls":  "URL de l'investigador",
+
+  // "person.page.orcid.sync-queue.send" : "Synchronize with ORCID registry",
+  "person.page.orcid.sync-queue.send":  "Sincronitzar amb el registre 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":  "Ha fallar l'enviament a ORCID degut a autorització insuficient.",
+
+  // "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":  "Premeu <a href='{{orcid}}'>aquí</a> per tornar a concedir els permisos requerits. Si continueu el problema, contacteu amb l'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":  "L'enviament a ORCID ha fallat perquè el recurs que s'ha enviat no era vàlid",
+
+  // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
+  "person.page.orcid.sync-queue.send.error":  "Ha fallat l'enviament 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":  "L'enviament a ORCID ha fallat pel fet que el recurs ja existia al registre 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 recurs ja no existeix al registre ORCID.",
+
+  // "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+  "person.page.orcid.sync-queue.send.success":  "L'enviament a ORCID ha estat completat amb èxit",
+
+  // "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":  "Les dades que vol sincronitzar amb ORCID no són vàlides",
+
+  // "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":  "Es requereix la quantitat de divisa",
+
+  // "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 recurs que es vol enviar necessita com a mínim 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":  "Es requereix un títol",
+
+  // "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":  "Es requereix 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":  "Es requereix una data d'inici",
+
+  // "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required":  "Es requereix un finançador",
+
+  // "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":  "Els 2 dígits ISO 3166 de país són invàlids",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required":  "Es requereix una organització",
+
+  // "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":  "Es requereix el nom de l'organització",
+
+  // "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 data de la publicació ha de 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":  "Es requereix l'adreça de l'organització",
+
+  // "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":  "Es requereix que la direcció de l'organització tingui una ciutat",
+
+  // "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":  "Cal que l'adreça de l'organització tingui un codi de país de 2 dígits ISO 3166 vàlid",
+
+  // "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":  "Es requereix un identificador per desambiguar l'organització. Els identificadors admesos són GRID, Ringgold, Legal Entity identifiers (LEIs) i 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":  "Es requereix que els identificadors de l'organització tinguin 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":  "Es requereix que els identificadors de l'organització tinguin una font",
+
+  // "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 font d'un dels identificadors d'organització és invàlida. Les fonts admeses són RINGGOLD, GRID, LEI i FUNDREF",
+
+  // "person.page.orcid.synchronization-mode": "Synchronization mode",
+  "person.page.orcid.synchronization-mode":  "Mode sincronització",
+
+  // "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":  "Mode sincronització",
+
+  // "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":  "Seleccioneu com preferiu realitzar la sincronització amb ORCID. Podeu escollir \"Manual\" (vosaltres envieu les dades a ORCID manualment), o \"Batch\" (el sistema enviarà les vostres dades a ORCID.",
+
+  // "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":  "Seleccioneu si enviareu informació de les vostres entitats connectades de tipus Projecte a la informació de finançament d'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":  "Seleccioneu si enviareu informació de les vostres entitats connectades de tipus Publicació a la informació de treballs d'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":  "Seleccioneu si enviareu informació de les vostres dades biogràfiques o identificadors personals a ORCID",
+
+  // "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
+  "person.page.orcid.synchronization-settings-update.success":  "Els paràmetres de sincronització s'han actualitzat amb èxit",
+
+  // "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+  "person.page.orcid.synchronization-settings-update.error":  "Ha fallat l'actualització dels paràmetres de sincronització",
+
+  // "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":  "Obtingueu el vostre ORCID iD",
+
+  // "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
+  "person.page.orcid.scope.read-limited":  "Llegiu la vostra informació amb la visibilitat ajustada a Tercers Confiables",
+
+  // "person.page.orcid.scope.activities-update": "Add/update your research activities",
+  "person.page.orcid.scope.activities-update":  "Afegir/actualitzar les vostres activitats de recerca",
+
+  // "person.page.orcid.scope.person-update": "Add/update other information about you",
+  "person.page.orcid.scope.person-update":  "Afegir/actualitzar altres informacions sobre vostè",
+
+  // "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  "person.page.orcid.unlink.success":  "S'ha efectuat amb èxit la desconnexió entre el perfil i el registre d'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":  "S'ha produït un error en la desconnexió entre el perfil i el registre d'ORCID. Torneu-ho a provar",
+
+  // "person.orcid.sync.setting": "ORCID Synchronization settings",
+  "person.orcid.sync.setting":  "Paràmetres de sincronització d'ORCID",
+
+  // "person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.queue":  "Cua de registre d'ORCID",
+
+  // "person.orcid.registry.auth": "ORCID Authorizations",
+  "person.orcid.registry.auth":  "Autoritzacions ORCID",
+  // "home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head":  "Enviaments recents",
+
+  // "listable-notification-object.default-message": "This object couldn't be retrieved",
+  "listable-notification-object.default-message": "Aquest objecte no s'ha pogut recuperar",
+
+
+}

From f6a95e692ffc8643940c64f0206dead2eb7c64cf Mon Sep 17 00:00:00 2001
From: Toni Prieto <antonio.juan.prieto@upc.edu>
Date: Sat, 21 Jan 2023 12:23:45 +0100
Subject: [PATCH 138/160] Enable Catalan language

---
 config/config.example.yml        | 3 +++
 src/config/default-app-config.ts | 1 +
 2 files changed, 4 insertions(+)

diff --git a/config/config.example.yml b/config/config.example.yml
index c548d6944a..af04859201 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -121,6 +121,9 @@ languages:
   - code: en
     label: English
     active: true
+  - code: ca
+    label: Català
+    active: true
   - code: cs
     label: Čeština
     active: true
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index d7b3efc2ed..205ea8acc0 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -190,6 +190,7 @@ export class DefaultAppConfig implements AppConfig {
   // When set to active, users will be able to switch to the use of this language in the user interface.
   languages: LangConfig[] = [
     { code: 'en', label: 'English', active: true },
+    { code: 'ca', label: 'Català', active: true },
     { code: 'cs', label: 'Čeština', active: true },
     { code: 'de', label: 'Deutsch', active: true },
     { code: 'es', label: 'Español', active: true },

From 6dc4f58decbb99089be588d5413ead9c75b775fd Mon Sep 17 00:00:00 2001
From: Toni Prieto <antonio.juan.prieto@upc.edu>
Date: Mon, 7 Nov 2022 21:55:13 +0100
Subject: [PATCH 139/160] Update es.json5

---
 src/assets/i18n/es.json5 | 961 +++++++++++++++++++++++----------------
 1 file changed, 560 insertions(+), 401 deletions(-)

diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 02169514c4..84035a7a1f 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -10,6 +10,7 @@
   "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.",
 
@@ -22,8 +23,8 @@
   // "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.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 mantenimientos programados del servidor. Inténtelo más tarde, por favor.",
 
   // "500.link.home-page": "Take me to the home page",
   "500.link.home-page": "Llévame a la página de inicio",
@@ -72,7 +73,7 @@
   "admin.curation-tasks.breadcrumbs": "Tareas de curación del sistema",
 
   // "admin.curation-tasks.title": "System curation tasks",
-  "admin.curation-tasks.title": "Tareas de conservación del sistema",
+  "admin.curation-tasks.title": "Tareas de curación del sistema",
 
   // "admin.curation-tasks.header": "System curation tasks",
   "admin.curation-tasks.header": "Tareas de curación del sistema",
@@ -174,7 +175,7 @@
   "admin.registries.bitstream-formats.edit.supportLevel.label": "Nivel de soporte",
 
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
-  "admin.registries.bitstream-formats.head": "Registro de formato Archivo",
+  "admin.registries.bitstream-formats.head": "Registro de formatos de 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.",
@@ -193,7 +194,7 @@
 
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nombre",
-  // TODO New key - Add a translation
+  // "admin.registries.bitstream-formats.table.id" : "ID",
   "admin.registries.bitstream-formats.table.id" : "ID",
 
   // "admin.registries.bitstream-formats.table.return": "Back",
@@ -244,7 +245,7 @@
   "admin.registries.metadata.schemas.table.delete": "Eliminar seleccionado",
 
   // "admin.registries.metadata.schemas.table.id": "ID",
-  "admin.registries.metadata.schemas.table.id": "IDENTIFICACIÓN",
+  "admin.registries.metadata.schemas.table.id": "ID",
 
   // "admin.registries.metadata.schemas.table.name": "Name",
   "admin.registries.metadata.schemas.table.name": "Nombre",
@@ -261,7 +262,7 @@
   "admin.registries.schema.breadcrumbs": "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.description": "Este es el esquema de metadatos para \"{{ namespace }}\".",
 
   // "admin.registries.schema.fields.head": "Schema metadata fields",
   "admin.registries.schema.fields.head": "Campos de metadatos de esquema",
@@ -274,7 +275,7 @@
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Campo",
-  // TODO New key - Add a translation
+  // "admin.registries.schema.fields.table.id" : "ID",
   "admin.registries.schema.fields.table.id" : "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
@@ -287,10 +288,10 @@
   "admin.registries.schema.form.edit": "Editar campo de metadatos",
 
   // "admin.registries.schema.form.element": "Element",
-  "admin.registries.schema.form.element": "Artículo",
+  "admin.registries.schema.form.element": "Elemento",
 
   // "admin.registries.schema.form.qualifier": "Qualifier",
-  "admin.registries.schema.form.qualifier": "Calificatorio",
+  "admin.registries.schema.form.qualifier": "Cualificador",
 
   // "admin.registries.schema.form.scopenote": "Scope Note",
   "admin.registries.schema.form.scopenote": "Nota de alcance",
@@ -299,7 +300,7 @@
   "admin.registries.schema.head": "Esquema 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.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",
@@ -308,22 +309,22 @@
   "admin.registries.schema.notification.deleted.success": "{{ amount }} esquemas de metadatos eliminados correctamente",
 
   // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
-  "admin.registries.schema.notification.edited": "Esquema de metadatos editado correctamente \"{{ prefix }} \"",
+  "admin.registries.schema.notification.edited": "Esquema de metadatos editado correctamente \"{{ prefix }}\"",
 
   // "admin.registries.schema.notification.failure": "Error",
   "admin.registries.schema.notification.failure": "Error",
 
   // "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.notification.field.created": "Campo de metadatos creado correctamente \"{{ field }}\"",
 
   // "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.notification.field.deleted.failure": "No se pudieron borrar {{ amount }} campos 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.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
-  "admin.registries.schema.notification.field.edited": "Campo de metadatos editado correctamente \"{{ field }} \"",
+  "admin.registries.schema.notification.field.edited": "Campo de metadatos editado correctamente \"{{ field }}\"",
 
   // "admin.registries.schema.notification.success": "Success",
   "admin.registries.schema.notification.success": "Éxito",
@@ -337,25 +338,25 @@
 
 
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
-  "admin.access-control.epeople.actions.delete": "Eliminar EPerson",
+  "admin.access-control.epeople.actions.delete": "Eliminar usuario",
 
   // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-  "admin.access-control.epeople.actions.impersonate": "Hacerse pasar por EPerson",
+  "admin.access-control.epeople.actions.impersonate": "Hacerse pasar por usuario",
 
   // "admin.access-control.epeople.actions.reset": "Reset password",
   "admin.access-control.epeople.actions.reset": "Restablecer la contraseña",
 
   // "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.actions.stop-impersonating": "Deja de hacerse pasar por usuario",
 
   // "admin.access-control.epeople.breadcrumbs": "EPeople",
-  "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.breadcrumbs": "Usuarios",
 
   // "admin.access-control.epeople.title": "EPeople",
-  "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.title": "Usuarios",
 
   // "admin.access-control.epeople.head": "EPeople",
-  "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.head": "Usuarios",
 
   // "admin.access-control.epeople.search.head": "Search",
   "admin.access-control.epeople.search.head": "Buscar",
@@ -373,13 +374,13 @@
   "admin.access-control.epeople.search.button": "Buscar",
 
   // "admin.access-control.epeople.search.placeholder": "Search people...",
-  "admin.access-control.epeople.search.placeholder": "Busca gente...",
+  "admin.access-control.epeople.search.placeholder": "Busca usuarios...",
 
   // "admin.access-control.epeople.button.add": "Add EPerson",
-  "admin.access-control.epeople.button.add": "Agregar una persona",
+  "admin.access-control.epeople.button.add": "Agregar un usuario",
 
   // "admin.access-control.epeople.table.id": "ID",
-  "admin.access-control.epeople.table.id": "IDENTIFICACIÓN",
+  "admin.access-control.epeople.table.id": "ID",
 
   // "admin.access-control.epeople.table.name": "Name",
   "admin.access-control.epeople.table.name": "Nombre",
@@ -397,22 +398,22 @@
   "admin.access-control.epeople.table.edit.buttons.edit-disabled": "No tienes autorización para editar este grupo.",
 
   // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
-  "admin.access-control.epeople.table.edit.buttons.remove": "Eliminar \"{{ name }} \"",
+  "admin.access-control.epeople.table.edit.buttons.remove": "Eliminar \"{{ 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.no-items": "No hay usuarios para mostrar.",
 
   // "admin.access-control.epeople.form.create": "Create EPerson",
-  "admin.access-control.epeople.form.create": "Crear una persona",
+  "admin.access-control.epeople.form.create": "Crear un usuario",
 
   // "admin.access-control.epeople.form.edit": "Edit EPerson",
-  "admin.access-control.epeople.form.edit": "Editar EPerson",
+  "admin.access-control.epeople.form.edit": "Editar usuario",
 
   // "admin.access-control.epeople.form.firstName": "First name",
-  "admin.access-control.epeople.form.firstName": "Nombre de pila",
+  "admin.access-control.epeople.form.firstName": "Nombre",
 
   // "admin.access-control.epeople.form.lastName": "Last name",
-  "admin.access-control.epeople.form.lastName": "Apellido",
+  "admin.access-control.epeople.form.lastName": "Apellidos",
 
   // "admin.access-control.epeople.form.email": "E-mail",
   "admin.access-control.epeople.form.email": "Correo electrónico",
@@ -430,34 +431,34 @@
   "admin.access-control.epeople.form.return": "Atrás",
 
   // "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.notification.created.success": "Usuario \"{{ name }}\" creado correctamente",
 
   // "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.notification.created.failure": "Error al crear usuario \"{{ name }}\"",
 
   // "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.notification.created.failure.emailInUse": "Error al crear usuario \"{{ name }}\", el correo electrónico \"{{ email }}\" ya está en uso.",
 
   // "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.notification.edited.failure.emailInUse": "Error al editar usuario \"{{ name }}\", el correo electrónico \"{{ email }}\" ya está en uso.",
 
   // "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.success": "Usuario \"{{ 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.edited.failure": "Error al editar usuario \"{{ 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.epeople.form.notification.deleted.success": "Usuario \"{{ name }}\" eliminado correctamente",
 
   // "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.notification.deleted.failure": "No se pudo borrar el usuario \"{{ name }}\"",
 
   // "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.table.id": "ID",
-  "admin.access-control.epeople.form.table.id": "IDENTIFICACIÓN",
+  "admin.access-control.epeople.form.table.id": "ID",
 
   // "admin.access-control.epeople.form.table.name": "Name",
   "admin.access-control.epeople.form.table.name": "Nombre",
@@ -466,16 +467,16 @@
   "admin.access-control.epeople.form.table.collectionOrCommunity": "Colección/Comunidad",
 
   // "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.memberOfNoGroups": "Este usuario no es miembro de ningún grupo",
 
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
   "admin.access-control.epeople.form.goToGroups": "Agregar a grupos",
 
   // "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.notification.deleted.failure": "No se pudo borrar el usuario: \"{{ name }}\"",
 
   // "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.notification.deleted.success": "Usuario eliminado correctamente: \"{{ name }}\"",
 
 
 
@@ -504,7 +505,7 @@
   "admin.access-control.groups.button.add": "Añadir grupo",
 
   // "admin.access-control.groups.search.head": "Search groups",
-  "admin.access-control.groups.search.head": "Grupos de búsqueda",
+  "admin.access-control.groups.search.head": "Buscar grupos",
 
   // "admin.access-control.groups.button.see-all": "Browse all",
   "admin.access-control.groups.button.see-all": "Examinar todo",
@@ -516,7 +517,7 @@
   "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.id": "ID",
 
   // "admin.access-control.groups.table.name": "Name",
   "admin.access-control.groups.table.name": "Nombre",
@@ -546,7 +547,7 @@
   "admin.access-control.groups.notification.deleted.failure.title": "No se pudo borrar 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.notification.deleted.failure.content": "Causa: \"{{ cause }}\"",
 
 
 
@@ -554,7 +555,7 @@
   "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.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.alert.workflowGroup": "Este grupo no puede ser modificado o eliminado porque corresponde a un rol en el proceso de entrada y revisión de envíos en {{ comcol }} \"{{ name }}\". Puede eliminarlo desde la pestaña <a href='{{ comcolEditRolesRoute }}'>\"asignar roles\"</a> de la página de edición de la {{ comcol }}. Sí puede añadir y eliminar miembros del grupo utilizando esta página.",
 
   // "admin.access-control.groups.form.head.create": "Create group",
   "admin.access-control.groups.form.head.create": "Crea un grupo",
@@ -572,31 +573,31 @@
   "admin.access-control.groups.form.groupDescription": "Descripción",
 
   // "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.created.success": "Grupo creado con éxito \"{{ 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.created.failure": "No se pudo crear el grupo \"{{ name }}\"",
 
   // "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": "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.notification.edited.failure.groupNameInUse": "¡El nombre \"{{ name }}\" ya está en uso!",
 
   // "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.notification.edited.success": "Grupo \"{{ name }}\" editado correctamente",
 
   // "admin.access-control.groups.form.actions.delete": "Delete Group",
   "admin.access-control.groups.form.actions.delete": "Eliminar 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.delete-group.modal.header": "Eliminar grupo \"{{ dsoName }}\"",
 
   // "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.delete-group.modal.info": "¿Está seguro de que desea eliminar el grupo \"{{ dsoName }}\"?",
 
   // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
   "admin.access-control.groups.form.delete-group.modal.cancel": "Cancelar",
@@ -605,19 +606,19 @@
   "admin.access-control.groups.form.delete-group.modal.confirm": "Borrar",
 
   // "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.deleted.success": "El grupo \"{{ name }}\" se eliminó correctamente",
 
   // "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.deleted.failure.title": "No se pudo borrar 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.deleted.failure.content": "Causa: \"{{ cause }}\"",
 
   // "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.head": "Usuarios",
 
   // "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.search.head": "Agregar usuarios",
 
   // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
   "admin.access-control.groups.form.members-list.button.see-all": "Examinar todo",
@@ -653,22 +654,22 @@
   "admin.access-control.groups.form.members-list.table.edit": "Eliminar / Agregar",
 
   // "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.table.edit.buttons.remove": "Eliminar miembro con nombre \"{{ name }}\"",
 
   // "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.notification.success.addMember": "Miembro agregado exitosamente: \"{{ 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": "No se pudo agregar el miembro: \"{{ 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.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.notification.success.deleteMember": "Miembro eliminado correctamente: \"{{ 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": "No se pudo borrar el miembro: \"{{ 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.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.edit.buttons.add": "Agregar miembro con nombre \"{{ name }}\"",
 
   // "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.",
@@ -677,10 +678,10 @@
   "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.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.members-list.no-items": "No se encontraron usuarios en esa búsqueda",
 
   // "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.notification.failure": "Algo salió mal: \"{{ cause }}\"",
 
   // "admin.access-control.groups.form.subgroups-list.head": "Groups",
   "admin.access-control.groups.form.subgroups-list.head": "Grupos",
@@ -698,7 +699,7 @@
   "admin.access-control.groups.form.subgroups-list.search.button": "Buscar",
 
   // "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.table.id": "ID",
 
   // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
   "admin.access-control.groups.form.subgroups-list.table.name": "Nombre",
@@ -710,25 +711,25 @@
   "admin.access-control.groups.form.subgroups-list.table.edit": "Eliminar / Agregar",
 
   // "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.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.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.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.notification.success.addSubgroup": "Subgrupo agregado exitosamente: \"{{ 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": "No se pudo agregar el subgrupo: \"{{ 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.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.notification.success.deleteSubgroup": "Subgrupo eliminado correctamente: \"{{ 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": "No se pudo borrar el subgrupo: \"{{ 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.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.",
@@ -766,10 +767,10 @@
   "admin.search.item.make-private": "Hacerlo privado",
 
   // "admin.search.item.make-public": "Make discoverable",
-  "admin.search.item.make-public": "Hacer público",
+  "admin.search.item.make-public": "Hacerlo público",
 
   // "admin.search.item.move": "Move",
-  "admin.search.item.move": "Moverse",
+  "admin.search.item.move": "Mover",
 
   // "admin.search.item.reinstate": "Reinstate",
   "admin.search.item.reinstate": "Reintegrar",
@@ -806,20 +807,38 @@
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Importar metadatos",
 
+  // "admin.batch-import.breadcrumbs": "Import Batch",
+  "admin.batch-import.breadcrumbs": "Importación por lotes",
+
   // "admin.metadata-import.title": "Import Metadata",
   "admin.metadata-import.title": "Importar metadatos",
 
+  // "admin.batch-import.title": "Import Batch",
+  "admin.batch-import.title": "Importación por lotes",
+
   // "admin.metadata-import.page.header": "Import Metadata",
   "admin.metadata-import.page.header": "Importar metadatos",
 
+  // "admin.batch-import.page.header": "Import Batch",
+  "admin.batch-import.page.header": "Importación por lotes",
+
   // "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.help": "Puede soltar o examinar archivos CSV que contienen operaciones de metadatos por lotes aquí",
+
+  // "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
+  "admin.batch-import.page.help": "Seleccione la Colección a la que importar. Luego, suelte o busque el archivo zip en formato Simple Archive Format (SAF) que incluye los ítems a importar",
 
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "Suelta un CSV de metadatos para importar",
 
+  // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
+  "admin.batch-import.page.dropMsg": "Suelta un ZIP por lotes 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",
+  "admin.metadata-import.page.dropMsgReplace": "Suelta para reemplazar el CSV de metadatos a importar",
+
+  // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
+  "admin.batch-import.page.dropMsgReplace": "Suelta para reemplazar el ZIP por lotes a importar",
 
   // "admin.metadata-import.page.button.return": "Back",
   "admin.metadata-import.page.button.return": "Atrás",
@@ -827,17 +846,26 @@
   // "admin.metadata-import.page.button.proceed": "Proceed",
   "admin.metadata-import.page.button.proceed": "Continuar",
 
+  // "admin.metadata-import.page.button.select-collection": "Select Collection",
+  "admin.metadata-import.page.button.select-collection": "Selecciona la Colleción",
+
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "¡Seleccione el archivo primero!",
 
+  // "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  "admin.batch-import.page.error.addFile": "¡Seleccione el archivo ZIP primero!",
+
   // "admin.metadata-import.page.validateOnly": "Validate Only",
   "admin.metadata-import.page.validateOnly": "Solo Validar",
 
   // "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.",
 
+  // "admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.",
+  "admin.batch-import.page.validateOnly.hint": "Al seleccionar, se validará el archivo ZIP subido. Recibirá un informe con los cambios detectados, pero no se efectuarán dichos cambios.",
 
-
+  // "admin.batch-import.page.remove": "remove",
+  "admin.batch-import.page.remove": "eliminar",
 
   // "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.",
@@ -858,16 +886,16 @@
 
 
   // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
-  "bitstream.edit.authorizations.link": "Editar las políticas de archivo",
+  "bitstream.edit.authorizations.link": "Editar las políticas del archivo",
 
   // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
-  "bitstream.edit.authorizations.title": "Editar las políticas de archivo",
+  "bitstream.edit.authorizations.title": "Editar las políticas del archivo",
 
   // "bitstream.edit.return": "Back",
   "bitstream.edit.return": "Atrás",
 
   // "bitstream.edit.bitstream": "Bitstream: ",
-  "bitstream.edit.bitstream": "Archivo:",
+  "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>\".",
@@ -876,13 +904,13 @@
   "bitstream.edit.form.description.label": "Descripción",
 
   // "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.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 ítem</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.",
+  "bitstream.edit.form.fileName.hint": "Cambie el nombre del archivo. Tenga en cuenta que esto cambiará la URL de visualización del archivo, 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",
@@ -891,13 +919,13 @@
   "bitstream.edit.form.newFormat.label": "Describe el nuevo formato",
 
   // "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.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.edit.form.primaryBitstream.label": "Primary bitstream",
-  "bitstream.edit.form.primaryBitstream.label": "archivo primario",
+  "bitstream.edit.form.primaryBitstream.label": "Archivo principal",
 
   // "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.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.form.selectedFormat.label": "Selected Format",
   "bitstream.edit.form.selectedFormat.label": "Formato seleccionado",
@@ -912,7 +940,7 @@
   "bitstream.edit.form.iiifLabel.label": "Etiqueta IIIF",
 
   // "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.",
+  "bitstream.edit.form.iiifLabel.hint": "Etiqueta Canvas para esta imagen. Si no se proporciona, se utilizará la etiqueta predeterminada.",
 
   // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
   "bitstream.edit.form.iiifToc.label": "Índice del IIIF",
@@ -955,8 +983,7 @@
   "bitstream-request-a-copy.intro": "Introduzca la siguiente información para solicitar una copia del siguiente ítem: ",
 
   // "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.one": "Solicitando el siguiente fichero: ",
   // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
   "bitstream-request-a-copy.intro.bitstream.all": "Solicitando todos los ficheros. ",
 
@@ -1000,6 +1027,7 @@
   "bitstream-request-a-copy.submit.error": "Hubo un fallo en el envío de la solicitud de ítem.",
 
 
+
   // "browse.back.all-results": "All browse results",
   "browse.back.all-results": "Todos los resultados de la búsqueda",
 
@@ -1007,7 +1035,7 @@
   "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.dateissued": "Por fecha de publicación",
 
   // "browse.comcol.by.subject": "By Subject",
   "browse.comcol.by.subject": "Por materia",
@@ -1058,7 +1086,7 @@
   "browse.startsWith": ", comenzando por {{ startsWith }}",
 
   // "browse.startsWith.choose_start": "(Choose start)",
-  "browse.startsWith.choose_start": "(Elija inicio)",
+  "browse.startsWith.choose_start": "(Elegir inicio)",
 
   // "browse.startsWith.choose_year": "(Choose year)",
   "browse.startsWith.choose_year": "(Elegir año)",
@@ -1067,7 +1095,7 @@
   "browse.startsWith.choose_year.label": "Elija el año de publicación",
 
   // "browse.startsWith.jump": "Filter results by year or month",
-  "browse.startsWith.jump": "Filtrar  resultado spor año o por mes:",
+  "browse.startsWith.jump": "Filtrar resultados por año o por mes:",
 
   // "browse.startsWith.months.april": "April",
   "browse.startsWith.months.april": "abril",
@@ -1097,7 +1125,7 @@
   "browse.startsWith.months.may": "mayo",
 
   // "browse.startsWith.months.none": "(Choose month)",
-  "browse.startsWith.months.none": "(Elija mes)",
+  "browse.startsWith.months.none": "(Elegir mes)",
 
   // "browse.startsWith.months.none.label": "Choose the issue month",
   "browse.startsWith.months.none.label": "Elija el mes de publicación",
@@ -1127,7 +1155,7 @@
   "browse.title": "Examinando {{ collection }} por {{ field }} {{ value }}",
 
   // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title.page": "Examinando {{ collection }}porby {{ field }} {{ value }}",
+  "browse.title.page": "Examinando {{ collection }} por {{ field }} {{ value }}",
 
 
   // "chips.remove": "Remove chip",
@@ -1166,7 +1194,7 @@
   "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.delete.text": "¿Estás seguro de que quieres eliminar la colección \"{{ dso }}\"?",
 
 
 
@@ -1212,19 +1240,19 @@
   "collection.edit.item-mapper.notifications.map.error.head": "Errores de mapeo",
 
   // "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.item-mapper.notifications.map.success.content": "{{ amount }} ítems mapeados correctamente.",
 
   // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
   "collection.edit.item-mapper.notifications.map.success.head": "Mapeo completado",
 
   // "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.item-mapper.notifications.unmap.error.content": "Se produjeron errores al eliminar los mapeos de {{ amount }} ítems.",
 
   // "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.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.item-mapper.notifications.unmap.success.content": "Se eliminaron correctamente los mapeos de {{ amount }} ítems.",
 
   // "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",
@@ -1316,7 +1344,7 @@
   "collection.edit.tabs.source.external": "Esta colección recolecta su contenido de una fuente externa",
 
   // "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.edit.tabs.source.form.errors.oaiSource.required": "Debe proporcionar el set-ID de la colección de destino.",
 
   // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
   "collection.edit.tabs.source.form.harvestType": "Contenido que se está recolectando",
@@ -1348,8 +1376,8 @@
   // "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.discarded.title": "Changes discarded",
+  "collection.edit.tabs.source.notifications.discarded.title": "Cambios descartados",
 
   // "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.",
@@ -1387,7 +1415,7 @@
   "collection.edit.template.error": "Se produjo un error al recuperar la plantilla del ítem.",
 
   // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
-  "collection.edit.template.head": "Editar plantilla del ítem para la colección \"{{ collection }} \"",
+  "collection.edit.template.head": "Editar plantilla del ítem para la colección \"{{ collection }}\"",
 
   // "collection.edit.template.label": "Template item",
   "collection.edit.template.label": "Plantilla de ítem",
@@ -1458,6 +1486,8 @@
   // "collection.page.news": "News",
   "collection.page.news": "Noticias",
 
+
+
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Confirmar seleccionado",
 
@@ -1470,70 +1500,48 @@
 
   // "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.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",
 
@@ -1552,7 +1560,7 @@
   // "communityList.tabTitle": "Community List",
   "communityList.tabTitle": "Lista de comunidades",
 
-  // "communityList.title": "List of communities",
+  // "communityList.title": "List of Communities",
   "communityList.title": "Lista de Comunidades",
 
   // "communityList.showMore": "Show More",
@@ -1564,7 +1572,7 @@
   "community.create.head": "Crear una comunidad",
 
   // "community.create.notifications.success": "Successfully created the Community",
-  "community.create.notifications.success": "Creada con éxito la comunidad",
+  "community.create.notifications.success": "Comunidad creada con éxito",
 
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
   "community.create.sub-head": "Crear una subcomunidad para la comunidad {{ parent }}",
@@ -1591,7 +1599,7 @@
   "community.delete.notification.success": "Comunidad eliminada con éxito",
 
   // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
-  "community.delete.text": "¿Está seguro de que desea eliminar la comunidad \"{{ dso }} \"?",
+  "community.delete.text": "¿Está seguro de que desea eliminar la comunidad \"{{ dso }}\"?",
 
   // "community.edit.delete": "Delete this community",
   "community.edit.delete": "Eliminar esta comunidad",
@@ -1647,10 +1655,10 @@
 
 
   // "community.edit.tabs.curate.head": "Curate",
-  "community.edit.tabs.curate.head": "Cura",
+  "community.edit.tabs.curate.head": "Curar",
 
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
-  "community.edit.tabs.curate.title": "Edición de la comunidad - Curate",
+  "community.edit.tabs.curate.title": "Edición de la comunidad - Curar",
 
   // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "Editar metadatos",
@@ -1704,34 +1712,34 @@
 
 
   // "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).",
+  "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 ítems a las subcolecciones, editar los metadatos del ítem (después del envío) y agregar (mapear) ítems existentes de otras colecciones (sujeto a autorización).",
 
   // "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).",
+  "comcol-role.edit.collection-admin.description": "Los administradores de la colección deciden quién puede enviar ítems a la colección, editar los metadatos del ítem (después del envío) y agregar (mapear) ítems existentes de otras colecciones a esta colección (sujeto a autorización para esa colección).",
 
 
   // "comcol-role.edit.submitters.name": "Submitters",
   "comcol-role.edit.submitters.name": "Remitentes",
 
   // "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.",
+  "comcol-role.edit.submitters.description": "Los Usuarios y Grupos que tienen permiso para enviar nuevos ítems a esta colección.",
 
 
   // "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.name": "Acceso de lectura predeterminado del ítem",
 
   // "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.description": "Usuarios y Grupos que pueden leer nuevos ítems enviados a esta colección. Los cambios en este rol no son retroactivos. Los ítems 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.",
+  "comcol-role.edit.item_read.anonymous-group": "La lectura predeterminada para los ítems entrantes está configurada actualmente como Anónimo.",
 
 
   // "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.name": "Acceso de lectura predeterminado de archivos",
 
   // "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).",
+  "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 ítems a las subcolecciones, editar los metadatos del ítem (después del envío) y agregar (mapear) ítems existentes de otras colecciones (sujeto a autorización).",
 
   // "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.",
@@ -1821,6 +1829,12 @@
   // "cookies.consent.app.required.title": "(always required)",
   "cookies.consent.app.required.title": "(siempre requerido)",
 
+  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
+  "cookies.consent.app.disable-all.description": "Use este campo para habilitar o deshabilitar todos los servicios.",
+
+  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
+  "cookies.consent.app.disable-all.title": "Habilita o deshabilita todos los servicios",
+
   // "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.",
 
@@ -1828,10 +1842,22 @@
   "cookies.consent.close": "Cerrar",
 
   // "cookies.consent.decline": "Decline",
-  "cookies.consent.decline": "Disminución",
+  "cookies.consent.decline": "Declinar",
+
+  // "cookies.consent.ok": "That's ok",
+  "cookies.consent.ok": "Aceptar",
+
+  // "cookies.consent.save": "Save",
+  "cookies.consent.save": "Guardar",
+
+  // "cookies.consent.content-notice.title": "Cookie Consent",
+  "cookies.consent.content-notice.title": "Cookie Consent",
 
   // "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}.",
+  "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}.",
+
+  // "cookies.consent.content-notice.description.no-privacy": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>.",
+  "cookies.consent.content-notice.description.no-privacy": "Recopilamos y procesamos su información personal para los siguientes propósitos: <strong>Autenticación, Preferencias, Reconocimiento y Estadísticas</strong>.",
 
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Personalizar",
@@ -1843,12 +1869,16 @@
   "cookies.consent.content-modal.privacy-policy.name": "política de privacidad",
 
   // "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}.",
+  "cookies.consent.content-modal.privacy-policy.text": "Para más información, lea por favor nuestra {privacyPolicy}.",
 
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Información que recopilamos",
 
+  // "cookies.consent.content-modal.services": "services",
+  "cookies.consent.content-modal.services": "servicios",
 
+  // "cookies.consent.content-modal.service": "service",
+  "cookies.consent.content-modal.service": "servicio",
 
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "Autenticación",
@@ -1881,12 +1911,27 @@
 
 
 
+  // "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
+  "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
+
+  // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
+  "cookies.consent.app.description.google-recaptcha": "Utilizamos el servicio google reCAPTCHA durante el registro y la recuperación de contraseña",
+
+
   // "cookies.consent.purpose.functional": "Functional",
   "cookies.consent.purpose.functional": "Funcional",
 
   // "cookies.consent.purpose.statistical": "Statistical",
   "cookies.consent.purpose.statistical": "Estadístico",
 
+  // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
+  "cookies.consent.purpose.registration-password-recovery": "Registro y recuperación de contraseña",
+
+  // "cookies.consent.purpose.sharing": "Sharing",
+  "cookies.consent.purpose.sharing": "Compartición",
+
+  // "curation-task.task.citationpage.label":  "Generate Citation Page",
+  "curation-task.task.citationpage.label":  "Generar página de cita",
 
   // "curation-task.task.checklinks.label":  "Check Links in Metadata",
   "curation-task.task.checklinks.label": "Comprobar enlaces en metadatos",
@@ -1895,7 +1940,7 @@
   "curation-task.task.noop.label": "NOOP",
 
   // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
-  "curation-task.task.profileformats.label": "Formatos de perfil de archivo de perfil",
+  "curation-task.task.profileformats.label": "Perfil de formatos de archivo",
 
   // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
   "curation-task.task.requiredmetadata.label": "Comprobar los metadatos requeridos",
@@ -1906,13 +1951,16 @@
   // "curation-task.task.vscan.label": "Virus Scan",
   "curation-task.task.vscan.label": "Búsqueda de virus",
 
+  // "curation-task.task.registerdoi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "Registra DOI",
+
 
 
   // "curation.form.task-select.label": "Task:",
   "curation.form.task-select.label": "Tarea:",
 
   // "curation.form.submit": "Start",
-  "curation.form.submit": "Comienzo",
+  "curation.form.submit": "Iniciar",
 
   // "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.",
@@ -1933,11 +1981,12 @@
   "curation.form.handle.label": "Handle:",
 
   // "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
-  "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)",
+  "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)",
+
 
 
   // "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.message": "Estimado {{ recipientName }},\nEn respuesta a su solicitud, lamento informarle que no es posible enviarle una copia de los archivos que ha solicitado, en relación con el documento: \"{{ itemUrl }}\" ({{ itemName }}), del cual soy autor.\n\nSaludos cordiales,\n{{ authorName }} <{{ authorEmail }}>",
 
   // "deny-request-copy.email.subject": "Request copy of document",
   "deny-request-copy.email.subject": "Solicitar una copia del documento",
@@ -1960,6 +2009,7 @@
   "dso.name.untitled": "Sin título",
 
 
+
   // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "Nueva colección",
 
@@ -1969,6 +2019,9 @@
   // "dso-selector.create.community.head": "New community",
   "dso-selector.create.community.head": "Nueva comunidad",
 
+  // "dso-selector.create.community.or-divider": "or",
+  "dso-selector.create.community.or-divider": "o",
+
   // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "Crea una nueva comunidad en",
 
@@ -1999,6 +2052,12 @@
   // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
   "dso-selector.export-metadata.dspaceobject.head": "Exportar metadatos desde",
 
+  // "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
+  "dso-selector.export-batch.dspaceobject.head": "Exportar archivo por lotes (ZIP) desde",
+
+  // "dso-selector.import-batch.dspaceobject.head": "Import batch from",
+  "dso-selector.import-batch.dspaceobject.head": "Importar archivo por lotes desde",
+
   // "dso-selector.no-results": "No {{ type }} found",
   "dso-selector.no-results": "No se encontró {{ type }}",
 
@@ -2012,16 +2071,19 @@
   "dso-selector.set-scope.community.head": "Seleccione un ámbito de búsqueda",
 
   // "dso-selector.set-scope.community.button": "Search all of DSpace",
-  "dso-selector.set-scope.community.button": "Buscar en todo  DSpace",
+  "dso-selector.set-scope.community.button": "Buscar en todo DSpace",
+
+  // "dso-selector.set-scope.community.or-divider": "or",
+  "dso-selector.set-scope.community.or-divider": "o",
 
   // "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",
 
   // "dso-selector.claim.item.head": "Profile tips",
-  "dso-selector.claim.item.head": "Consejos de perfil",
+  "dso-selector.claim.item.head": "Sugerencias de perfil",
 
   // "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.",
+  "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.",
 
   // "dso-selector.claim.item.not-mine-label": "None of these are mine",
   "dso-selector.claim.item.not-mine-label": "Ninguno de esos es mio",
@@ -2029,6 +2091,9 @@
   // "dso-selector.claim.item.create-from-scratch": "Create a new one",
   "dso-selector.claim.item.create-from-scratch": "Crear uno nuevo",
 
+  // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
+  "dso-selector.results-could-not-be-retrieved": "Algo salió mal, por favor actualice de nuevo ↻",
+
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "Exportar metadatos para {{ dsoName }}",
 
@@ -2041,11 +2106,23 @@
   // "confirmation-modal.export-metadata.confirm": "Export",
   "confirmation-modal.export-metadata.confirm": "Exportar",
 
+  // "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.header": "Exportar archivo por lotes (ZIP) para {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.info": "¿Está seguro de que desea exportar un archivo por lotes (ZIP) para {{ dsoName }}?",
+
+  // "confirmation-modal.export-batch.cancel": "Cancel",
+  "confirmation-modal.export-batch.cancel": "Cancelar",
+
+  // "confirmation-modal.export-batch.confirm": "Export",
+  "confirmation-modal.export-batch.confirm": "Exportar",
+
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
-  "confirmation-modal.delete-eperson.header": "Borrar usuario \"{{ dsoName }} \"",
+  "confirmation-modal.delete-eperson.header": "Borrar usuario \"{{ dsoName }}\"",
 
   // "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 }} \"?",
+  "confirmation-modal.delete-eperson.info": "¿Está seguro de que desea eliminar al usuario \"{{ dsoName }}\"?",
 
   // "confirmation-modal.delete-eperson.cancel": "Cancel",
   "confirmation-modal.delete-eperson.cancel": "Cancelar",
@@ -2103,7 +2180,7 @@
   "error.search-results": "Error al recuperar los resultados de búsqueda",
 
   // "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.",
+  "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 más información sobre este error.",
 
   // "error.sub-collections": "Error fetching sub-collections",
   "error.sub-collections": "Error al recuperar subcolecciones",
@@ -2112,16 +2189,16 @@
   "error.sub-communities": "Error al recuperar subcomunidades",
 
   // "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:",
+  "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: <br> <br>",
 
   // "error.top-level-communities": "Error fetching top-level communities",
-  "error.top-level-communities": "Error al recuperar las comunidades de nivel superior",
+  "error.top-level-communities": "Error al recuperar las comunidades de primer nivel",
 
   // "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.",
 
   // "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 }}.",
+  "error.validation.pattern": "Esta entrada está restringida por este patrón: {{ pattern }}.",
 
   // "error.validation.filerequired": "The file upload is mandatory",
   "error.validation.filerequired": "La carga de un archivo es obligatoria",
@@ -2130,7 +2207,7 @@
   "error.validation.required": "Se requiere este campo",
 
   // "error.validation.NotValidEmail": "This E-mail is not a valid email",
-  "error.validation.NotValidEmail": "Este no es correo electrónico válido",
+  "error.validation.NotValidEmail": "Este no es un correo electrónico válido",
 
   // "error.validation.emailTaken": "This E-mail is already taken",
   "error.validation.emailTaken": "Este correo electrónico ya está en uso",
@@ -2149,7 +2226,7 @@
 
 
   // "footer.copyright": "copyright © 2002-{{ year }}",
-  "footer.copyright": "copyright © 2002 - {{ year }}",
+  "footer.copyright": "copyright © 2002-{{ year }}",
 
   // "footer.link.dspace": "DSpace software",
   "footer.link.dspace": "Software DSpace",
@@ -2212,17 +2289,17 @@
   // "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.",
+  // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box.",
+  "forgot-password.form.info": "Introduzca una nueva contraseña en el cuadro a continuación y confírmela reescribiéndola en el segundo cuadro.",
 
   // "forgot-password.form.card.security": "Security",
   "forgot-password.form.card.security": "Seguridad",
 
   // "forgot-password.form.identification.header": "Identify",
-  "forgot-password.form.identification.header": "Identificar",
+  "forgot-password.form.identification.header": "Identidad",
 
   // "forgot-password.form.identification.email": "Email address: ",
-  "forgot-password.form.identification.email": "Dirección de correo electrónico:",
+  "forgot-password.form.identification.email": "Dirección de correo electrónico: ",
 
   // "forgot-password.form.label.password": "Password",
   "forgot-password.form.label.password": "Contraseña",
@@ -2236,9 +2313,6 @@
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
   "forgot-password.form.error.matching-passwords": "Las contraseñas no coinciden.",
 
-  // "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.",
-
   // "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",
 
@@ -2252,7 +2326,6 @@
   "forgot-password.form.submit": "Enviar contraseña",
 
 
-
   // "form.add": "Add more",
   "form.add": "Añadir más",
 
@@ -2296,7 +2369,7 @@
   "form.group-expand-help": "Haga clic aquí para expandir y agregar más elementos",
 
   // "form.last-name": "Last name",
-  "form.last-name": "Apellido",
+  "form.last-name": "Apellidos",
 
   // "form.loading": "Loading...",
   "form.loading": "Cargando...",
@@ -2338,6 +2411,7 @@
   "form.repeatable.sort.tip": "Suelte el ítem en la nueva posición",
 
 
+
   // "grant-deny-request-copy.deny": "Don't send copy",
   "grant-deny-request-copy.deny": "No envíe copia",
 
@@ -2351,7 +2425,7 @@
   "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.info": "Puede aprovechar la ocasión para reconsiderar las restricciones de acceso al documento (para evitar tener que responder a estas solicitudes). Si desea solicitar a los administadores del repositorio que retiren 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",
@@ -2369,7 +2443,7 @@
   "grant-deny-request-copy.grant": "Enviar copia",
 
   // "grant-deny-request-copy.header": "Document copy request",
-  "grant-deny-request-copy.header": "Solciitud de copia de documento",
+  "grant-deny-request-copy.header": "Solicitud de copia de documento",
 
   // "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",
@@ -2377,13 +2451,11 @@
   // "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",
 
-
   // "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.",
 
-
   // "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",
+  "grant-deny-request-copy.processed": "Esta solicitud ya fue procesada. Puede usar los botones inferiores para regresas a la página de inicio",
 
 
 
@@ -2397,7 +2469,7 @@
   "grant-request-copy.error": "Ocurrió un error",
 
   // "grant-request-copy.header": "Grant document copy request",
-  "grant-request-copy.header": "Permitir solicitud de copia de documento",
+  "grant-request-copy.header": "Conceder solicitud de copia de documento",
 
   // "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.",
@@ -2458,7 +2530,7 @@
   "health-page.status.error.info": "Problemas detectados",
 
   // "health-page.status.warning.info": "Possible issues detected",
-   "health-page.status.warning.info": "Detectados problemas potenciales",
+  "health-page.status.warning.info": "Detectados problemas potenciales",
 
   // "health-page.title": "Health",
   "health-page.title": "Chequeos",
@@ -2562,18 +2634,18 @@
 
 
   // "item.alerts.private": "This item is non-discoverable",
-  "item.alerts.private": "Este artículo es privado",
+  "item.alerts.private": "Este ítem es privado",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
-  "item.alerts.withdrawn": "Este artículo ha sido retirado",
+  "item.alerts.withdrawn": "Este ítem ha sido retirado",
 
 
 
   // "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.heading": "Con este editor puede ver y modificar las políticas de un ítem, además de modificar las políticas de los componentes individuales del ítem: paquetes y archivos. Brevemente, un ítem 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",
+  "item.edit.authorizations.title": "Editar las políticas del ítem",
 
 
 
@@ -2595,7 +2667,7 @@
   "item.bitstreams.upload.bundle.new": "Crear bloque",
 
   // "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.bundles.empty": "Este ítem no contiene ningún bloque para cargar un archivo.",
 
   // "item.bitstreams.upload.cancel": "Cancel",
   "item.bitstreams.upload.cancel": "Cancelar",
@@ -2604,7 +2676,7 @@
   "item.bitstreams.upload.drop-message": "Suelta un archivo para subir",
 
   // "item.bitstreams.upload.item": "Item: ",
-  "item.bitstreams.upload.item": "Artículo:",
+  "item.bitstreams.upload.item": "Ítem: ",
 
   // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
   "item.bitstreams.upload.notifications.bundle.created.content": "Nuevo bloque creado con éxito.",
@@ -2636,7 +2708,7 @@
   "item.edit.bitstreams.bundle.name": "BLOQUE: {{ name }}",
 
   // "item.edit.bitstreams.discard-button": "Discard",
-  "item.edit.bitstreams.discard-button": "Descarte",
+  "item.edit.bitstreams.discard-button": "Descartar",
 
   // "item.edit.bitstreams.edit.buttons.download": "Download",
   "item.edit.bitstreams.edit.buttons.download": "Descargar",
@@ -2654,13 +2726,13 @@
   "item.edit.bitstreams.edit.buttons.undo": "Deshacer cambios",
 
   // "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.bitstreams.empty": "Este ítem no contiene ningún archivo. Haga clic en el botón de carga para crear uno.",
 
   // "item.edit.bitstreams.headers.actions": "Actions",
-  "item.edit.bitstreams.headers.actions": "Comportamiento",
+  "item.edit.bitstreams.headers.actions": "Acciones",
 
   // "item.edit.bitstreams.headers.bundle": "Bundle",
-  "item.edit.bitstreams.headers.bundle": "Manojo",
+  "item.edit.bitstreams.headers.bundle": "Bloque",
 
   // "item.edit.bitstreams.headers.description": "Description",
   "item.edit.bitstreams.headers.description": "Descripción",
@@ -2672,7 +2744,7 @@
   "item.edit.bitstreams.headers.name": "Nombre",
 
   // "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.content": "Tus cambios fueron descartados. Para restaurar tus cambios haga clic en el botón 'Deshacer'",
 
   // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
   "item.edit.bitstreams.notifications.discarded.title": "Cambios descartados",
@@ -2681,13 +2753,13 @@
   "item.edit.bitstreams.notifications.move.failed.title": "Error al mover 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.bitstreams.notifications.move.saved.content": "Se han guardado los cambios de movimientos en los archivos y paquetes de este ítem.",
 
   // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
-  "item.edit.bitstreams.notifications.move.saved.title": "Mover cambios guardados",
+  "item.edit.bitstreams.notifications.move.saved.title": "Cambios de movimientos guardados",
 
   // "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.bitstreams.notifications.outdated.content": "Otro usuario ha cambiado el ítem en el que está trabajando actualmente. Tus cambios han sido descartados para evitar conflictos",
 
   // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
   "item.edit.bitstreams.notifications.outdated.title": "Cambios desactualizados",
@@ -2696,7 +2768,7 @@
   "item.edit.bitstreams.notifications.remove.failed.title": "Error al eliminar archivo",
 
   // "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.content": "Se han guardado los cambios de eliminación de los archivos de este ítem.",
 
   // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
   "item.edit.bitstreams.notifications.remove.saved.title": "Se guardaron los cambios de eliminación",
@@ -2719,22 +2791,22 @@
   "item.edit.delete.confirm": "Borrar",
 
   // "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.delete.description": "¿Estás seguro de que este ítem debería eliminarse por completo? Precaución: en la actualidad, no se dejaría ningun rastro.",
 
   // "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.delete.error": "Se produjo un error al eliminar el ítem.",
 
   // "item.edit.delete.header": "Delete item: {{ id }}",
-  "item.edit.delete.header": "Eliminar artículo: {{ id }}",
+  "item.edit.delete.header": "Eliminar ítem: {{ id }}",
 
   // "item.edit.delete.success": "The item has been deleted",
-  "item.edit.delete.success": "El artículo ha sido eliminado",
+  "item.edit.delete.success": "El ítem ha sido eliminado",
 
   // "item.edit.head": "Edit Item",
-  "item.edit.head": "Editar artículo",
+  "item.edit.head": "Editar ítem",
 
   // "item.edit.breadcrumbs": "Edit Item",
-  "item.edit.breadcrumbs": "Editar artículo",
+  "item.edit.breadcrumbs": "Editar ítem",
 
   // "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",
@@ -2744,49 +2816,49 @@
   "item.edit.tabs.mapper.head": "Mapeador de colecciones",
 
   // "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.item-mapper.title": "Edición de ítem - 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.add": "Asignar ítem 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",
+  "item.edit.item-mapper.buttons.remove": "Eliminar la asignación de ítem para las colecciones seleccionadas",
 
   // "item.edit.item-mapper.cancel": "Cancel",
   "item.edit.item-mapper.cancel": "Cancelar",
 
   // "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.item-mapper.description": "Esta es la herramienta de asignación de ítems que permite a los administradores asignar este ítem a otras colecciones. Puede buscar colecciones y mapearlas, o explorar la lista de colecciones a las que el ítem está mapeado actualmente.",
 
   // "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.item-mapper.head": "Asignador de ítems: asigna ítems a colecciones",
 
   // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
-  "item.edit.item-mapper.item": "Artículo: \"<b>{{ name }}</b>\"",
+  "item.edit.item-mapper.item": "Ítem: \"<b>{{ name }}</b>\"",
 
   // "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.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.content": "Se produjeron errores al mapear el ítem a {{ amount }} colecciones.",
 
   // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
   "item.edit.item-mapper.notifications.add.error.head": "Errores de mapeo",
 
   // "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.item-mapper.notifications.add.success.content": "Se asignó correctamente el ítem a {{ amount }} colecciones.",
 
   // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
   "item.edit.item-mapper.notifications.add.success.head": "Mapeo completado",
 
   // "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.content": "Se produjeron errores en 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.item-mapper.notifications.remove.success.content": "Se eliminó correctamente la asignación del ítem a {{ amount }} colecciones.",
 
   // "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",
@@ -2806,7 +2878,7 @@
   "item.edit.metadata.add-button": "Agregar",
 
   // "item.edit.metadata.discard-button": "Discard",
-  "item.edit.metadata.discard-button": "Descarte",
+  "item.edit.metadata.discard-button": "Descartar",
 
   // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "Editar",
@@ -2821,7 +2893,7 @@
   "item.edit.metadata.edit.buttons.unedit": "Dejar de editar",
 
   // "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.edit.metadata.empty": "Actualmente, el ítem no contiene metadatos. Haga clic en Agregar para comenzar a agregar un valor de metadatos.",
 
   // "item.edit.metadata.headers.edit": "Edit",
   "item.edit.metadata.headers.edit": "Editar",
@@ -2841,8 +2913,8 @@
   // "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.edit.metadata.notifications.discarded.title": "Changed discarded",
-  "item.edit.metadata.notifications.discarded.title": "Cambiado descartado",
+  // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "item.edit.metadata.notifications.discarded.title": "Cambios descartados",
 
   // "item.edit.metadata.notifications.error.title": "An error occurred",
   "item.edit.metadata.notifications.error.title": "Ocurrió un error",
@@ -2854,13 +2926,13 @@
   "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. ",
+  "item.edit.metadata.notifications.outdated.content": "Otro usuario ha cambiado el ítem en el que está trabajando actualmente. Tus cambios han sido descartados para evitar conflictos",
 
-  // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
-  "item.edit.metadata.notifications.outdated.title": "Cambiado desactualizado",
+  // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "item.edit.metadata.notifications.outdated.title": "Cambios desactualizados",
 
   // "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.edit.metadata.notifications.saved.content": "Se guardaron sus cambios en los metadatos de este ítem.",
 
   // "item.edit.metadata.notifications.saved.title": "Metadata saved",
   "item.edit.metadata.notifications.saved.title": "Metadatos guardados",
@@ -2891,16 +2963,16 @@
   "item.edit.move.save-button": "Guardar",
 
   // "item.edit.move.discard-button": "Discard",
-  "item.edit.move.discard-button": "Descarte",
+  "item.edit.move.discard-button": "Descartar",
 
   // "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.edit.move.description": "Seleccione la colección a la que desea mover este ítem. Para reducir la lista de colecciones mostradas, puede introducir una búsqueda en el cuadro.",
 
   // "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.edit.move.error": "Se produjo un error al intentar mover el ítem.",
 
   // "item.edit.move.head": "Move item: {{id}}",
-  "item.edit.move.head": "Mover artículo: {{ id }}",
+  "item.edit.move.head": "Mover ítem: {{ id }}",
 
   // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
   "item.edit.move.inheritpolicies.checkbox": "Heredar políticas",
@@ -2909,10 +2981,10 @@
   "item.edit.move.inheritpolicies.description": "Heredar las políticas predeterminadas de la colección de destino",
 
   // "item.edit.move.move": "Move",
-  "item.edit.move.move": "Moverse",
+  "item.edit.move.move": "Mover",
 
   // "item.edit.move.processing": "Moving...",
-  "item.edit.move.processing": "Moviente...",
+  "item.edit.move.processing": "Moviendo...",
 
   // "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",
@@ -2938,7 +3010,7 @@
   "item.edit.private.error": "Se produjo un error al convertir el ítem en privado.",
 
   // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
-  "item.edit.private.header": "Convertir el ítem en privado {{ id }}",
+  "item.edit.private.header": "Convertir el ítem en privado: {{ id }}",
 
   // "item.edit.private.success": "The item is now non-discoverable",
   "item.edit.private.success": "El ítem ahora es privado",
@@ -2958,7 +3030,7 @@
   "item.edit.public.error": "Se produjo un error al convertir el ítem en público.",
 
   // "item.edit.public.header": "Make item discoverable: {{ id }}",
-  "item.edit.public.header": "Convertir el ítem en público{{ id }}",
+  "item.edit.public.header": "Convertir el ítem en público: {{ id }}",
 
   // "item.edit.public.success": "The item is now discoverable",
   "item.edit.public.success": "El ítem ahora es público",
@@ -3001,7 +3073,7 @@
   "item.edit.relationships.no-relationships": "Sin relaciones",
 
   // "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.edit.relationships.notifications.discarded.content": "Sus cambios fueron descartados. Para recuperar sus cambios pulse el botón 'Deshacer'",
 
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
   "item.edit.relationships.notifications.discarded.title": "Cambios descartados",
@@ -3010,7 +3082,7 @@
   "item.edit.relationships.notifications.failed.title": "Error al editar las relaciones",
 
   // "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.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",
@@ -3028,7 +3100,7 @@
   "item.edit.relationships.save-button": "Guardar",
 
   // "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.relationships.no-entity-type": "Agregue metadatos 'dspace.entity.type' para habilitar las relaciones para este ítem",
 
 
   // "item.edit.return": "Back",
@@ -3111,7 +3183,7 @@
   "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.",
+  "item.edit.tabs.status.description": "Bienvenido a la página de administración de ítems. Desde aquí puede retirar, restablecer, mover o eliminar el ítem. También puede actualizar o agregar nuevos metadatos / archivos en las otras pestañas.",
 
   // "item.edit.tabs.status.head": "Status",
   "item.edit.tabs.status.head": "Estado",
@@ -3186,7 +3258,7 @@
   "item.page.publisher": "Editor",
 
   // "item.page.titleprefix": "Item: ",
-  "item.page.titleprefix": "Ítem:",
+  "item.page.titleprefix": "Ítem: ",
 
   // "item.page.volume-title": "Volume Title",
   "item.page.volume-title": "Título del volumen",
@@ -3198,7 +3270,7 @@
   "item.search.title": "Búsqueda de ítems",
 
   // "item.truncatable-part.show-more": "Show more",
-  "item.truncatable-part.show-more": "Mas..",
+  "item.truncatable-part.show-more": "Más...",
 
   // "item.truncatable-part.show-less": "Collapse",
   "item.truncatable-part.show-less": "Contraer",
@@ -3397,7 +3469,7 @@
   "item.select.confirm": "Confirmar seleccionado",
 
   // "item.select.empty": "No items to show",
-  "item.select.empty": "No hay artículos para mostrar",
+  "item.select.empty": "No hay ítems para mostrar",
 
   // "item.select.table.author": "Author",
   "item.select.table.author": "Autor",
@@ -3410,7 +3482,7 @@
 
 
   // "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.version.history.empty": "Aún no hay otras versiones para este ítem.",
 
   // "item.version.history.head": "Version History",
   "item.version.history.head": "Historial de versiones",
@@ -3428,7 +3500,7 @@
   "item.version.history.table.version": "Versión",
 
   // "item.version.history.table.item": "Item",
-  "item.version.history.table.item": "Artículo",
+  "item.version.history.table.item": "Ítem",
 
   // "item.version.history.table.editor": "Editor",
   "item.version.history.table.editor": "Editor",
@@ -3471,7 +3543,7 @@
 
 
   // "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.version.notice": "Esta no es la última versión de este ítem. La última versión se puede encontrar <a href='{{ destination }}'>aquí</a>.",
 
 
   // "item.version.create.modal.header": "New version",
@@ -3487,7 +3559,7 @@
   "item.version.create.modal.button.confirm": "Crear",
 
   // "item.version.create.modal.button.confirm.tooltip": "Create new version",
-  "item.version.create.modal.button.confirm.tooltip": "Crear  nueva versión",
+  "item.version.create.modal.button.confirm.tooltip": "Crear nueva versión",
 
   // "item.version.create.modal.button.cancel": "Cancel",
   "item.version.create.modal.button.cancel": "Cancelar",
@@ -3505,7 +3577,7 @@
   "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.",
+  "item.version.create.modal.submitted.text": "Se está creando la nueva versión. Si el ítem tiene muchas relaciones, este proceso podría tardar.",
 
   // "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}}",
@@ -3521,7 +3593,7 @@
   "item.version.delete.modal.header": "Borrar versión",
 
   // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
-  "item.version.delete.modal.text": "Quierr borrar la versión {{version}}?",
+  "item.version.delete.modal.text": "Quiere borrar la versión {{version}}?",
 
   // "item.version.delete.modal.button.confirm": "Delete",
   "item.version.delete.modal.button.confirm": "Borrar",
@@ -3536,10 +3608,10 @@
   "item.version.delete.modal.button.cancel.tooltip": "No borrar esta versión",
 
   // "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}}",
+  "item.version.delete.notification.success" : "Se ha borrado la versión número {{version}}",
 
   // "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}}",
+  "item.version.delete.notification.failure" : "No se ha borrado la versión número {{version}}",
 
 
   // "item.version.edit.notification.success" : "The summary of version number {{version}} has been changed",
@@ -3549,6 +3621,7 @@
   "item.version.edit.notification.failure" : "No ha cambiado el resumen de la versión número {{version}}",
 
 
+
   // "journal.listelement.badge": "Journal",
   "journal.listelement.badge": "Revista",
 
@@ -3568,7 +3641,7 @@
   "journal.page.publisher": "Editor",
 
   // "journal.page.titleprefix": "Journal: ",
-  "journal.page.titleprefix": "Revista:",
+  "journal.page.titleprefix": "Revista: ",
 
   // "journal.search.results.head": "Journal Search Results",
   "journal.search.results.head": "Resultados de la búsqueda de revistas",
@@ -3588,7 +3661,7 @@
   "journalissue.page.description": "Descripción",
 
   // "journalissue.page.edit": "Edit this item",
-  "journalissue.page.edit": "Editar este ítema",
+  "journalissue.page.edit": "Editar este ítem",
 
   // "journalissue.page.issuedate": "Issue Date",
   "journalissue.page.issuedate": "Fecha de publicación",
@@ -3606,7 +3679,7 @@
   "journalissue.page.number": "Número",
 
   // "journalissue.page.titleprefix": "Journal Issue: ",
-  "journalissue.page.titleprefix": "Número de la revista:",
+  "journalissue.page.titleprefix": "Número de la revista: ",
 
 
 
@@ -3623,7 +3696,7 @@
   "journalvolume.page.issuedate": "Fecha de publicación",
 
   // "journalvolume.page.titleprefix": "Journal Volume: ",
-  "journalvolume.page.titleprefix": "Volumen de la revista:",
+  "journalvolume.page.titleprefix": "Volumen de la revista: ",
 
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Volumen",
@@ -3670,7 +3743,7 @@
   "loading.bitstreams": "Cargando archivos...",
 
   // "loading.browse-by": "Loading items...",
-  "loading.browse-by": "Cargando artículos...",
+  "loading.browse-by": "Cargando ítems...",
 
   // "loading.browse-by-page": "Loading page...",
   "loading.browse-by-page": "Cargando página...",
@@ -3691,13 +3764,13 @@
   "loading.default": "Cargando...",
 
   // "loading.item": "Loading item...",
-  "loading.item": "Cargando artículo...",
+  "loading.item": "Cargando ítem...",
 
   // "loading.items": "Loading items...",
-  "loading.items": "Cargando artículos...",
+  "loading.items": "Cargando ítems...",
 
   // "loading.mydspace-results": "Loading items...",
-  "loading.mydspace-results": "Cargando artículos...",
+  "loading.mydspace-results": "Cargando ítems...",
 
   // "loading.objects": "Loading...",
   "loading.objects": "Cargando...",
@@ -3715,7 +3788,7 @@
   "loading.sub-communities": "Cargando subcomunidades...",
 
   // "loading.top-level-communities": "Loading top-level communities...",
-  "loading.top-level-communities": "Cargando comunidades de nivel superior...",
+  "loading.top-level-communities": "Cargando comunidades de primer nivel...",
 
 
 
@@ -3789,7 +3862,7 @@
   "menu.section.access_control_groups": "Grupos",
 
   // "menu.section.access_control_people": "People",
-  "menu.section.access_control_people": "Gente",
+  "menu.section.access_control_people": "Usuarios",
 
 
 
@@ -3805,7 +3878,7 @@
   "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",
+  "menu.section.browse_community_by_issue_date": "Por fecha de publicación",
 
   // "menu.section.browse_community_by_title": "By Title",
   "menu.section.browse_community_by_title": "Por titulo",
@@ -3817,7 +3890,7 @@
   "menu.section.browse_global_by_author": "Por autor",
 
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
-  "menu.section.browse_global_by_dateissued": "Por fecha de emisión",
+  "menu.section.browse_global_by_dateissued": "Por fecha de publicación",
 
   // "menu.section.browse_global_by_subject": "By Subject",
   "menu.section.browse_global_by_subject": "Por tema",
@@ -3834,7 +3907,7 @@
   "menu.section.control_panel": "Panel de control",
 
   // "menu.section.curation_task": "Curation Task",
-  "menu.section.curation_task": "Tarea de conservación",
+  "menu.section.curation_task": "Tareas de curación",
 
 
 
@@ -3848,7 +3921,7 @@
   "menu.section.edit_community": "Comunidad",
 
   // "menu.section.edit_item": "Item",
-  "menu.section.edit_item": "Artículo",
+  "menu.section.edit_item": "Ítem",
 
 
 
@@ -3862,11 +3935,13 @@
   "menu.section.export_community": "Comunidad",
 
   // "menu.section.export_item": "Item",
-  "menu.section.export_item": "Artículo",
+  "menu.section.export_item": "Ítem",
 
   // "menu.section.export_metadata": "Metadata",
   "menu.section.export_metadata": "Metadatos",
 
+  // "menu.section.export_batch": "Batch Export (ZIP)",
+  "menu.section.export_batch": "Exportación por lotes (ZIP)",
 
 
   // "menu.section.icon.access_control": "Access Control menu section",
@@ -3882,28 +3957,28 @@
   "menu.section.icon.curation_tasks": "Sección del menú de Tareas de curación",
 
   // "menu.section.icon.edit": "Edit menu section",
-  "menu.section.icon.edit": "Editar sección del menú",
+  "menu.section.icon.edit": "Sección del menú de edición",
 
   // "menu.section.icon.export": "Export menu section",
-  "menu.section.icon.export": "Exportar sección de menú",
+  "menu.section.icon.export": "Sección de menú de exportación",
 
   // "menu.section.icon.find": "Find menu section",
-  "menu.section.icon.find": "Buscar sección de menú",
+  "menu.section.icon.find": "Sección de menú de búsqueda",
 
   // "menu.section.icon.health": "Health check menu section",
   "menu.section.icon.health": "Sección de menú de Chequeos",
 
   // "menu.section.icon.import": "Import menu section",
-  "menu.section.icon.import": "Importar sección de menú",
+  "menu.section.icon.import": "Sección de menú de importación",
 
   // "menu.section.icon.new": "New menu section",
-  "menu.section.icon.new": "Nueva sección de menú",
+  "menu.section.icon.new": "Sección de menú de creación",
 
   // "menu.section.icon.pin": "Pin sidebar",
   "menu.section.icon.pin": "Anclar barra lateral",
 
   // "menu.section.icon.processes": "Processes Health",
-  "menu.section.icon.processes": "Sección de menú de Procesosde chequeo",
+  "menu.section.icon.processes": "Sección de menú de Procesos de chequeo",
 
   // "menu.section.icon.registries": "Registries menu section",
   "menu.section.icon.registries": "Sección de menu de Registros",
@@ -3940,10 +4015,10 @@
   "menu.section.new_community": "Comunidad",
 
   // "menu.section.new_item": "Item",
-  "menu.section.new_item": "Artículo",
+  "menu.section.new_item": "Ítem",
 
   // "menu.section.new_item_version": "Item Version",
-  "menu.section.new_item_version": "Versión del artículo",
+  "menu.section.new_item_version": "Versión del ítem",
 
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Proceso",
@@ -3992,7 +4067,7 @@
   "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 curación",
+  "menu.section.toggle.curation_task": "Alternar la sección Tareas de curación",
 
   // "menu.section.toggle.edit": "Toggle Edit section",
   "menu.section.toggle.edit": "Alternar sección de Edición",
@@ -4007,7 +4082,7 @@
   "menu.section.toggle.import": "Alternar sección de Importación",
 
   // "menu.section.toggle.new": "Toggle New section",
-  "menu.section.toggle.new": "Alternar nueva sección",
+  "menu.section.toggle.new": "Alternar sección de Creación",
 
   // "menu.section.toggle.registries": "Toggle Registries section",
   "menu.section.toggle.registries": "Alternar sección de Registros",
@@ -4022,10 +4097,8 @@
 
   // "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.success": "La exportació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",
 
@@ -4036,9 +4109,6 @@
   // "mydspace.description": "",
   "mydspace.description": "",
 
-  // "mydspace.general.text-here": "here",
-  "mydspace.general.text-here": "aquí",
-
   // "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.",
 
@@ -4052,7 +4122,7 @@
   "mydspace.messages.mark-as-read": "Marcar como leído",
 
   // "mydspace.messages.mark-as-unread": "Mark as unread",
-  "mydspace.messages.mark-as-unread": "marcar como no leído",
+  "mydspace.messages.mark-as-unread": "Marcar como no leído",
 
   // "mydspace.messages.no-content": "No content.",
   "mydspace.messages.no-content": "Sin contenido.",
@@ -4112,7 +4182,7 @@
   "mydspace.results.no-title": "Sin título",
 
   // "mydspace.results.no-uri": "No Uri",
-  "mydspace.results.no-uri": "Sin Uri",
+  "mydspace.results.no-uri": "Sin URI",
 
   // "mydspace.search-form.placeholder": "Search in mydspace...",
   "mydspace.search-form.placeholder": "Buscar en Mi DSpace...",
@@ -4145,7 +4215,7 @@
   "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-manyentries": "Archivo no procesable. Se detectaron demasiadas entradas, pero solo se permite una por 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.",
@@ -4153,11 +4223,8 @@
   // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
   "mydspace.upload.upload-multiple-successful": "Se crearon {{ qty }} nuevos ítems del espacio de trabajo.",
 
-  // "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.",
-
   // "mydspace.view-btn": "View",
-  "mydspace.view-btn": "Vista",
+  "mydspace.view-btn": "Ver",
 
 
 
@@ -4173,8 +4240,11 @@
   // "nav.login": "Log In",
   "nav.login": "Iniciar sesión",
 
-  // "nav.logout": "User profile menu and Log Out",
-  "nav.logout": "Menú de perfil de usuario y cierre de sesión",
+  // "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  "nav.user-profile-menu-and-logout": "Menú de perfil de usuario y cierre de sesión",
+
+  // "nav.logout": "Log Out",
+  "nav.logout": "Cerrar sesión",
 
   // "nav.main.description": "Main navigation bar",
   "nav.main.description": "Barra de navegación principal",
@@ -4192,7 +4262,7 @@
   "nav.statistics.header": "Estadísticas",
 
   // "nav.stop-impersonating": "Stop impersonating EPerson",
-  "nav.stop-impersonating": "Dejar de impersonar a EPerson",
+  "nav.stop-impersonating": "Dejar de hacerse pasar por usuario",
 
   // "nav.toggle" : "Toggle navigation",
   "nav.toggle": "Alternar navegación",
@@ -4203,9 +4273,13 @@
   // "none.listelement.badge": "Item",
   "none.listelement.badge": "Ítem",
 
+
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Unidad organizativa",
 
+  // "orgunit.listelement.no-title": "Untitled",
+  "orgunit.listelement.no-title": "Sin título",
+
   // "orgunit.page.city": "City",
   "orgunit.page.city": "Ciudad",
 
@@ -4225,7 +4299,8 @@
   "orgunit.page.id": "ID",
 
   // "orgunit.page.titleprefix": "Organizational Unit: ",
-  "orgunit.page.titleprefix": "Unidad organizativa:",
+  "orgunit.page.titleprefix": "Unidad organizativa: ",
+
 
 
   // "pagination.options.description": "Pagination options",
@@ -4238,10 +4313,10 @@
   "pagination.showing.detail": "{{ range }} de {{ total }}",
 
   // "pagination.showing.label": "Now showing ",
-  "pagination.showing.label": "Mostrando",
+  "pagination.showing.label": "Mostrando ",
 
   // "pagination.sort-direction": "Sort Options",
-  "pagination.sort-direction": "Opciones de clasificación",
+  "pagination.sort-direction": "Opciones de ordenación",
 
 
 
@@ -4255,19 +4330,19 @@
   "person.page.birthdate": "Fecha de nacimiento",
 
   // "person.page.edit": "Edit this item",
-  "person.page.edit": "Editar este artículo",
+  "person.page.edit": "Editar este ítem",
 
   // "person.page.email": "Email Address",
   "person.page.email": "Dirección de correo electrónico",
 
   // "person.page.firstname": "First Name",
-  "person.page.firstname": "Primer nombre",
+  "person.page.firstname": "Nombre de pila",
 
   // "person.page.jobtitle": "Job Title",
-  "person.page.jobtitle": "Título profesional",
+  "person.page.jobtitle": "Puesto de trabajo",
 
   // "person.page.lastname": "Last Name",
-  "person.page.lastname": "Apellido",
+  "person.page.lastname": "Apellidos",
 
   // "person.page.name": "Name",
   "person.page.name": "Nombre",
@@ -4279,10 +4354,10 @@
   "person.page.orcid": "ORCID",
 
   // "person.page.staffid": "Staff ID",
-  "person.page.staffid": "Identificación del personal",
+  "person.page.staffid": "Identificación de Personal",
 
   // "person.page.titleprefix": "Person: ",
-  "person.page.titleprefix": "Persona:",
+  "person.page.titleprefix": "Persona: ",
 
   // "person.search.results.head": "Person Search Results",
   "person.search.results.head": "Resultados de búsqueda de personas",
@@ -4305,16 +4380,16 @@
   "process.new.submit": "Guardar",
 
   // "process.new.select-script": "Script",
-  "process.new.select-script": "Texto",
+  "process.new.select-script": "Script",
 
   // "process.new.select-script.placeholder": "Choose a script...",
-  "process.new.select-script.placeholder": "Elija un guión...",
+  "process.new.select-script.placeholder": "Elija un script...",
 
   // "process.new.select-script.required": "Script is required",
   "process.new.select-script.required": "Se requiere script",
 
   // "process.new.parameter.file.upload-button": "Select file...",
-  "process.new.parameter.file.upload-button": "Seleccione Archivo...",
+  "process.new.parameter.file.upload-button": "Seleccionar archivo...",
 
   // "process.new.parameter.file.required": "Please select a file",
   "process.new.parameter.file.required": "Por favor seleccione un archivo",
@@ -4326,7 +4401,7 @@
   "process.new.parameter.type.value": "valor",
 
   // "process.new.parameter.type.file": "file",
-  "process.new.parameter.type.file": "expediente",
+  "process.new.parameter.type.file": "archivo",
 
   // "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:",
@@ -4399,6 +4474,30 @@
   // "process.detail.create" : "Create similar process",
   "process.detail.create": "Crear un proceso similar",
 
+  // "process.detail.actions": "Actions",
+  "process.detail.actions": "Acciones",
+
+  // "process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "Eliminar proceso",
+
+  // "process.detail.delete.header": "Delete process",
+  "process.detail.delete.header": "Eliminar proceso",
+
+  // "process.detail.delete.body": "Are you sure you want to delete the current process?",
+  "process.detail.delete.body": "¿Está seguro de que desea eliminar el proceso actual?",
+
+  // "process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "Cancelar",
+
+  // "process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "Eliminar proceso",
+
+  // "process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success": "Proceso eliminado satisfactoriamente.",
+
+  // "process.detail.delete.error": "Something went wrong when deleting the process",
+  "process.detail.delete.error": "Algo falló eliminando el proceso",
+
 
 
   // "process.overview.table.finish" : "Finish time (UTC)",
@@ -4428,12 +4527,40 @@
   // "process.overview.new": "New",
   "process.overview.new": "Nuevo",
 
+  // "process.overview.table.actions": "Actions",
+  "process.overview.table.actions": "Acciones",
+
+  // "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "Eliminar {{count}} procesos",
+
+  // "process.overview.delete.clear": "Clear delete selection",
+  "process.overview.delete.clear": "Limpiar la selección",
+
+  // "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.processing": "Se están eliminando {{count}} proceso(s). Espere a que la eliminación se complete por completo. Tenga en cuenta que esto puede llevar un tiempo.",
+
+  // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+  "process.overview.delete.body": "¿Está seguro de que desea eliminar {{count}} proceso(s)?",
+
+  // "process.overview.delete.header": "Delete processes",
+  "process.overview.delete.header": "Elimina procesos",
+
+  // "process.bulk.delete.error.head": "Error on deleteing process",
+  "process.bulk.delete.error.head": "Error eliminando proceso",
+
+  // "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ",
+  "process.bulk.delete.error.body": "No se pudo eliminar el proceso con ID {{processId}}. El resto de procesos seguirán eliminándose. ",
+
+  // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
+  "process.bulk.delete.success": "{{count}} proceso(s) se han eliminado correctamente",
+
+
 
   // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "Actualización del perfil",
 
   // "profile.card.identify": "Identify",
-  "profile.card.identify": "Identificar",
+  "profile.card.identify": "Identidad",
 
   // "profile.card.security": "Security",
   "profile.card.security": "Seguridad",
@@ -4460,13 +4587,13 @@
   "profile.metadata.form.label.email": "Dirección de correo electrónico",
 
   // "profile.metadata.form.label.firstname": "First Name",
-  "profile.metadata.form.label.firstname": "Nombre¡",
+  "profile.metadata.form.label.firstname": "Nombre",
 
   // "profile.metadata.form.label.language": "Language",
   "profile.metadata.form.label.language": "Idioma",
 
   // "profile.metadata.form.label.lastname": "Last Name",
-  "profile.metadata.form.label.lastname": "Apellido",
+  "profile.metadata.form.label.lastname": "Apellidos",
 
   // "profile.metadata.form.label.phone": "Contact Telephone",
   "profile.metadata.form.label.phone": "Teléfono de contacto",
@@ -4486,11 +4613,8 @@
   // "profile.security.form.error.matching-passwords": "The passwords do not match.",
   "profile.security.form.error.matching-passwords": "Las contraseñas no coinciden.",
 
-  // "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.",
-
-  // "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.",
+  // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box.",
+  "profile.security.form.info": "Opcionalmente, puede introducir una nueva contraseña en el cuadro a continuación y confirmarla escribiéndola nuevamente en el segundo cuadro.",
 
   // "profile.security.form.label.password": "Password",
   "profile.security.form.label.password": "Contraseña",
@@ -4498,8 +4622,11 @@
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
   "profile.security.form.label.passwordrepeat": "Rescriba para confirmar",
 
+  // "profile.security.form.label.current-password": "Current password",
+  "profile.security.form.label.current-password": "Contraseña actual",
+
   // "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.",
+  "profile.security.form.notifications.success.content": "Se guardaron sus cambios de contraseña.",
 
   // "profile.security.form.notifications.success.title": "Password saved",
   "profile.security.form.notifications.success.title": "Contraseña guardada",
@@ -4507,12 +4634,15 @@
   // "profile.security.form.notifications.error.title": "Error changing passwords",
   "profile.security.form.notifications.error.title": "Error al cambiar las contraseñas",
 
-  // "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.",
+  // "profile.security.form.notifications.error.change-failed": "An error occurred while trying to change the password. Please check if the current password is correct.",
+  "profile.security.form.notifications.error.change-failed": "Ocurrió un error al intentar cambiar la contraseña. Por favor, compruebe si la contraseña actual es correcta.",
 
   // "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.",
 
+  // "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
+  "profile.security.form.notifications.error.general": "Por favor, rellene los campos obligatorios del formulario de seguridad.",
+
   // "profile.title": "Update Profile",
   "profile.title": "Actualización del perfil",
 
@@ -4547,7 +4677,7 @@
   "project.page.status": "Estado",
 
   // "project.page.titleprefix": "Research Project: ",
-  "project.page.titleprefix": "Proyecto de Investigación:",
+  "project.page.titleprefix": "Proyecto de Investigación: ",
 
   // "project.search.results.head": "Project Search Results",
   "project.search.results.head": "Resultados de búsqueda de proyectos",
@@ -4576,7 +4706,7 @@
   "publication.page.publisher": "Editor",
 
   // "publication.page.titleprefix": "Publication: ",
-  "publication.page.titleprefix": "Publicación:",
+  "publication.page.titleprefix": "Publicación: ",
 
   // "publication.page.volume-title": "Volume Title",
   "publication.page.volume-title": "Título del volumen",
@@ -4608,7 +4738,7 @@
   "register-page.create-profile.header": "Crear perfil",
 
   // "register-page.create-profile.identification.header": "Identify",
-  "register-page.create-profile.identification.header": "Identificar",
+  "register-page.create-profile.identification.header": "Identidad",
 
   // "register-page.create-profile.identification.email": "Email Address",
   "register-page.create-profile.identification.email": "Dirección de correo electrónico",
@@ -4617,13 +4747,13 @@
   "register-page.create-profile.identification.first-name": "Nombre *",
 
   // "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",
+  "register-page.create-profile.identification.first-name.error": "Por favor introduzca el Nombre",
 
   // "register-page.create-profile.identification.last-name": "Last Name *",
-  "register-page.create-profile.identification.last-name": "Apellido *",
+  "register-page.create-profile.identification.last-name": "Apellidos *",
 
   // "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",
+  "register-page.create-profile.identification.last-name.error": "Por favor introduzca los Apellidos",
 
   // "register-page.create-profile.identification.contact": "Contact Telephone",
   "register-page.create-profile.identification.contact": "Teléfono de contacto",
@@ -4634,8 +4764,8 @@
   // "register-page.create-profile.security.header": "Security",
   "register-page.create-profile.security.header": "Seguridad",
 
-  // "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.info": "Please enter a password in the box below, and confirm it by typing it again into the second box.",
+  "register-page.create-profile.security.info": "Introduzca una contraseña en el cuadro siguiente y confírmela escribiéndola nuevamente en el segundo cuadro. ",
 
   // "register-page.create-profile.security.label.password": "Password *",
   "register-page.create-profile.security.label.password": "Contraseña *",
@@ -4649,9 +4779,6 @@
   // "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",
 
@@ -4701,10 +4828,26 @@
   // "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 }}",
 
+  // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
+  "register-page.registration.error.recaptcha": "Error al intentar autenticar con recaptcha",
 
+  // "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the <b>Registration and Password recovery</b> (Google reCaptcha) cookies.",
+  "register-page.registration.google-recaptcha.must-accept-cookies": "Para registrarse debe aceptar las cookies de <b>Registro y recuperación de contraseña</b> (Google reCaptcha).",
+
+  // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Abrir configuración de cookies",
+
+  // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+  "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+
+  // "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification",
+  "register-page.registration.google-recaptcha.notification.message.error": "Se produjo un error durante la verificación de reCaptcha",
+
+  // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
+  "register-page.registration.google-recaptcha.notification.message.expired": "Verificación caducada. Verifique de nuevo.",
 
   // "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.relationship-type.content": "No se pudo encontrar una coincidencia adecuada para el tipo de relación {{ type }} entre los dos ítems",
 
   // "relationships.add.error.server.content": "The server returned an error",
   "relationships.add.error.server.content": "El servidor devolvió un error",
@@ -4722,7 +4865,7 @@
   "relationships.isAuthorOf.OrgUnit": "Autores (unidades organizativas)",
 
   // "relationships.isIssueOf": "Journal Issues",
-  "relationships.isIssueOf": "Problemas de la revista",
+  "relationships.isIssueOf": "Números de revista",
 
   // "relationships.isJournalIssueOf": "Journal Issue",
   "relationships.isJournalIssueOf": "Número de la revista",
@@ -4746,7 +4889,7 @@
   "relationships.isPublicationOfJournalIssue": "Artículos",
 
   // "relationships.isSingleJournalOf": "Journal",
-  "relationships.isSingleJournalOf": "diario",
+  "relationships.isSingleJournalOf": "Revista",
 
   // "relationships.isSingleVolumeOf": "Journal Volume",
   "relationships.isSingleVolumeOf": "Volumen de la revista",
@@ -4761,7 +4904,7 @@
   "relationships.isContributorOf.OrgUnit": "Colaborador (Unidad organizativa)",
 
   // "relationships.isContributorOf.Person": "Contributor",
-  "relationships.isContributorOf.Person": "Contribuyente",
+  "relationships.isContributorOf.Person": "Contribuidor",
 
   // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
   "relationships.isFundingAgencyOf.OrgUnit": "Financiador",
@@ -4771,7 +4914,7 @@
   "repository.image.logo": "Logotipo del repositorio",
 
   // "repository.title.prefix": "DSpace Angular :: ",
-  "repository.title.prefix": "DSpace Angular ::",
+  "repository.title.prefix": "DSpace Angular :: ",
 
   // "repository.title.prefixDSpace": "DSpace Angular ::",
   "repository.title.prefixDSpace": "DSpace Angular ::",
@@ -4790,16 +4933,16 @@
   "resource-policies.add.for.bundle": "Agregar una nueva política de bloque",
 
   // "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.item": "Agregar una nueva política de Item",
 
   // "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.community": "Agregar una nueva política de Comunidad",
 
   // "resource-policies.add.for.collection": "Add a new Collection policy",
-  "resource-policies.add.for.collection": "Agregar una nueva política de colección",
+  "resource-policies.add.for.collection": "Agregar una nueva política de Colección",
 
   // "resource-policies.create.page.heading": "Create new resource policy for ",
-  "resource-policies.create.page.heading": "Crear una nueva política de recursos para",
+  "resource-policies.create.page.heading": "Crear una nueva política de recursos para ",
 
   // "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.",
@@ -4823,16 +4966,16 @@
   "resource-policies.delete.success.content": "Operación exitosa",
 
   // "resource-policies.edit.page.heading": "Edit resource policy ",
-  "resource-policies.edit.page.heading": "Editar la política de recursos",
+  "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.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.",
+  "resource-policies.edit.page.target-failure.content": "Se produjo un error al editar el destinatario (usuario o grupo) de la política de recursos.",
 
   // "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 ",
+  "resource-policies.edit.page.other-failure.content": "Se produjo un error al editar la política de recursos. El destinatario (usuario o grupo) ha sido actualizado con éxito",
 
   // "resource-policies.edit.page.success.content": "Operation successful",
   "resource-policies.edit.page.success.content": "Operación exitosa",
@@ -4847,13 +4990,13 @@
   "resource-policies.form.action-type.required": "Debe seleccionar la acción de la política de recursos.",
 
   // "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",
+  "resource-policies.form.eperson-group-list.label": "El usuario o grupo al que se le otorgará el permiso",
 
   // "resource-policies.form.eperson-group-list.select.btn": "Select",
-  "resource-policies.form.eperson-group-list.select.btn": "Seleccione",
+  "resource-policies.form.eperson-group-list.select.btn": "Seleccionar",
 
   // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
-  "resource-policies.form.eperson-group-list.tab.eperson": "Buscar una ePersona",
+  "resource-policies.form.eperson-group-list.tab.eperson": "Buscar un usuario",
 
   // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
   "resource-policies.form.eperson-group-list.tab.group": "Buscar un grupo",
@@ -4871,13 +5014,13 @@
   "resource-policies.form.eperson-group-list.modal.header": "No puede cambiarse el tipo",
 
   // "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.",
+  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "No es posible cambiar un usuario por un grupo.",
 
   // "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.",
+  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "No es posible cambiar un grupo por un usuario.",
 
   // "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.",
+  "resource-policies.form.eperson-group-list.modal.text2": "Borre la política de recursos actual y cree una nueva con el tipo deseado.",
 
   // "resource-policies.form.eperson-group-list.modal.close": "Ok",
   "resource-policies.form.eperson-group-list.modal.close": "Ok",
@@ -4919,7 +5062,7 @@
   "resource-policies.table.headers.edit.policy": "Editar política",
 
   // "resource-policies.table.headers.eperson": "EPerson",
-  "resource-policies.table.headers.eperson": "EPersona",
+  "resource-policies.table.headers.eperson": "Usuario",
 
   // "resource-policies.table.headers.group": "Group",
   "resource-policies.table.headers.group": "Grupo",
@@ -5000,10 +5143,10 @@
   "search.filters.applied.f.submitter": "Remitente",
 
   // "search.filters.applied.f.jobTitle": "Job Title",
-  "search.filters.applied.f.jobTitle": "Título profesional",
+  "search.filters.applied.f.jobTitle": "Puesto de trabajo",
 
   // "search.filters.applied.f.birthDate.max": "End birth date",
-  "search.filters.applied.f.birthDate.max": "Fecha de nacimiento, final ",
+  "search.filters.applied.f.birthDate.max": "Fecha de nacimiento, final",
 
   // "search.filters.applied.f.birthDate.min": "Start birth date",
   "search.filters.applied.f.birthDate.min": "Fecha de nacimiento, inicial",
@@ -5176,7 +5319,7 @@
   "search.filters.filter.organizationAddressLocality.placeholder": "Ciudad",
 
   // "search.filters.filter.organizationAddressLocality.label": "Search city",
-  "search.filters.filter.organizationAddressLocality.label": "Búsqueda deciudad",
+  "search.filters.filter.organizationAddressLocality.label": "Búsqueda de ciudad",
 
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
   "search.filters.filter.organizationFoundingDate.head": "Fecha de fundación",
@@ -5218,7 +5361,11 @@
   "search.filters.filter.submitter.placeholder": "Remitente",
 
   // "search.filters.filter.submitter.label": "Search submitter",
-  "search.filters.filter.submitter.label": "Remitente de búsqueda",
+  "search.filters.filter.submitter.label": "Búsqueda de remitente",
+
+  // "search.filters.filter.show-tree": "Browse {{ name }} tree",
+  "search.filters.filter.show-tree": "Examinar árbol {{ name }}",
+
 
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Número de la revista",
@@ -5268,6 +5415,8 @@
   // "search.form.scope.all": "All of DSpace",
   "search.form.scope.all": "Todo DSpace",
 
+
+
   // "search.results.head": "Search Results",
   "search.results.head": "Resultados de la búsqueda",
 
@@ -5283,6 +5432,8 @@
   // "search.results.view-result": "View",
   "search.results.view-result": "Ver",
 
+  // "search.results.response.500": "An error occurred during query execution, please try again later",
+  "search.results.response.500": "Ocurrió un error durante la ejecución de la consulta, intente nuevamente más tarde",
 
   // "default.search.results.head": "Search Results",
   "default.search.results.head": "Resultados de la búsqueda",
@@ -5344,16 +5495,16 @@
   "sorting.score.DESC": "Lo más relevante",
 
   // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
-  "sorting.dc.date.issued.ASC": "Fecha de emisión Ascendente",
+  "sorting.dc.date.issued.ASC": "Fecha de publicación Ascendente",
 
   // "sorting.dc.date.issued.DESC": "Date Issued Descending",
-  "sorting.dc.date.issued.DESC": "Fecha de emisión Descendente",
+  "sorting.dc.date.issued.DESC": "Fecha de publicación Descendente",
 
   // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
-  "sorting.dc.date.accessioned.ASC": "Fecha de adhesión Ascendente",
+  "sorting.dc.date.accessioned.ASC": "Fecha de envío Ascendente",
 
   // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
-  "sorting.dc.date.accessioned.DESC": "Fecha de adhesión Descendente",
+  "sorting.dc.date.accessioned.DESC": "Fecha de envío Descendente",
 
   // "sorting.lastModified.ASC": "Last modified Ascending",
   "sorting.lastModified.ASC": "Última modificación Ascendente",
@@ -5416,7 +5567,7 @@
   "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.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",
@@ -5425,7 +5576,7 @@
   "submission.general.discard.confirm.title": "Descartar envío",
 
   // "submission.general.discard.submit": "Discard",
-  "submission.general.discard.submit": "Descarte",
+  "submission.general.discard.submit": "Descartar",
 
   // "submission.general.info.saved": "Saved",
   "submission.general.info.saved": "Guardado",
@@ -5500,6 +5651,9 @@
   // "submission.import-external.source.crossref": "CrossRef",
   "submission.import-external.source.crossref": "CrossRef",
 
+  // "submission.import-external.source.datacite": "DataCite",
+  "submission.import-external.source.datacite": "DataCite",
+
   // "submission.import-external.source.scielo": "SciELO",
   "submission.import-external.source.scielo": "SciELO",
 
@@ -5546,7 +5700,7 @@
   "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": "Vista previa del ítem",
 
   // "submission.import-external.preview.title.Publication": "Publication Preview",
   "submission.import-external.preview.title.Publication": "Previsualización de Publicación",
@@ -5558,7 +5712,7 @@
   "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.OrgUnit": "Previsualización de Unidad organizativa",
 
   // "submission.import-external.preview.title.Person": "Person Preview",
   "submission.import-external.preview.title.Person": "Previsualización de Persona",
@@ -5567,7 +5721,7 @@
   "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.subtitle": "Los siguientes metadatos se importaron de una fuente externa. Se añadirán cuando inicie el envío.",
 
   // "submission.import-external.preview.button.import": "Start submission",
   "submission.import-external.preview.button.import": "Iniciar envío",
@@ -5600,7 +5754,7 @@
   "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.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",
@@ -5627,7 +5781,7 @@
   "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-button-title.Publication": "Importación remota de publicación",
 
   // "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!",
@@ -5696,16 +5850,16 @@
   "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.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.local-entity": "Se agregó localmente un 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.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.",
@@ -5741,14 +5895,13 @@
   "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.selected": "{{ size }} ítems 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 }})",
 
@@ -5772,13 +5925,11 @@
 
   // "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 }})",
 
@@ -5818,6 +5969,9 @@
   // "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.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publicación del Autor",
+
   // "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",
 
@@ -5831,6 +5985,8 @@
   "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...",
 
@@ -5838,14 +5994,12 @@
   "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.isJournalIssueOfPublication": "Números de 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.JournalIssue": "Números de 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",
 
@@ -5857,7 +6011,6 @@
 
   // "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",
 
@@ -5885,6 +6038,9 @@
   // "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.title.isPublicationOfAuthor": "Publication",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publicación",
+
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Alternar menú desplegable",
 
@@ -5902,7 +6058,6 @@
 
   // "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",
 
@@ -5926,16 +6081,14 @@
 
   // "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.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",
 
@@ -6057,6 +6210,7 @@
   "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",
 
@@ -6119,22 +6273,22 @@
   "submission.sections.status.info.aria": "Información adicional",
 
   // "submission.sections.toggle.open": "Open section",
-  "submission.sections.toggle.open": "Sección abierta",
+  "submission.sections.toggle.open": "Abrir sección",
 
   // "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.open": "Expandir sección {{sectionHeader}}",
 
   // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
-  "submission.sections.toggle.aria.close": "Contraer {{sectionHeader}} sección",
+  "submission.sections.toggle.aria.close": "Contraer sección {{sectionHeader}}",
 
   // "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.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",
@@ -6182,7 +6336,7 @@
   "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.group-required": "Se requiere el grupo.",
 
   // "submission.sections.upload.form.until-label": "Grant access until",
   "submission.sections.upload.form.until-label": "Conceder acceso hasta",
@@ -6197,10 +6351,10 @@
   "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.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, para 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.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 lugar de la página</strong>",
 
   // "submission.sections.upload.no-entry": "No",
   "submission.sections.upload.no-entry": "No",
@@ -6220,10 +6374,10 @@
   // "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": "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": "Discoverable",
   "submission.sections.accesses.form.discoverable-label": "Detectable",
 
   // "submission.sections.accesses.form.access-condition-label": "Access condition type",
@@ -6276,7 +6430,7 @@
 
 
   // "submission.sections.sherpa.publication.information": "Publication information",
-  "submission.sections.sherpa.publication.information": "Información de la Publicac",
+  "submission.sections.sherpa.publication.information": "Información de la Publicación",
 
   // "submission.sections.sherpa.publication.information.title": "Title",
   "submission.sections.sherpa.publication.information.title": "Título",
@@ -6299,14 +6453,14 @@
   // "submission.sections.sherpa.publisher.policy": "Publisher Policy",
   "submission.sections.sherpa.publisher.policy": "Política editorial",
 
-  // "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.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": "La 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.sections.sherpa.publisher.policy.more.information": "Para más información, por favor, siga los siguientes enlaces:",
 
   // "submission.sections.sherpa.publisher.policy.version": "Version",
   "submission.sections.sherpa.publisher.policy.version": "Versión",
@@ -6364,34 +6518,36 @@
 
 
   // "submission.workflow.generic.delete": "Delete",
-  "submission.workflow.generic.delete": "Borrar",
+  "submission.workflow.generic.delete": "Eliminar",
 
   // "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.generic.delete-help": "Si desea descartar este ítem, seleccione \"Eliminar\". Luego se le pedirá que lo confirme.",
 
   // "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.edit-help": "Seleccione esta opción para cambiar los metadatos del ítem.",
 
   // "submission.workflow.generic.view": "View",
-  "submission.workflow.generic.view": "Vista",
+  "submission.workflow.generic.view": "Ver",
 
   // "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.workflow.generic.view-help": "Seleccione esta opción para ver los metadatos del ítem.",
+
+
 
   // "submission.workflow.tasks.claimed.approve": "Approve",
   "submission.workflow.tasks.claimed.approve": "Aprobar",
 
   // "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.workflow.tasks.claimed.approve_help": "Si ha revisado el ítem y es adecuado para su inclusión en la colección, seleccione \"Aprobar\".",
 
   // "submission.workflow.tasks.claimed.edit": "Edit",
   "submission.workflow.tasks.claimed.edit": "Editar",
 
   // "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.workflow.tasks.claimed.edit_help": "Seleccione esta opción para cambiar los metadatos del ítem.",
 
   // "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.",
@@ -6409,10 +6565,10 @@
   "submission.workflow.tasks.claimed.reject.submit": "Rechazar",
 
   // "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.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 ítem 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": "Devolver 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.",
@@ -6434,7 +6590,7 @@
 
 
   // "submission.workflow.tasks.pool.claim": "Claim",
-  "submission.workflow.tasks.pool.claim": "Afirmar",
+  "submission.workflow.tasks.pool.claim": "Asumir tarea",
 
   // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
   "submission.workflow.tasks.pool.claim_help": "Asigne esta tarea a usted mismo.",
@@ -6463,13 +6619,13 @@
   "thumbnail.project.alt": "Logotipo del proyecto",
 
   // "thumbnail.project.placeholder": "Project Placeholder Image",
-  "thumbnail.project.placeholder": "Imagen del proyecto en el marcador de posición ",
+  "thumbnail.project.placeholder": "Imagen del proyecto en el marcador de posición",
 
   // "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.orgunit.placeholder": "Imagen de Unidad Organizativa en el marcador de posición",
 
   // "thumbnail.person.alt": "Profile Picture",
   "thumbnail.person.alt": "Foto de perfil",
@@ -6505,7 +6661,8 @@
   // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
   "vocabulary-treeview.tree.description.srsc": "Categorías de temas de investigación",
 
-
+  // "vocabulary-treeview.info": "Select a subject to add as search filter",
+  "vocabulary-treeview.info": "Selecciona un tema para agregar como filtro de búsqueda",
 
   // "uploader.browse": "browse",
   "uploader.browse": "examinar",
@@ -6520,8 +6677,7 @@
   "uploader.or": ", o ",
 
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
-  // TODO Source message changed - Revise the translation
-  "uploader.processing": "Procesando",
+  "uploader.processing": "Procesando subida de archivo(s), (ahora es seguro cerrar esta página)",
 
   // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "Longitud de la cola",
@@ -6751,7 +6907,7 @@
   "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.mine" : "Mi financiación",
 
   // "person.page.orcid.sync-fundings.my_selected" : "Selected fundings",
   "person.page.orcid.sync-fundings.my_selected" : "Financiaciones seleccionadas",
@@ -6892,7 +7048,7 @@
   "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.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",
@@ -6917,7 +7073,7 @@
 
   // "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "The address of the organization to be sent requires a city",
   "person.page.orcid.sync-queue.send.validation-error.organization.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",
 
@@ -6926,12 +7082,12 @@
 
   // "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.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",
@@ -6942,8 +7098,8 @@
   // "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-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.",
@@ -6985,12 +7141,15 @@
   "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.queue": "Cola de registro de ORCID",
 
   // "person.orcid.registry.auth": "ORCID Authorizations",
-  "person.orcid.registry.auth": "Autorizaciones ORCID ",
+  "person.orcid.registry.auth": "Autorizaciones ORCID",
+  // "home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "Envíos recientes",
 
+  // "listable-notification-object.default-message": "This object couldn't be retrieved",
+  "listable-notification-object.default-message": "Este objeto no se pudo recuperar",
 
 
 }

From 4f476adbc102cdce10205bf9928668c51a774318 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Sat, 21 Jan 2023 04:00:46 -0800
Subject: [PATCH 140/160] Updated themed component.

---
 src/app/shared/browse-by/browse-by.component.html      |  8 ++++----
 .../themed-results-back-button.component.ts            | 10 +++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index 84aa6a0484..bdbf038420 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -3,8 +3,8 @@
   <ng-container *ngComponentOutlet="getStartsWithComponent(); injector: objectInjector;"></ng-container>
   <div *ngIf="objects?.hasSucceeded && !objects?.isLoading && objects?.payload?.page.length > 0" @fadeIn>
       <div *ngIf="shouldDisplayResetButton$ |async" class="mb-2 reset">
-        <ds-results-back-button [paginationConfig]="paginationConfig"
-                                [previousPage$]="previousPage$"></ds-results-back-button>
+        <ds-themed-results-back-button [paginationConfig]="paginationConfig"
+                                [previousPage$]="previousPage$"></ds-themed-results-back-button>
       </div>
     <ds-viewable-collection
       [config]="paginationConfig"
@@ -19,8 +19,8 @@
   <ds-error *ngIf="objects?.hasFailed" message="{{'error.browse-by' | translate}}"></ds-error>
   <div *ngIf="!objects?.isLoading && objects?.payload?.page.length === 0">
     <div *ngIf="shouldDisplayResetButton$ |async" class="d-inline-block mb-4 reset">
-      <ds-results-back-button [paginationConfig]="paginationConfig"
-                              [previousPage$]="previousPage$"></ds-results-back-button>
+      <ds-themed-results-back-button [paginationConfig]="paginationConfig"
+                              [previousPage$]="previousPage$"></ds-themed-results-back-button>
     </div>
     <div class="alert alert-info w-100" role="alert">
       {{'browse.empty' | translate}}
diff --git a/src/app/shared/results-back-button/themed-results-back-button.component.ts b/src/app/shared/results-back-button/themed-results-back-button.component.ts
index 45ac86a605..bf7f523638 100644
--- a/src/app/shared/results-back-button/themed-results-back-button.component.ts
+++ b/src/app/shared/results-back-button/themed-results-back-button.component.ts
@@ -1,6 +1,8 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { ThemedComponent } from '../theme-support/themed.component';
 import { ResultsBackButtonComponent } from './results-back-button.component';
+import { BehaviorSubject } from 'rxjs';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 
 @Component({
   selector: 'ds-themed-results-back-button',
@@ -9,6 +11,12 @@ import { ResultsBackButtonComponent } from './results-back-button.component';
 })
 export class ThemedResultsBackButtonComponent extends ThemedComponent<ResultsBackButtonComponent> {
 
+  @Input() previousPage$?: BehaviorSubject<string>;
+
+  @Input() paginationConfig?: PaginationComponentOptions;
+
+  protected inAndOutputNames: (keyof ResultsBackButtonComponent & keyof this)[] = ['previousPage$', 'paginationConfig'];
+
   protected getComponentName(): string {
     return 'ResultsBackButtonComponent';
   }

From fbeba91d7fe11ccd41a78e38d2093ac7212a4efd Mon Sep 17 00:00:00 2001
From: Michael W Spalti <mspalti@gmail.com>
Date: Sat, 21 Jan 2023 11:54:40 -0800
Subject: [PATCH 141/160] Defining back logic in parent

---
 .../journal-issue.component.html              |  2 +-
 .../journal-volume.component.html             |  2 +-
 .../item-pages/journal/journal.component.html |  2 +-
 .../org-unit/org-unit.component.html          |  2 +-
 .../item-pages/person/person.component.html   |  2 +-
 .../item-pages/project/project.component.html |  2 +-
 .../publication/publication.component.html    |  2 +-
 .../item-types/shared/item.component.ts       | 21 ++++++++-
 .../untyped-item/untyped-item.component.html  |  2 +-
 .../versioned-item.component.ts               |  2 +-
 .../shared/browse-by/browse-by.component.html |  6 +--
 .../shared/browse-by/browse-by.component.ts   | 13 ++++++
 .../results-back-button.component.spec.ts     | 36 +--------------
 .../results-back-button.component.ts          | 45 ++++---------------
 .../themed-results-back-button.component.ts   |  8 +++-
 15 files changed, 60 insertions(+), 87 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
index fee1751d93..2d1f9b477e 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button *ngIf="showBackButton | async"></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
index 2cc653eba5..010b5ee5b5 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button *ngIf="showBackButton | async"></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index b97aff326a..88ed9e17dd 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button *ngIf="showBackButton | async"></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
index 8b29339211..d8b3815f6e 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button *ngIf="showBackButton | async"></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
index 845f8127c0..20e458a906 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button *ngIf="showBackButton | async"></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-item-page-title-field class="mr-auto" [item]="object">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
index e4475cc6f1..ee75abaae8 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button *ngIf="showBackButton | async"></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="mr-auto">
   </ds-item-page-title-field>
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html
index 56e118ca24..9b7861c73c 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/item-page/simple/item-types/publication/publication.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button *ngIf="showBackButton | async"></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
 <div class="row" *ngIf="iiifEnabled">
   <div class="col-12">
     <ds-mirador-viewer  id="iiif-viewer"
diff --git a/src/app/item-page/simple/item-types/shared/item.component.ts b/src/app/item-page/simple/item-types/shared/item.component.ts
index b815ca0ddb..572debdd71 100644
--- a/src/app/item-page/simple/item-types/shared/item.component.ts
+++ b/src/app/item-page/simple/item-types/shared/item.component.ts
@@ -6,6 +6,7 @@ import { RouteService } from '../../../../core/services/route.service';
 import { Observable } from 'rxjs';
 import { getDSpaceQuery, isIiifEnabled, isIiifSearchEnabled } from './item-iiif-utils';
 import { filter, map, take } from 'rxjs/operators';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'ds-item',
@@ -44,17 +45,33 @@ export class ItemComponent implements OnInit {
 
   mediaViewer;
 
-  constructor(protected routeService: RouteService) {
+  constructor(protected routeService: RouteService,
+              protected router: Router) {
     this.mediaViewer = environment.mediaViewer;
   }
+
+  /**
+   * The function used to return to list from the item.
+   */
+  back = () => {
+    this.routeService.getPreviousUrl().pipe(
+          take(1)
+        ).subscribe(
+          (url => {
+            this.router.navigateByUrl(url);
+          })
+        );
+  };
+
   ngOnInit(): void {
 
+    this.itemPageRoute = getItemPageRoute(this.object);
+    // hide/show the back button
     this.showBackButton = this.routeService.getPreviousUrl().pipe(
       filter(url => /^(\/search|\/browse|\/collections|\/admin\/search|\/mydspace)/.test(url)),
       take(1),
       map(() => true)
     );
-    this.itemPageRoute = getItemPageRoute(this.object);
     // check to see if iiif viewer is required.
     this.iiifEnabled = isIiifEnabled(this.object);
     this.iiifSearchEnabled = isIiifSearchEnabled(this.object);
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
index 462876736c..fcbc46422d 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -1,4 +1,4 @@
-<ds-themed-results-back-button *ngIf="showBackButton | async"></ds-themed-results-back-button>
+<ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
 <div class="row" *ngIf="iiifEnabled">
   <div class="col-12">
     <ds-mirador-viewer id="iiif-viewer"
diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
index a211aa5b75..a1f4cebd77 100644
--- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
+++ b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
@@ -37,7 +37,7 @@ export class VersionedItemComponent extends ItemComponent {
     private itemService: ItemDataService,
     protected routeService: RouteService,
   ) {
-    super(routeService);
+    super(routeService, router);
   }
 
   /**
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index 84aa6a0484..0d40c685ad 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -3,8 +3,7 @@
   <ng-container *ngComponentOutlet="getStartsWithComponent(); injector: objectInjector;"></ng-container>
   <div *ngIf="objects?.hasSucceeded && !objects?.isLoading && objects?.payload?.page.length > 0" @fadeIn>
       <div *ngIf="shouldDisplayResetButton$ |async" class="mb-2 reset">
-        <ds-results-back-button [paginationConfig]="paginationConfig"
-                                [previousPage$]="previousPage$"></ds-results-back-button>
+        <ds-themed-results-back-button [back]="back" [buttonType]="backButtonType"></ds-themed-results-back-button>
       </div>
     <ds-viewable-collection
       [config]="paginationConfig"
@@ -19,8 +18,7 @@
   <ds-error *ngIf="objects?.hasFailed" message="{{'error.browse-by' | translate}}"></ds-error>
   <div *ngIf="!objects?.isLoading && objects?.payload?.page.length === 0">
     <div *ngIf="shouldDisplayResetButton$ |async" class="d-inline-block mb-4 reset">
-      <ds-results-back-button [paginationConfig]="paginationConfig"
-                              [previousPage$]="previousPage$"></ds-results-back-button>
+      <ds-themed-results-back-button [back]="back" [buttonType]="backButtonType"></ds-themed-results-back-button>
     </div>
     <div class="alert alert-info w-100" role="alert">
       {{'browse.empty' | translate}}
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 2e8d2447b1..01351fd030 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -129,6 +129,19 @@ export class BrowseByComponent implements OnInit, OnDestroy {
 
   }
 
+  /**
+   * Used to set the back button label for metadata browsing.
+   */
+  backButtonType = 'metadata-browse';
+
+  /**
+   * Used for back navigation in metadata browse.
+   */
+  back = () => {
+    const page = +this.previousPage$.value > 1 ? +this.previousPage$.value : 1;
+    this.paginationService.updateRoute(this.paginationConfig.id, {page: page}, {[this.paginationConfig.id + '.return']: null, value: null, startsWith: null});
+  };
+
   /**
    * Go to the previous page
    */
diff --git a/src/app/shared/results-back-button/results-back-button.component.spec.ts b/src/app/shared/results-back-button/results-back-button.component.spec.ts
index 8536099d3a..4aceea289a 100644
--- a/src/app/shared/results-back-button/results-back-button.component.spec.ts
+++ b/src/app/shared/results-back-button/results-back-button.component.spec.ts
@@ -2,12 +2,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { ResultsBackButtonComponent } from './results-back-button.component';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouteService } from '../../core/services/route.service';
 import { RouterTestingModule } from '@angular/router/testing';
-import { BehaviorSubject, Observable, of } from 'rxjs';
-import { Router } from '@angular/router';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../testing/pagination-service.stub';
 
 describe('ResultsBackButtonComponent', () => {
@@ -15,23 +10,7 @@ describe('ResultsBackButtonComponent', () => {
   let component: ResultsBackButtonComponent;
   let fixture: ComponentFixture<ResultsBackButtonComponent>;
   let router;
-  const paginationConfig = Object.assign(new PaginationComponentOptions(), {
-    id: 'test-pagination',
-    currentPage: 1,
-    pageSizeOptions: [5, 10, 15, 20],
-    pageSize: 15
-  });
 
-  const searchUrl = '/search?query=test&spc.page=2';
-  const nonSearchUrl = '/item';
-
-  function getMockRouteService(url) {
-    return {
-      getPreviousUrl(): Observable < string > {
-        return of(url);
-      }
-    };
-  }
 
   router = jasmine.createSpyObj('router', {
     navigateByUrl: jasmine.createSpy('navigateByUrl')
@@ -43,7 +22,6 @@ describe('ResultsBackButtonComponent', () => {
 
   describe('back to results', () => {
 
-    const mockRouteService = getMockRouteService(searchUrl);
 
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
@@ -52,14 +30,10 @@ describe('ResultsBackButtonComponent', () => {
           RouterTestingModule.withRoutes([])
         ],
         providers: [
-          { provide: RouteService, useValue: mockRouteService },
-          { provide: PaginationService, useValue: paginationService},
-          { provide: Router, useValue: router },
           { provide: TranslateService, useValue: translate }
         ],
         schemas: [NO_ERRORS_SCHEMA]
       }).compileComponents();
-      spyOn(mockRouteService, 'getPreviousUrl').and.callThrough();
     }));
 
     describe('from a metadata browse list', () => {
@@ -67,8 +41,7 @@ describe('ResultsBackButtonComponent', () => {
       beforeEach(waitForAsync(() => {
         fixture = TestBed.createComponent(ResultsBackButtonComponent);
         component = fixture.componentInstance;
-        component.paginationConfig = paginationConfig;
-        component.previousPage$ = new BehaviorSubject<string>('1');
+        component.buttonType = 'metadata-browse';
         fixture.detectChanges();
       }));
 
@@ -76,8 +49,6 @@ describe('ResultsBackButtonComponent', () => {
         expect(translate.get).toHaveBeenCalledWith('browse.back.all-results');
       });
 
-
-
     });
 
     describe('from an item', () => {
@@ -92,11 +63,6 @@ describe('ResultsBackButtonComponent', () => {
         expect(translate.get).toHaveBeenCalledWith('search.browse.item-back');
       });
 
-      it('should navigate to previous url', () => {
-        component.back();
-        expect(mockRouteService.getPreviousUrl).toHaveBeenCalled();
-        expect(router.navigateByUrl).toHaveBeenCalledWith(searchUrl);
-      });
     });
 
   });
diff --git a/src/app/shared/results-back-button/results-back-button.component.ts b/src/app/shared/results-back-button/results-back-button.component.ts
index 25a3f9476b..bea5c55b68 100644
--- a/src/app/shared/results-back-button/results-back-button.component.ts
+++ b/src/app/shared/results-back-button/results-back-button.component.ts
@@ -1,12 +1,6 @@
 import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
-import { take } from 'rxjs/operators';
-import { RouteService } from '../../core/services/route.service';
-import { Router } from '@angular/router';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 import { TranslateService } from '@ngx-translate/core';
-import { isNotEmpty } from '../empty.util';
 
 @Component({
   selector: 'ds-results-back-button',
@@ -20,52 +14,31 @@ import { isNotEmpty } from '../empty.util';
 export class ResultsBackButtonComponent implements OnInit {
 
   /**
-   * Page number of the previous page
+   * The button type determines the button label.
    */
-  @Input() previousPage$?: BehaviorSubject<string>;
+  @Input() buttonType?: string;
 
   /**
-   * The pagination configuration used for the list
+   * The function used for back navigation.
    */
-  @Input() paginationConfig?: PaginationComponentOptions;
+  @Input() back: () => void;
 
   /**
-   * The button text
+   * The button label translation.
    */
   buttonLabel: Observable<string>;
 
-  constructor(protected routeService: RouteService,
-              protected paginationService: PaginationService,
-              protected router: Router,
-              private translateService: TranslateService) {
+  constructor(private translateService: TranslateService) {
 
   }
 
   ngOnInit(): void {
-    if (this.paginationConfig) {
+    // Set labels for metadata browse and item back buttons.
+    if (this.buttonType === 'metadata-browse') {
       this.buttonLabel = this.translateService.get('browse.back.all-results');
     } else {
       this.buttonLabel = this.translateService.get('search.browse.item-back');
     }
   }
 
-  /**
-   * Navigate back from the item to the previous pagination list.
-   */
-  public back() {
-    if (isNotEmpty(this.paginationConfig) && isNotEmpty(this.previousPage$)) {
-      // if pagination configuration is provided use it to update the route to the previous browse page.
-      const page = +this.previousPage$.value > 1 ? +this.previousPage$.value : 1;
-      this.paginationService.updateRoute(this.paginationConfig.id, {page: page}, {[this.paginationConfig.id + '.return']: null, value: null, startsWith: null});
-    } else {
-      this.routeService.getPreviousUrl().pipe(
-        take(1)
-      ).subscribe(
-        (url => {
-          this.router.navigateByUrl(url);
-        })
-      );
-    }
-  }
-
 }
diff --git a/src/app/shared/results-back-button/themed-results-back-button.component.ts b/src/app/shared/results-back-button/themed-results-back-button.component.ts
index 45ac86a605..2f569364bb 100644
--- a/src/app/shared/results-back-button/themed-results-back-button.component.ts
+++ b/src/app/shared/results-back-button/themed-results-back-button.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { ThemedComponent } from '../theme-support/themed.component';
 import { ResultsBackButtonComponent } from './results-back-button.component';
 
@@ -9,6 +9,12 @@ import { ResultsBackButtonComponent } from './results-back-button.component';
 })
 export class ThemedResultsBackButtonComponent extends ThemedComponent<ResultsBackButtonComponent> {
 
+  @Input() buttonType?: string;
+
+  @Input() back: () => void;
+
+  protected inAndOutputNames: (keyof ResultsBackButtonComponent & keyof this)[] = ['back', 'buttonType'];
+
   protected getComponentName(): string {
     return 'ResultsBackButtonComponent';
   }

From 886b59b5e6e3cd6a4cd6644b425383013ff59ba9 Mon Sep 17 00:00:00 2001
From: Michael W Spalti <mspalti@gmail.com>
Date: Sat, 21 Jan 2023 12:02:47 -0800
Subject: [PATCH 142/160] lint fix

---
 .../results-back-button/themed-results-back-button.component.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/shared/results-back-button/themed-results-back-button.component.ts b/src/app/shared/results-back-button/themed-results-back-button.component.ts
index 4f069b4420..2f569364bb 100644
--- a/src/app/shared/results-back-button/themed-results-back-button.component.ts
+++ b/src/app/shared/results-back-button/themed-results-back-button.component.ts
@@ -1,8 +1,6 @@
 import { Component, Input } from '@angular/core';
 import { ThemedComponent } from '../theme-support/themed.component';
 import { ResultsBackButtonComponent } from './results-back-button.component';
-import { BehaviorSubject } from 'rxjs';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 
 @Component({
   selector: 'ds-themed-results-back-button',

From c87964cc291c46ee1dd2ccac4ad58bb323a1cc28 Mon Sep 17 00:00:00 2001
From: Michael W Spalti <mspalti@gmail.com>
Date: Sat, 21 Jan 2023 12:49:58 -0800
Subject: [PATCH 143/160] Changed module exports; fixes intermittent build
 failure.

---
 src/app/shared/results-back-button/results-back-button.module.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/shared/results-back-button/results-back-button.module.ts b/src/app/shared/results-back-button/results-back-button.module.ts
index b812ca17b0..91f387c56e 100644
--- a/src/app/shared/results-back-button/results-back-button.module.ts
+++ b/src/app/shared/results-back-button/results-back-button.module.ts
@@ -14,7 +14,6 @@ import { ThemedResultsBackButtonComponent } from './themed-results-back-button.c
     TranslateModule
   ],
   exports: [
-    ResultsBackButtonComponent,
     ThemedResultsBackButtonComponent
   ]
 })

From 52163b30b874f76c1f5e61d5b6da6166b192ead6 Mon Sep 17 00:00:00 2001
From: Michael W Spalti <mspalti@gmail.com>
Date: Sat, 21 Jan 2023 13:23:17 -0800
Subject: [PATCH 144/160] Added component to custom theme's lazy-theme.module

---
 src/themes/custom/lazy-theme.module.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index 02d0360eb6..7bbd8d0326 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -121,6 +121,7 @@ import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-b
 import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
 import { ItemVersionsModule } from '../../app/item-page/versions/item-versions.module';
 import { ItemSharedModule } from '../../app/item-page/item-shared.module';
+import { ResultsBackButtonComponent } from './app/shared/results-back-button/results-back-button.component';
 
 
 const DECLARATIONS = [
@@ -177,7 +178,7 @@ const DECLARATIONS = [
   BrowseByDatePageComponent,
   BrowseByTitlePageComponent,
   ExternalSourceEntryImportModalComponent,
-
+  ResultsBackButtonComponent
 
 ];
 

From 67531ea48c3509c2e4239e0aa8a2b768362a8d8d Mon Sep 17 00:00:00 2001
From: Michael W Spalti <mspalti@gmail.com>
Date: Sat, 21 Jan 2023 13:51:13 -0800
Subject: [PATCH 145/160] Updated test and custom theme module.

---
 src/app/shared/browse-by/browse-by.component.spec.ts | 1 -
 src/themes/custom/eager-theme.module.ts              | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts
index 425488c3ca..716e9e2e8e 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -116,7 +116,6 @@ describe('BrowseByComponent', () => {
     themeService = getMockThemeService('dspace');
     TestBed.configureTestingModule({
       imports: [
-        ResultsBackButtonModule,
         BrowseByRoutingModule,
         AccessControlRoutingModule,
         CommonModule,
diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts
index 2cc69edda0..ac50021e52 100644
--- a/src/themes/custom/eager-theme.module.ts
+++ b/src/themes/custom/eager-theme.module.ts
@@ -77,7 +77,6 @@ const DECLARATIONS = [
   EditCollectionSelectorComponent,
   EditCommunitySelectorComponent,
   EditItemSelectorComponent,
-  ResultsBackButtonComponent
 ];
 
 @NgModule({

From 924c67ea5fb76276a3e123ff84590ad293c9d6cb Mon Sep 17 00:00:00 2001
From: Michael W Spalti <mspalti@gmail.com>
Date: Sat, 21 Jan 2023 14:01:17 -0800
Subject: [PATCH 146/160] lint fix

---
 src/app/shared/browse-by/browse-by.component.spec.ts | 1 -
 src/themes/custom/eager-theme.module.ts              | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts
index 716e9e2e8e..74e7c25b21 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -44,7 +44,6 @@ import { ConfigurationProperty } from '../../core/shared/configuration-property.
 import { SearchConfigurationServiceStub } from '../testing/search-configuration-service.stub';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 import { getMockThemeService } from '../mocks/theme-service.mock';
-import { ResultsBackButtonModule } from '../results-back-button/results-back-button.module';
 import { SharedModule } from '../shared.module';
 import { BrowseByRoutingModule } from '../../browse-by/browse-by-routing.module';
 import { AccessControlRoutingModule } from '../../access-control/access-control-routing.module';
diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts
index ac50021e52..591375220e 100644
--- a/src/themes/custom/eager-theme.module.ts
+++ b/src/themes/custom/eager-theme.module.ts
@@ -41,7 +41,6 @@ import {
 
 import { CommunityListElementComponent } from './app/shared/object-list/community-list-element/community-list-element.component';
 import { CollectionListElementComponent} from './app/shared/object-list/collection-list-element/collection-list-element.component';
-import { ResultsBackButtonComponent } from './app/shared/results-back-button/results-back-button.component';
 import { CollectionDropdownComponent } from './app/shared/collection-dropdown/collection-dropdown.component';
 import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
 import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';

From 1b33936ee592a58efd2d3082c058e3d400784c78 Mon Sep 17 00:00:00 2001
From: Michael W Spalti <mspalti@gmail.com>
Date: Sat, 21 Jan 2023 16:37:57 -0800
Subject: [PATCH 147/160] Label as input parameter to button component

---
 .../shared/browse-by/browse-by.component.html |  4 +--
 .../shared/browse-by/browse-by.component.ts   |  8 ++++--
 .../results-back-button.component.spec.ts     | 28 ++++++++++---------
 .../results-back-button.component.ts          | 13 ++-------
 .../themed-results-back-button.component.ts   |  5 ++--
 5 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index 0d40c685ad..d6a0005173 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -3,7 +3,7 @@
   <ng-container *ngComponentOutlet="getStartsWithComponent(); injector: objectInjector;"></ng-container>
   <div *ngIf="objects?.hasSucceeded && !objects?.isLoading && objects?.payload?.page.length > 0" @fadeIn>
       <div *ngIf="shouldDisplayResetButton$ |async" class="mb-2 reset">
-        <ds-themed-results-back-button [back]="back" [buttonType]="backButtonType"></ds-themed-results-back-button>
+        <ds-themed-results-back-button [back]="back" [buttonLabel]="buttonLabel"></ds-themed-results-back-button>
       </div>
     <ds-viewable-collection
       [config]="paginationConfig"
@@ -18,7 +18,7 @@
   <ds-error *ngIf="objects?.hasFailed" message="{{'error.browse-by' | translate}}"></ds-error>
   <div *ngIf="!objects?.isLoading && objects?.payload?.page.length === 0">
     <div *ngIf="shouldDisplayResetButton$ |async" class="d-inline-block mb-4 reset">
-      <ds-themed-results-back-button [back]="back" [buttonType]="backButtonType"></ds-themed-results-back-button>
+      <ds-themed-results-back-button [back]="back" [buttonLabel]="buttonLabel"></ds-themed-results-back-button>
     </div>
     <div class="alert alert-info w-100" role="alert">
       {{'browse.empty' | translate}}
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 01351fd030..0dc20033f8 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -12,6 +12,7 @@ import { ViewMode } from '../../core/shared/view-mode.model';
 import { RouteService } from '../../core/services/route.service';
 import { map } from 'rxjs/operators';
 import { hasValue } from '../empty.util';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'ds-browse-by',
@@ -124,18 +125,19 @@ export class BrowseByComponent implements OnInit, OnDestroy {
 
   public constructor(private injector: Injector,
                      protected paginationService: PaginationService,
+                     protected translateService: TranslateService,
                      private routeService: RouteService,
   ) {
 
   }
 
   /**
-   * Used to set the back button label for metadata browsing.
+   * The label used by the back button.
    */
-  backButtonType = 'metadata-browse';
+  buttonLabel = this.translateService.get('browse.back.all-results');
 
   /**
-   * Used for back navigation in metadata browse.
+   * The function used for back navigation in metadata browse.
    */
   back = () => {
     const page = +this.previousPage$.value > 1 ? +this.previousPage$.value : 1;
diff --git a/src/app/shared/results-back-button/results-back-button.component.spec.ts b/src/app/shared/results-back-button/results-back-button.component.spec.ts
index 4aceea289a..11928a03c4 100644
--- a/src/app/shared/results-back-button/results-back-button.component.spec.ts
+++ b/src/app/shared/results-back-button/results-back-button.component.spec.ts
@@ -3,22 +3,16 @@ import { ResultsBackButtonComponent } from './results-back-button.component';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { RouterTestingModule } from '@angular/router/testing';
-import { PaginationServiceStub } from '../testing/pagination-service.stub';
+import { of } from 'rxjs';
 
 describe('ResultsBackButtonComponent', () => {
 
   let component: ResultsBackButtonComponent;
   let fixture: ComponentFixture<ResultsBackButtonComponent>;
-  let router;
 
-
-  router = jasmine.createSpyObj('router', {
-    navigateByUrl: jasmine.createSpy('navigateByUrl')
-  });
-
-  const translate = jasmine.createSpyObj('TranslateService', ['get']);
-
-  const paginationService = new PaginationServiceStub();
+  const translate = {
+    get: jasmine.createSpy('get').and.returnValue(of('item button')),
+  };
 
   describe('back to results', () => {
 
@@ -39,14 +33,18 @@ describe('ResultsBackButtonComponent', () => {
     describe('from a metadata browse list', () => {
 
       beforeEach(waitForAsync(() => {
+        translate.get.calls.reset();
         fixture = TestBed.createComponent(ResultsBackButtonComponent);
         component = fixture.componentInstance;
-        component.buttonType = 'metadata-browse';
+        component.buttonLabel = of('browse button');
+        component.ngOnInit();
         fixture.detectChanges();
       }));
 
       it('should have back from browse label', () => {
-        expect(translate.get).toHaveBeenCalledWith('browse.back.all-results');
+        expect(translate.get).not.toHaveBeenCalled();
+        const el = fixture.debugElement.nativeElement;
+        expect(el.innerHTML).toContain('browse button');
       });
 
     });
@@ -54,13 +52,17 @@ describe('ResultsBackButtonComponent', () => {
     describe('from an item', () => {
 
       beforeEach(waitForAsync(() => {
+        translate.get.calls.reset();
         fixture = TestBed.createComponent(ResultsBackButtonComponent);
         component = fixture.componentInstance;
+        component.ngOnInit();
         fixture.detectChanges();
       }));
 
-      it('should have item label', () => {
+      it('should set item label by default', () => {
         expect(translate.get).toHaveBeenCalledWith('search.browse.item-back');
+        const el = fixture.debugElement.nativeElement;
+        expect(el.innerHTML).toContain('item button');
       });
 
     });
diff --git a/src/app/shared/results-back-button/results-back-button.component.ts b/src/app/shared/results-back-button/results-back-button.component.ts
index bea5c55b68..779ba81154 100644
--- a/src/app/shared/results-back-button/results-back-button.component.ts
+++ b/src/app/shared/results-back-button/results-back-button.component.ts
@@ -13,11 +13,6 @@ import { TranslateService } from '@ngx-translate/core';
  */
 export class ResultsBackButtonComponent implements OnInit {
 
-  /**
-   * The button type determines the button label.
-   */
-  @Input() buttonType?: string;
-
   /**
    * The function used for back navigation.
    */
@@ -26,17 +21,15 @@ export class ResultsBackButtonComponent implements OnInit {
   /**
    * The button label translation.
    */
-  buttonLabel: Observable<string>;
+  @Input() buttonLabel?: Observable<any>;
 
   constructor(private translateService: TranslateService) {
 
   }
 
   ngOnInit(): void {
-    // Set labels for metadata browse and item back buttons.
-    if (this.buttonType === 'metadata-browse') {
-      this.buttonLabel = this.translateService.get('browse.back.all-results');
-    } else {
+    if (!this.buttonLabel) {
+      // Use the 'Back to Results' label as default.
       this.buttonLabel = this.translateService.get('search.browse.item-back');
     }
   }
diff --git a/src/app/shared/results-back-button/themed-results-back-button.component.ts b/src/app/shared/results-back-button/themed-results-back-button.component.ts
index 2f569364bb..fa9fac8e70 100644
--- a/src/app/shared/results-back-button/themed-results-back-button.component.ts
+++ b/src/app/shared/results-back-button/themed-results-back-button.component.ts
@@ -1,6 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { ThemedComponent } from '../theme-support/themed.component';
 import { ResultsBackButtonComponent } from './results-back-button.component';
+import { Observable } from 'rxjs';
 
 @Component({
   selector: 'ds-themed-results-back-button',
@@ -9,11 +10,11 @@ import { ResultsBackButtonComponent } from './results-back-button.component';
 })
 export class ThemedResultsBackButtonComponent extends ThemedComponent<ResultsBackButtonComponent> {
 
-  @Input() buttonType?: string;
+  @Input() buttonLabel?: Observable<any>;
 
   @Input() back: () => void;
 
-  protected inAndOutputNames: (keyof ResultsBackButtonComponent & keyof this)[] = ['back', 'buttonType'];
+  protected inAndOutputNames: (keyof ResultsBackButtonComponent & keyof this)[] = ['back', 'buttonLabel'];
 
   protected getComponentName(): string {
     return 'ResultsBackButtonComponent';

From 3ca8ce509889522eb10ad8546d7931236a4b7ee8 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Mon, 23 Jan 2023 10:59:27 -0800
Subject: [PATCH 148/160] Added regex property to item component

---
 .../simple/item-types/shared/item.component.ts         | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/item-page/simple/item-types/shared/item.component.ts b/src/app/item-page/simple/item-types/shared/item.component.ts
index 572debdd71..93e6a0b346 100644
--- a/src/app/item-page/simple/item-types/shared/item.component.ts
+++ b/src/app/item-page/simple/item-types/shared/item.component.ts
@@ -19,7 +19,13 @@ export class ItemComponent implements OnInit {
   @Input() object: Item;
 
   /**
-   * Used to show or hide the back to results button.
+   * This regex matches previous routes. The button is shown
+   * for matching paths and hidden in other cases.
+   */
+  previousRoute = /^(\/search|\/browse|\/collections|\/admin\/search|\/mydspace)/;
+
+  /**
+   * Used to show or hide the back to results button in the view.
    */
   showBackButton: Observable<boolean>;
 
@@ -68,7 +74,7 @@ export class ItemComponent implements OnInit {
     this.itemPageRoute = getItemPageRoute(this.object);
     // hide/show the back button
     this.showBackButton = this.routeService.getPreviousUrl().pipe(
-      filter(url => /^(\/search|\/browse|\/collections|\/admin\/search|\/mydspace)/.test(url)),
+      filter(url => this.previousRoute.test(url)),
       take(1),
       map(() => true)
     );

From db9a6e4a866e8887a326a8edcab52d9a500f1016 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Mon, 23 Jan 2023 11:04:19 -0800
Subject: [PATCH 149/160] Minor comment update.

---
 .../shared/results-back-button/results-back-button.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/results-back-button/results-back-button.component.ts b/src/app/shared/results-back-button/results-back-button.component.ts
index 779ba81154..cf29cf2f4a 100644
--- a/src/app/shared/results-back-button/results-back-button.component.ts
+++ b/src/app/shared/results-back-button/results-back-button.component.ts
@@ -9,7 +9,7 @@ import { TranslateService } from '@ngx-translate/core';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 /**
- * Component to add back to result list button to item.
+ * Component for creating a back to result list button.
  */
 export class ResultsBackButtonComponent implements OnInit {
 

From 018c74def411dc4acb41ecc69c1d0638eaa2e721 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 24 Jan 2023 15:28:57 +0100
Subject: [PATCH 150/160] 97742: Disable drag & bigger textarea on metadata
 edit

---
 .../dso-edit-metadata-value.component.html                  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
index ce08eed473..aa3c242511 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
@@ -3,7 +3,7 @@
      [ngClass]="{ 'ds-warning': mdValue.reordered || mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD, 'h-100': isOnlyValue }">
   <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex align-items-center" *ngVar="(mdRepresentation$ | async) as mdRepresentation">
     <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing && !mdRepresentation">{{ mdValue.newValue.value }}</div>
-    <textarea class="form-control" rows="2" *ngIf="mdValue.editing && !mdRepresentation" [(ngModel)]="mdValue.newValue.value"
+    <textarea class="form-control" rows="5" *ngIf="mdValue.editing && !mdRepresentation" [(ngModel)]="mdValue.newValue.value"
               [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
     <div class="d-flex" *ngIf="mdRepresentation">
       <a class="mr-2" target="_blank" [routerLink]="mdRepresentationItemRoute$ | async">{{ mdRepresentationName$ | async }}</a>
@@ -35,8 +35,8 @@
           <i class="fas fa-undo-alt fa-fw"></i>
         </button>
       </div>
-      <button class="btn btn-outline-secondary ds-drag-handle btn-sm" id="metadata-drag-btn" cdkDragHandle
-              [ngClass]="{'disabled': isOnlyValue || (saving$ | async)}" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}" [disabled]="isOnlyValue || (saving$ | async)">
+      <button class="btn btn-outline-secondary ds-drag-handle btn-sm" id="metadata-drag-btn" *ngVar="(isOnlyValue || (saving$ | async)) as disabled" cdkDragHandle [cdkDragHandleDisabled]="disabled"
+              [ngClass]="{'disabled': disabled}" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}" [disabled]="disabled">
         <i class="fas fa-grip-vertical fa-fw"></i>
       </button>
     </div>

From a8f5457a2fb4349e6b9f3e23a4fe5bc12e5bf831 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Jan 2023 15:40:12 +0000
Subject: [PATCH 151/160] Bump ua-parser-js from 0.7.32 to 0.7.33

Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.32 to 0.7.33.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Changelog](https://github.com/faisalman/ua-parser-js/blob/master/changelog.md)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.32...0.7.33)

---
updated-dependencies:
- dependency-name: ua-parser-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 22eeefb309..bc11ee7e04 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11036,9 +11036,9 @@ ua-parser-js@1.0.2:
   integrity sha512-00y/AXhx0/SsnI51fTc0rLRmafiGOM4/O+ny10Ps7f+j/b8p/ZY11ytMgznXkOVo4GQ+KwQG5UQLkLGirsACRg==
 
 ua-parser-js@^0.7.30:
-  version "0.7.32"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.32.tgz#cd8c639cdca949e30fa68c44b7813ef13e36d211"
-  integrity sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw==
+  version "0.7.33"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532"
+  integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"

From e717e610f963d10b464a0166d6cbc8d0c331e61c Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Fri, 27 Jan 2023 11:03:18 +0100
Subject: [PATCH 152/160] 97732 Header buttons now behave consistently on hover

---
 .../context-help-toggle.component.scss                 |  2 +-
 src/app/header/header.component.scss                   |  2 +-
 src/app/search-navbar/search-navbar.component.scss     |  3 ---
 .../shared/auth-nav-menu/auth-nav-menu.component.scss  |  4 ++--
 src/app/shared/lang-switch/lang-switch.component.scss  | 10 ++++------
 .../search-authority-filter.component.scss             |  2 +-
 .../search-facet-option.component.scss                 |  2 +-
 .../search-facet-selected-option.component.scss        |  2 +-
 8 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.scss b/src/app/header/context-help-toggle/context-help-toggle.component.scss
index af233dd7b5..a8c6100fae 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.scss
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.scss
@@ -2,7 +2,7 @@
   color: var(--ds-header-icon-color);
   background-color: var(--ds-header-bg);
 
-  &:hover, &focus {
+  &:hover, &:focus {
     color: var(--ds-header-icon-color-hover);
   }
 }
diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss
index 922b2d02e1..546f6a06fa 100644
--- a/src/app/header/header.component.scss
+++ b/src/app/header/header.component.scss
@@ -15,7 +15,7 @@
   a {
     color: var(--ds-header-icon-color);
 
-    &:hover, &focus {
+    &:hover, &:focus {
       color: var(--ds-header-icon-color-hover);
     }
   }
diff --git a/src/app/search-navbar/search-navbar.component.scss b/src/app/search-navbar/search-navbar.component.scss
index c1ccd289b2..125aa82f1f 100644
--- a/src/app/search-navbar/search-navbar.component.scss
+++ b/src/app/search-navbar/search-navbar.component.scss
@@ -22,8 +22,5 @@ a.submit-icon {
     width: 40vw !important;
   }
 
-  a.submit-icon {
-    color: var(--bs-link-color);
-  }
 }
 
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss b/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss
index ac51af27bf..36161ff3da 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss
@@ -13,9 +13,9 @@
 }
 
 .dropdown-toggle {
-  color: var(--ds-header-icon-color) !important;
+  color: var(--ds-header-icon-color);
 
-  &:hover, &focus {
+  &:hover, &:focus {
     color: var(--ds-header-icon-color-hover);
   }
 }
diff --git a/src/app/shared/lang-switch/lang-switch.component.scss b/src/app/shared/lang-switch/lang-switch.component.scss
index 6d79e6ab25..7b593a9bb5 100644
--- a/src/app/shared/lang-switch/lang-switch.component.scss
+++ b/src/app/shared/lang-switch/lang-switch.component.scss
@@ -2,12 +2,10 @@
   display:none;
 }
 
-@media screen and (min-width: map-get($grid-breakpoints, md)) {
-  .dropdown-toggle {
-    color: var(--ds-header-icon-color);
+.dropdown-toggle {
+  color: var(--ds-header-icon-color);
 
-    &:hover, &focus {
-      color: var(--ds-header-icon-color-hover);
-    }
+  &:hover, &:focus {
+    color: var(--ds-header-icon-color-hover);
   }
 }
diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss
index 8f61f5ebf1..9e01e19d02 100644
--- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss
@@ -1,7 +1,7 @@
 .filters {
     a {
         color: var(--bs-body-color);
-        &:hover, &focus {
+        &:hover, &:focus {
           text-decoration: none;
         }
         span.badge {
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss
index 74cede54a8..1211d2d478 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss
@@ -1,6 +1,6 @@
 a {
     color: var(--bs-body-color);
-    &:hover, &focus {
+    &:hover, &:focus {
         text-decoration: none;
     }
     span.badge {
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss
index 74cede54a8..1211d2d478 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss
@@ -1,6 +1,6 @@
 a {
     color: var(--bs-body-color);
-    &:hover, &focus {
+    &:hover, &:focus {
         text-decoration: none;
     }
     span.badge {

From bceca43580e2e10896e281079ecc3abf6ad43e6a Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Fri, 27 Jan 2023 11:59:24 +0100
Subject: [PATCH 153/160] 97732 Context help toggle button only appears when
 there is at least one element with a tooltip on the page

---
 .../context-help-toggle.component.html            | 10 ++++------
 .../context-help-toggle.component.scss            |  7 +------
 .../context-help-toggle.component.spec.ts         | 12 +++++-------
 .../context-help-toggle.component.ts              | 15 +++++----------
 src/app/shared/context-help.service.ts            |  4 ++--
 src/assets/i18n/en.json5                          |  2 --
 6 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.html b/src/app/header/context-help-toggle/context-help-toggle.component.html
index 523874d461..1ec2050497 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.html
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.html
@@ -1,12 +1,10 @@
-<div>
+<div *ngIf="buttonVisible$ | async">
   <a href="javascript:void(0);"
      role="button"
      (click)="onClick()"
-     [attr.aria-label]="((buttonDisabled$ | async) ? 'nav.context-help-toggle-disabled' : 'nav.context-help-toggle') | translate"
-     [title]="((buttonDisabled$ | async) ? 'nav.context-help-toggle-disabled' : 'nav.context-help-toggle') | translate"
+     [attr.aria-label]="'nav.context-help-toggle' | translate"
+     [title]="'nav.context-help-toggle' | translate"
   >
-    <i class="fas fa-lg fa-fw fa-question-circle"
-       [class]="(buttonDisabled$ | async) ? 'ds-context-help-toggle-disabled' : 'ds-context-help-toggle-enabled'"
-    ></i>
+    <i class="fas fa-lg fa-fw fa-question-circle ds-context-help-toggle"></i>
   </a>
 </div>
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.scss b/src/app/header/context-help-toggle/context-help-toggle.component.scss
index a8c6100fae..f3e5e01880 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.scss
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.scss
@@ -1,4 +1,4 @@
-.ds-context-help-toggle-enabled {
+.ds-context-help-toggle {
   color: var(--ds-header-icon-color);
   background-color: var(--ds-header-bg);
 
@@ -6,8 +6,3 @@
     color: var(--ds-header-icon-color-hover);
   }
 }
-
-.ds-context-help-toggle-disabled {
-  color: grey;
-  background-color: var(--ds-header-bg);
-}
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
index 93421b58eb..2d1b5bad20 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
@@ -13,9 +13,9 @@ describe('ContextHelpToggleComponent', () => {
 
   beforeEach(async () => {
     contextHelpService = jasmine.createSpyObj('contextHelpService', [
-      'contextHelpEmpty$', 'toggleIcons'
+      'tooltipCount$', 'toggleIcons'
     ]);
-    contextHelpService.contextHelpEmpty$.and.returnValue(observableOf(true));
+    contextHelpService.tooltipCount$.and.returnValue(observableOf(0));
     await TestBed.configureTestingModule({
       declarations: [ ContextHelpToggleComponent ],
       providers: [
@@ -37,19 +37,17 @@ describe('ContextHelpToggleComponent', () => {
   });
 
   describe('if there are no elements on the page with a tooltip', () => {
-    it('clicking the button does not toggle context help icon visibility', fakeAsync(() => {
+    it('the toggle should not be visible', fakeAsync(() => {
       fixture.detectChanges();
       fixture.whenStable().then(() => {
-        fixture.debugElement.query(By.css('a')).nativeElement.click();
-        tick();
-        expect(contextHelpService.toggleIcons).toHaveBeenCalledTimes(0);
+        expect(fixture.debugElement.query(By.css('div'))).toBeNull();
       });
     }));
   });
 
   describe('if there are elements on the page with a tooltip', () => {
     beforeEach(() => {
-      contextHelpService.contextHelpEmpty$.and.returnValue(observableOf(false));
+      contextHelpService.tooltipCount$.and.returnValue(observableOf(1));
       fixture.detectChanges();
     });
 
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.ts b/src/app/header/context-help-toggle/context-help-toggle.component.ts
index 7adaffa1c0..1bd6eb4b17 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit, OnDestroy } from '@angular/core';
 import { ContextHelpService } from '../../shared/context-help.service';
 import { Observable, Subscription, BehaviorSubject } from 'rxjs';
 import { combineLatest } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 /**
  * Renders a "context help toggle" button that toggles the visibility of tooltip buttons on the page.
@@ -13,23 +14,17 @@ import { combineLatest } from 'rxjs';
   styleUrls: ['./context-help-toggle.component.scss']
 })
 export class ContextHelpToggleComponent implements OnInit, OnDestroy {
-  buttonDisabled$: Observable<boolean>;
+  buttonVisible$: Observable<boolean>;
 
   constructor(
     private contextHelpService: ContextHelpService,
   ) { }
 
-  private clickEvents: BehaviorSubject<null> = new BehaviorSubject(null);
   private subs: Subscription[];
 
   ngOnInit(): void {
-    this.buttonDisabled$ = this.contextHelpService.contextHelpEmpty$();
-    this.subs = [
-      this.buttonDisabled$.subscribe(),
-      combineLatest([this.clickEvents, this.buttonDisabled$])
-        .subscribe(([_, disabled]) =>
-          disabled ? null : this.contextHelpService.toggleIcons())
-    ];
+    this.buttonVisible$ = this.contextHelpService.tooltipCount$().pipe(map(x => x > 0));
+    this.subs = [this.buttonVisible$.subscribe()];
   }
 
   ngOnDestroy() {
@@ -37,6 +32,6 @@ export class ContextHelpToggleComponent implements OnInit, OnDestroy {
   }
 
   onClick() {
-    this.clickEvents.next(null);
+    this.contextHelpService.toggleIcons();
   }
 }
diff --git a/src/app/shared/context-help.service.ts b/src/app/shared/context-help.service.ts
index 68f6cfd92c..f10f258be9 100644
--- a/src/app/shared/context-help.service.ts
+++ b/src/app/shared/context-help.service.ts
@@ -54,9 +54,9 @@ export class ContextHelpService {
   /**
    * Observable that yields true iff there are currently no context help entries in the store.
    */
-  contextHelpEmpty$(): Observable<boolean> {
+  tooltipCount$(): Observable<number> {
     return this.store.pipe(select(allContextHelpSelector))
-      .pipe(map((models: ContextHelpModels) => Object.keys(models).length === 0));
+      .pipe(map((models: ContextHelpModels) => Object.keys(models).length));
   }
 
   /**
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 5a8c27da0d..03596f2292 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2680,8 +2680,6 @@
 
   "nav.context-help-toggle": "Toggle context help",
 
-  "nav.context-help-toggle-disabled": "No context help available on this page",
-
   "nav.language": "Language switch",
 
   "nav.login": "Log In",

From 1e85e1d88b2380751c9d420e2d835019fc1a3695 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Fri, 27 Jan 2023 12:30:42 +0100
Subject: [PATCH 154/160] 97732 Fix header search icon hover color

---
 src/app/search-navbar/search-navbar.component.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/app/search-navbar/search-navbar.component.scss b/src/app/search-navbar/search-navbar.component.scss
index 125aa82f1f..40433fc619 100644
--- a/src/app/search-navbar/search-navbar.component.scss
+++ b/src/app/search-navbar/search-navbar.component.scss
@@ -14,6 +14,11 @@ a.submit-icon {
   cursor: pointer;
   position: sticky;
   top: 0;
+
+  color: var(--ds-header-icon-color);
+  &:hover, &:focus {
+    color: var(--ds-header-icon-color-hover);
+  }
 }
 
 @media screen and (max-width: map-get($grid-breakpoints, md)) {

From 7574f828bad696246efbb5474295b80322e1f978 Mon Sep 17 00:00:00 2001
From: cris <cristian.guzman.contacto@gmail.com>
Date: Sat, 28 Jan 2023 18:23:33 +0000
Subject: [PATCH 155/160] adding space in es.json5 for
 pagination.showing.detail

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

diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 02169514c4..671be41835 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -4238,7 +4238,7 @@
   "pagination.showing.detail": "{{ range }} de {{ total }}",
 
   // "pagination.showing.label": "Now showing ",
-  "pagination.showing.label": "Mostrando",
+  "pagination.showing.label": "Mostrando ",
 
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Opciones de clasificación",

From 53dfca0056e0c2ea5e5d0a6ab56355ac8bd773c6 Mon Sep 17 00:00:00 2001
From: cris <cristian.guzman.contacto@gmail.com>
Date: Mon, 30 Jan 2023 19:31:54 +0000
Subject: [PATCH 156/160] fixed issue #1190 with id 470077

---
 .../item-operation/item-operation.component.html          | 4 ++--
 src/assets/i18n/ar.json5                                  | 8 ++++----
 src/assets/i18n/bn.json5                                  | 6 +++---
 src/assets/i18n/cs.json5                                  | 8 ++++----
 src/assets/i18n/de.json5                                  | 8 ++++----
 src/assets/i18n/en.json5                                  | 4 ++--
 src/assets/i18n/es.json5                                  | 8 ++++----
 src/assets/i18n/fi.json5                                  | 8 ++++----
 src/assets/i18n/fr.json5                                  | 8 ++++----
 src/assets/i18n/gd.json5                                  | 8 ++++----
 src/assets/i18n/hu.json5                                  | 6 +++---
 src/assets/i18n/ja.json5                                  | 8 ++++----
 src/assets/i18n/kk.json5                                  | 8 ++++----
 src/assets/i18n/lv.json5                                  | 6 +++---
 src/assets/i18n/nl.json5                                  | 6 +++---
 src/assets/i18n/pt-BR.json5                               | 8 ++++----
 src/assets/i18n/pt-PT.json5                               | 8 ++++----
 src/assets/i18n/sv.json5                                  | 8 ++++----
 src/assets/i18n/sw.json5                                  | 8 ++++----
 src/assets/i18n/tr.json5                                  | 6 +++---
 src/assets/i18n/uk.json5                                  | 8 ++++----
 21 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.html b/src/app/item-page/edit-item-page/item-operation/item-operation.component.html
index ecbc19aea8..85c6a2cca1 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.html
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.html
@@ -5,12 +5,12 @@
 </div>
 <div class="col-9 float-left action-button">
   <span *ngIf="operation.authorized">
-    <button class="btn btn-outline-primary" [disabled]="operation.disabled" [routerLink]="operation.operationUrl">
+    <button class="btn btn-outline-primary" [disabled]="operation.disabled" [routerLink]="operation.operationUrl" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
       {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate}}
     </button>
   </span>
   <span *ngIf="!operation.authorized" [ngbTooltip]="'item.edit.tabs.status.buttons.unauthorized' | translate">
-    <button class="btn btn-outline-primary" [disabled]="true">
+    <button class="btn btn-outline-primary" [disabled]="true" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
       {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate}}
     </button>
   </span>
diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5
index 58c8c61eb5..24e6e14603 100644
--- a/src/assets/i18n/ar.json5
+++ b/src/assets/i18n/ar.json5
@@ -3246,9 +3246,9 @@
   // TODO New key - Add a translation
   "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
   // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.move.button": "Move...",
+  "item.edit.tabs.status.buttons.move.button": "Mover éste ítem a una colección distinta",
   
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   // TODO New key - Add a translation
@@ -3278,9 +3278,9 @@
   // TODO New key - Add a translation
   "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
   // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
+  "item.edit.tabs.status.buttons.withdraw.button": "Retirar éste ítem",
   
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/bn.json5 b/src/assets/i18n/bn.json5
index 8020ee7a96..55ec1820dd 100644
--- a/src/assets/i18n/bn.json5
+++ b/src/assets/i18n/bn.json5
@@ -2908,7 +2908,7 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "ম্যাপড সংগ্রহ পরিচালনা করুন",
   
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
   "item.edit.tabs.status.buttons.move.button": "সরানো ...",
   
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
@@ -2935,8 +2935,8 @@
   // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
   "item.edit.tabs.status.buttons.unauthorized": "আপনি এই অ্যাকশন সঞ্চালন করার জন্য অনুমোদিত না",
   
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "প্রত্যাহার ...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "এই আইটেম প্রত্যাহার করুন",
   
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "সংগ্রহস্থল থেকে আইটেম প্রত্যাহার",
diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 12b67e54e2..a04e89b2c3 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -3186,9 +3186,9 @@
   // TODO New key - Add a translation
   "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
   // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.move.button": "Move...",
+  "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
   
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   // TODO New key - Add a translation
@@ -3218,9 +3218,9 @@
   // TODO New key - Add a translation
   "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
   // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
+  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
   
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 80a6b5605a..c1979be6b6 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -2698,8 +2698,8 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Gespiegelte Sammlungen bearbeiten",
   
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Verschieben...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Verschieben Sie diesen Artikel in eine andere Sammlung",
   
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Item in eine andere Sammlung verschieben",
@@ -2722,8 +2722,8 @@
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   "item.edit.tabs.status.buttons.reinstate.label": "Item im Repositorium wiederherstellen",
   
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Zurückziehen...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "Ziehen Sie diesen Artikel zurück",
   
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Item aus dem Repositorium zurückziehen",
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index c66669a51f..f968ae2399 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2140,7 +2140,7 @@
 
   "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
 
-  "item.edit.tabs.status.buttons.move.button": "Move...",
+  "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
 
   "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
 
@@ -2158,7 +2158,7 @@
 
   "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
 
-  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
+  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
 
   "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
 
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 02169514c4..054f66febc 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -3077,8 +3077,8 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Administrar colecciones mapeadas",
 
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Mover...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Mover éste ítem a una colección diferente",
 
   // "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",
@@ -3104,8 +3104,8 @@
   // "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.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "Retirar éste ítem",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Retirar ítem del repositorio",
diff --git a/src/assets/i18n/fi.json5 b/src/assets/i18n/fi.json5
index 1ef67e2a48..2a077006cc 100644
--- a/src/assets/i18n/fi.json5
+++ b/src/assets/i18n/fi.json5
@@ -2470,8 +2470,8 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Hallinnoi liitettyjä kokoelmia",
 
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Siirrä...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Siirrä tämä kohde toiseen kokoelmaan",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Siirrä tietue toiseen kokoelmaan",
@@ -2494,8 +2494,8 @@
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   "item.edit.tabs.status.buttons.reinstate.label": "Palauta tietue arkistoon",
 
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Poista käytöstä...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "poista tämä kohde",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Poista tietue käytöstä",
diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index fcfd70be70..381e13a743 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -2811,8 +2811,8 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Gérer les collections associées",
 
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Déplacer...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Déplacer cet élément vers une autre collection",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Déplacer l'Item dans une autre collection",
@@ -2838,8 +2838,8 @@
   // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
   "item.edit.tabs.status.buttons.unauthorized": "Vous n'êtes pas autorisé à effectuer cette action",
 
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Retirer...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "Retirer cet article",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Retirer l'Item du dépôt",
diff --git a/src/assets/i18n/gd.json5 b/src/assets/i18n/gd.json5
index e42bb239f2..083de54781 100644
--- a/src/assets/i18n/gd.json5
+++ b/src/assets/i18n/gd.json5
@@ -2892,8 +2892,8 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Manaids cruinneachaidhean mapaichte",
 
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Gluais...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Helyezze át ezt az elemet egy másik gyűjteménybe",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Gluais nì gu cruinneachadh eile",
@@ -2919,8 +2919,8 @@
   // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
   "item.edit.tabs.status.buttons.unauthorized": "Chan eil cead agad an gnìomh seo a dhèanamh",
 
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Thoir air falbh...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "Thoir air falbh",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
     "item.edit.tabs.status.buttons.withdraw.label": "Thoir nì air falbh bhon ionad-tasgaidh",
diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5
index 8231f79652..0e73e9dbae 100644
--- a/src/assets/i18n/hu.json5
+++ b/src/assets/i18n/hu.json5
@@ -2481,7 +2481,7 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Térképezett gyűjtemények szervezése",
   
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
   "item.edit.tabs.status.buttons.move.button": "Elmozdítás...",
   
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
@@ -2505,8 +2505,8 @@
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   "item.edit.tabs.status.buttons.reinstate.label": "Tárgy visszaállítása az adattárba",
   
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Visszavonás...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "Vedd vissza ezt az elemet",
   
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Tárgy visszavonása az adattárból",
diff --git a/src/assets/i18n/ja.json5 b/src/assets/i18n/ja.json5
index 58c8c61eb5..71b32cf70b 100644
--- a/src/assets/i18n/ja.json5
+++ b/src/assets/i18n/ja.json5
@@ -3246,9 +3246,9 @@
   // TODO New key - Add a translation
   "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
   // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.move.button": "Move...",
+  "item.edit.tabs.status.buttons.move.button": "Verplaats dit item naar een andere collectie",
   
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   // TODO New key - Add a translation
@@ -3278,9 +3278,9 @@
   // TODO New key - Add a translation
   "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
   // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
+  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
   
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5
index 8e46ee73ce..b661ce21d3 100644
--- a/src/assets/i18n/kk.json5
+++ b/src/assets/i18n/kk.json5
@@ -3094,7 +3094,7 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Салыстырмалы коллекцияларды басқару",
 
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
   "item.edit.tabs.status.buttons.move.button": "Ысыру...",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
@@ -3121,11 +3121,11 @@
   // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
   "item.edit.tabs.status.buttons.unauthorized": "Сіз бұл әрекетті орындауға құқығыңыз жоқ",
 
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Шегінуге...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "бұл тармақты алып тастаңыз",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
-  "item.edit.tabs.status.buttons.withdraw.label": "Қоймадан тауарды алып қою",
+  "item.edit.tabs.status.buttons.withdraw.label": "Бұл элементті алып тастаңыз",
 
   // "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": "Тауарларды басқару бетіне қош келдіңіз. Осы жерден элементті алып тастауға, қалпына келтіруге, жылжытуға немесе жоюға болады. Басқа қойындыларда жаңа метадеректерді / бит ағындарын жаңартуға немесе қосуға болады.",
diff --git a/src/assets/i18n/lv.json5 b/src/assets/i18n/lv.json5
index 995d8175af..e00ad3517b 100644
--- a/src/assets/i18n/lv.json5
+++ b/src/assets/i18n/lv.json5
@@ -2672,7 +2672,7 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Pārvaldīt piesaistītās kolekcijas",
 
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
   "item.edit.tabs.status.buttons.move.button": "Pārvieto...",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
@@ -2696,8 +2696,8 @@
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   "item.edit.tabs.status.buttons.reinstate.label": "Atjaunot materiālu repozitorijā",
 
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Atsaukt...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "Izņemiet šo vienumu",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Izņemiet materiālu no repozitorijas",
diff --git a/src/assets/i18n/nl.json5 b/src/assets/i18n/nl.json5
index fb66f769ae..b02e3a5276 100644
--- a/src/assets/i18n/nl.json5
+++ b/src/assets/i18n/nl.json5
@@ -2915,7 +2915,7 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Beheer gemapte collecties",
   
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
   "item.edit.tabs.status.buttons.move.button": "Verplaats ..",
   
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
@@ -2939,8 +2939,8 @@
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   "item.edit.tabs.status.buttons.reinstate.label": "Zet het item terug in het repository",
   
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Trek terug ...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "onttrek hierdie item",
   
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Trek het item terug uit het repository",
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index 77b06a6566..f68436d00b 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -2994,8 +2994,8 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Gerenciar coleções mapeadas",
 
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Mover...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Mova este item para uma coleção diferente",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Mover item para outra coleção",
@@ -3021,8 +3021,8 @@
   // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
   "item.edit.tabs.status.buttons.unauthorized": "Você não está autorizado a realizar esta ação",
 
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Retirar...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "retirar este item",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Retirar item do repositório",
diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index c0327c4b54..b277e866c0 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -2676,8 +2676,8 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Gerenciar coleções mapeadas",
   
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Mover...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Mova este item para uma coleção diferente",
   
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Mover item para outra coleção",
@@ -2700,8 +2700,8 @@
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   "item.edit.tabs.status.buttons.reinstate.label": "Restabelecer item no repositório",
   
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Retirar...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "retirar este item",
   
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Retirar item do repositório",
diff --git a/src/assets/i18n/sv.json5 b/src/assets/i18n/sv.json5
index 86a6b045cc..d04b95e144 100644
--- a/src/assets/i18n/sv.json5
+++ b/src/assets/i18n/sv.json5
@@ -2936,8 +2936,8 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Hantera mappade samlingar",
 
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Flytta...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Flytta detta föremål till en annan samling",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Flytta post till en annan samling",
@@ -2963,8 +2963,8 @@
   // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
   "item.edit.tabs.status.buttons.unauthorized": "Du saknar behörighet att utföra detta",
 
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Återkalla...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "dra tillbaka den här artikeln",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Återkalla post från arkivet",
diff --git a/src/assets/i18n/sw.json5 b/src/assets/i18n/sw.json5
index 58c8c61eb5..5e00b54599 100644
--- a/src/assets/i18n/sw.json5
+++ b/src/assets/i18n/sw.json5
@@ -3246,9 +3246,9 @@
   // TODO New key - Add a translation
   "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
   // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.move.button": "Move...",
+  "item.edit.tabs.status.buttons.move.button": "Bu Öğeyi farklı bir Koleksiyona taşıyın",
   
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   // TODO New key - Add a translation
@@ -3278,9 +3278,9 @@
   // TODO New key - Add a translation
   "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
   // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
+  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
   
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/tr.json5 b/src/assets/i18n/tr.json5
index 8eb0ce7e19..fff02c5967 100644
--- a/src/assets/i18n/tr.json5
+++ b/src/assets/i18n/tr.json5
@@ -2472,7 +2472,7 @@
   // "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": "Move this Item to a different Collection",
   "item.edit.tabs.status.buttons.move.button": "Taşınıyor...",
   
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
@@ -2496,8 +2496,8 @@
   // "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.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "bu öğeyi geri çek",
   
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Depodan öğeyi çıkar",
diff --git a/src/assets/i18n/uk.json5 b/src/assets/i18n/uk.json5
index b0413d9353..0ba5b0109a 100644
--- a/src/assets/i18n/uk.json5
+++ b/src/assets/i18n/uk.json5
@@ -2590,8 +2590,8 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Керувати прив'язаними зібраннями",
 
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Перемістити...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Перемістити цей елемент до іншої колекції",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Перемістити документ до іншого зібрання",
@@ -2614,8 +2614,8 @@
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   "item.edit.tabs.status.buttons.reinstate.label": "Відновити документ в репозиторій",
 
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Вилучити...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "вилучити цей предмет",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Вилучити документ з репозиторію",

From 47f05bf11db435229b513daf3af0f57b376925b7 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 31 Jan 2023 13:33:29 +0100
Subject: [PATCH 157/160] 97742: Feedback 2023-01-27 - Table roles and aria
 attributes + additional feedback changes

---
 ...-edit-metadata-field-values.component.html |  5 +-
 ...edit-metadata-value-headers.component.html |  5 ++
 ...edit-metadata-value-headers.component.scss |  0
 ...o-edit-metadata-value-headers.component.ts | 17 ++++
 .../dso-edit-metadata-value.component.html    | 60 ++++++++------
 .../dso-edit-metadata-value.component.scss    |  2 +-
 .../dso-edit-metadata.component.html          | 82 +++++++++++--------
 src/app/dso-shared/dso-shared.module.ts       |  2 +
 src/assets/i18n/en.json5                      |  2 -
 src/styles/_global-styles.scss                | 12 +++
 10 files changed, 123 insertions(+), 64 deletions(-)
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.html
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.scss
 create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.ts

diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
index cfa457580f..9f74216d54 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
@@ -1,5 +1,6 @@
-<div class="flex-grow-1 ds-drop-list h-100" [class.disabled]="(draggingMdField$ | async) && (draggingMdField$ | async) !== mdField" cdkDropList (cdkDropListDropped)="drop($event)">
-  <ds-dso-edit-metadata-value *ngFor="let mdValue of form.fields[mdField]; let idx = index"
+<div class="flex-grow-1 ds-drop-list h-100" [class.disabled]="(draggingMdField$ | async) && (draggingMdField$ | async) !== mdField" cdkDropList (cdkDropListDropped)="drop($event)" role="table">
+  <ds-dso-edit-metadata-value-headers role="presentation" [dsoType]="dsoType"></ds-dso-edit-metadata-value-headers>
+  <ds-dso-edit-metadata-value *ngFor="let mdValue of form.fields[mdField]; let idx = index" role="presentation"
                               [dso]="dso"
                               [mdValue]="mdValue"
                               [dsoType]="dsoType"
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.html
new file mode 100644
index 0000000000..2c3fb54600
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.html
@@ -0,0 +1,5 @@
+<div role="row" class="visually-hidden">
+  <div role="columnheader">{{ dsoType + '.edit.metadata.headers.value' | translate }}</div>
+  <div role="columnheader">{{ dsoType + '.edit.metadata.headers.language' | translate }}</div>
+  <div role="columnheader">{{ dsoType + '.edit.metadata.headers.edit' | translate }}</div>
+</div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.ts
new file mode 100644
index 0000000000..dfda2a50d1
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.ts
@@ -0,0 +1,17 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'ds-dso-edit-metadata-value-headers',
+  styleUrls: ['./dso-edit-metadata-value-headers.component.scss', '../dso-edit-metadata-shared/dso-edit-metadata-cells.scss'],
+  templateUrl: './dso-edit-metadata-value-headers.component.html',
+})
+/**
+ * Component displaying invisible headers for a list of metadata values using table roles for accessibility
+ */
+export class DsoEditMetadataValueHeadersComponent {
+  /**
+   * Type of DSO we're displaying values for
+   * Determines i18n messages
+   */
+  @Input() dsoType: string;
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
index aa3c242511..f54dde4971 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
@@ -1,7 +1,7 @@
-<div class="d-flex flex-row ds-value-row" *ngVar="mdValue.newValue.isVirtual as isVirtual"
+<div class="d-flex flex-row ds-value-row" *ngVar="mdValue.newValue.isVirtual as isVirtual" role="row"
      cdkDrag (cdkDragStarted)="dragging.emit(true)" (cdkDragEnded)="dragging.emit(false)"
      [ngClass]="{ 'ds-warning': mdValue.reordered || mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD, 'h-100': isOnlyValue }">
-  <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex align-items-center" *ngVar="(mdRepresentation$ | async) as mdRepresentation">
+  <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex align-items-center" *ngVar="(mdRepresentation$ | async) as mdRepresentation" role="cell">
     <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing && !mdRepresentation">{{ mdValue.newValue.value }}</div>
     <textarea class="form-control" rows="5" *ngIf="mdValue.editing && !mdRepresentation" [(ngModel)]="mdValue.newValue.value"
               [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
@@ -10,33 +10,45 @@
       <ds-type-badge [object]="mdRepresentation"></ds-type-badge>
     </div>
   </div>
-  <div class="ds-flex-cell ds-lang-cell">
+  <div class="ds-flex-cell ds-lang-cell" role="cell">
     <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing">{{ mdValue.newValue.language }}</div>
     <input class="form-control" type="text" *ngIf="mdValue.editing" [(ngModel)]="mdValue.newValue.language"
            [dsDebounce]="300" (onDebounce)="confirm.emit(false)" />
   </div>
-  <div class="text-center ds-flex-cell ds-edit-cell">
-    <div class="btn-group edit-field">
-      <div class="btn-group" [ngbTooltip]="isVirtual ? (dsoType + '.edit.metadata.edit.buttons.virtual' | translate) : null">
-        <button class="btn btn-outline-primary btn-sm ng-star-inserted" id="metadata-edit-btn" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}" *ngIf="!mdValue.editing"
-                [disabled]="isVirtual || mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="edit.emit()">
-          <i class="fas fa-edit fa-fw"></i>
-        </button>
-        <button class="btn btn-outline-success btn-sm ng-star-inserted" id="metadata-confirm-btn" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}" *ngIf="mdValue.editing"
-                [disabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
-          <i class="fas fa-check fa-fw"></i>
-        </button>
-        <button class="btn btn-outline-danger btn-sm" id="metadata-remove-btn" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
-                [disabled]="isVirtual || (mdValue.change && mdValue.change !== DsoEditMetadataChangeTypeEnum.ADD) || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
-          <i class="fas fa-trash-alt fa-fw"></i>
-        </button>
-        <button class="btn btn-outline-warning btn-sm" id="metadata-undo-btn" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
-                [disabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
-          <i class="fas fa-undo-alt fa-fw"></i>
-        </button>
+  <div class="text-center ds-flex-cell ds-edit-cell" role="cell">
+    <div class="btn-group">
+      <div class="edit-field">
+        <div class="btn-group edit-buttons" [ngbTooltip]="isVirtual ? (dsoType + '.edit.metadata.edit.buttons.virtual' | translate) : null">
+          <button class="btn btn-outline-primary btn-sm ng-star-inserted" id="metadata-edit-btn" *ngIf="!mdValue.editing"
+                  [title]="dsoType + '.edit.metadata.edit.buttons.edit' | translate"
+                  ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}"
+                  [disabled]="isVirtual || mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="edit.emit()">
+            <i class="fas fa-edit fa-fw"></i>
+          </button>
+          <button class="btn btn-outline-success btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="mdValue.editing"
+                  [title]="dsoType + '.edit.metadata.edit.buttons.confirm' | translate"
+                  ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}"
+                  [disabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
+            <i class="fas fa-check fa-fw"></i>
+          </button>
+          <button class="btn btn-outline-danger btn-sm" id="metadata-remove-btn"
+                  [title]="dsoType + '.edit.metadata.edit.buttons.remove' | translate"
+                  ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
+                  [disabled]="isVirtual || (mdValue.change && mdValue.change !== DsoEditMetadataChangeTypeEnum.ADD) || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
+            <i class="fas fa-trash-alt fa-fw"></i>
+          </button>
+          <button class="btn btn-outline-warning btn-sm" id="metadata-undo-btn"
+                  [title]="dsoType + '.edit.metadata.edit.buttons.undo' | translate"
+                  ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
+                  [disabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
+            <i class="fas fa-undo-alt fa-fw"></i>
+          </button>
+        </div>
       </div>
-      <button class="btn btn-outline-secondary ds-drag-handle btn-sm" id="metadata-drag-btn" *ngVar="(isOnlyValue || (saving$ | async)) as disabled" cdkDragHandle [cdkDragHandleDisabled]="disabled"
-              [ngClass]="{'disabled': disabled}" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}" [disabled]="disabled">
+      <button class="btn btn-outline-secondary ds-drag-handle btn-sm" id="metadata-drag-btn" *ngVar="(isOnlyValue || (saving$ | async)) as disabled"
+              cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [disabled]="disabled"
+              [title]="dsoType + '.edit.metadata.edit.buttons.drag' | translate"
+              ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}">
         <i class="fas fa-grip-vertical fa-fw"></i>
       </button>
     </div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
index bcf491b9ce..4a207ee1a4 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
@@ -7,7 +7,7 @@
   cursor: grab;
 }
 
-::ng-deep .tooltip-inner {
+::ng-deep .edit-field>ngb-tooltip-window .tooltip-inner {
   min-width: var(--ds-dso-edit-virtual-tooltip-min-width);
 }
 
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index 51f347e163..24c3dc5cd7 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -1,61 +1,70 @@
 <div class="item-metadata" *ngIf="form">
   <div class="button-row top d-flex my-2 space-children-mr ml-gap">
     <button class="mr-auto btn btn-success" id="dso-add-btn" [disabled]="form.newValue || (saving$ | async)"
+            [title]="dsoType + '.edit.metadata.add-button' | translate"
             (click)="add()"><i class="fas fa-plus"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.add-button' | translate }}</span>
     </button>
     <button class="btn btn-warning ml-1" id="dso-reinstate-btn" *ngIf="isReinstatable" [disabled]="(saving$ | async)"
+            [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
             (click)="reinstate()"><i class="fas fa-undo-alt"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.reinstate-button' | translate }}</span>
     </button>
     <button class="btn btn-primary ml-1" id="dso-save-btn" [disabled]="!hasChanges || (saving$ | async)"
+            [title]="dsoType + '.edit.metadata.save-button' | translate"
             (click)="submit()"><i class="fas fa-save"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.save-button' | translate }}</span>
     </button>
     <button class="btn btn-danger ml-1" id="dso-discard-btn" *ngIf="!isReinstatable"
+            [title]="dsoType + '.edit.metadata.discard-button' | translate"
             [disabled]="!hasChanges || (saving$ | async)"
             (click)="discard()"><i class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.discard-button' | translate }}</span>
     </button>
   </div>
 
-  <ds-dso-edit-metadata-headers [dsoType]="dsoType"></ds-dso-edit-metadata-headers>
-  <div class="d-flex flex-row ds-field-row" *ngIf="form.newValue">
-    <div class="lbl-cell ds-success">
-      <ds-metadata-field-selector [dsoType]="dsoType"
-                                  [(mdField)]="newMdField"
-                                  [autofocus]="true">
-      </ds-metadata-field-selector>
-    </div>
-    <div class="flex-grow-1 ds-drop-list">
-      <ds-dso-edit-metadata-value [dso]="dso"
-                                  [mdValue]="form.newValue"
-                                  [dsoType]="dsoType"
-                                  [saving$]="savingOrLoadingFieldValidation$"
-                                  [isOnlyValue]="true"
-                                  (confirm)="confirmNewValue($event)"
-                                  (remove)="form.newValue = undefined"
-                                  (undo)="form.newValue = undefined">
-      </ds-dso-edit-metadata-value>
-    </div>
-  </div>
-  <div class="d-flex flex-row ds-field-row" *ngFor="let mdField of form.fieldKeys">
-    <div class="lbl-cell">
-      <span class="dont-break-out preserve-line-breaks">{{ mdField }}</span>
-      <div class="btn btn-warning reset-order-button mt-2 w-100" *ngIf="form.hasOrderChanges(mdField)"
-           (click)="form.resetOrder(mdField); onValueSaved()">
-        {{ dsoType + '.edit.metadata.reset-order-button' | translate }}
+  <div role="table" [attr.aria-label]="'item.edit.head' | translate">
+    <ds-dso-edit-metadata-headers [dsoType]="dsoType"></ds-dso-edit-metadata-headers>
+    <div class="d-flex flex-row ds-field-row" role="row" *ngIf="form.newValue">
+      <div class="lbl-cell ds-success" role="rowheader">
+        <ds-metadata-field-selector [dsoType]="dsoType"
+                                    [(mdField)]="newMdField"
+                                    [autofocus]="true">
+        </ds-metadata-field-selector>
+      </div>
+      <div class="flex-grow-1 ds-drop-list" role="cell">
+        <div role="table">
+          <ds-dso-edit-metadata-value-headers role="presentation" [dsoType]="dsoType"></ds-dso-edit-metadata-value-headers>
+          <ds-dso-edit-metadata-value [dso]="dso"
+                                      [mdValue]="form.newValue"
+                                      [dsoType]="dsoType"
+                                      [saving$]="savingOrLoadingFieldValidation$"
+                                      [isOnlyValue]="true"
+                                      (confirm)="confirmNewValue($event)"
+                                      (remove)="form.newValue = undefined"
+                                      (undo)="form.newValue = undefined">
+          </ds-dso-edit-metadata-value>
+        </div>
       </div>
     </div>
-    <ds-dso-edit-metadata-field-values class="flex-grow-1"
-                                       [dso]="dso"
-                                       [form]="form"
-                                       [dsoType]="dsoType"
-                                       [saving$]="saving$"
-                                       [draggingMdField$]="draggingMdField$"
-                                       [mdField]="mdField"
-                                       (valueSaved)="onValueSaved()">
-    </ds-dso-edit-metadata-field-values>
+    <div class="d-flex flex-row ds-field-row" role="row" *ngFor="let mdField of form.fieldKeys">
+      <div class="lbl-cell" role="rowheader">
+        <span class="dont-break-out preserve-line-breaks">{{ mdField }}</span>
+        <div class="btn btn-warning reset-order-button mt-2 w-100" *ngIf="form.hasOrderChanges(mdField)"
+             (click)="form.resetOrder(mdField); onValueSaved()">
+          {{ dsoType + '.edit.metadata.reset-order-button' | translate }}
+        </div>
+      </div>
+      <ds-dso-edit-metadata-field-values class="flex-grow-1" role="cell"
+                                         [dso]="dso"
+                                         [form]="form"
+                                         [dsoType]="dsoType"
+                                         [saving$]="saving$"
+                                         [draggingMdField$]="draggingMdField$"
+                                         [mdField]="mdField"
+                                         (valueSaved)="onValueSaved()">
+      </ds-dso-edit-metadata-field-values>
+    </div>
   </div>
 
   <div *ngIf="isEmpty && !form.newValue">
@@ -64,12 +73,15 @@
   <div class="button-row bottom d-inline-block w-100">
     <div class="mt-2 float-right space-children-mr ml-gap">
       <button class="btn btn-warning" *ngIf="isReinstatable" [disabled]="(saving$ | async)"
+              [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
               (click)="reinstate()"><i class="fas fa-undo-alt"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
       </button>
       <button class="btn btn-primary" [disabled]="!hasChanges || (saving$ | async)"
+              [title]="dsoType + '.edit.metadata.save-button' | translate"
               (click)="submit()"><i class="fas fa-save"></i> {{ dsoType + '.edit.metadata.save-button' | translate }}
       </button>
       <button class="btn btn-danger" *ngIf="!isReinstatable"
+              [title]="dsoType + '.edit.metadata.discard-button' | translate"
               [disabled]="!hasChanges || (saving$ | async)"
               (click)="discard()"><i class="fas fa-times"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
       </button>
diff --git a/src/app/dso-shared/dso-shared.module.ts b/src/app/dso-shared/dso-shared.module.ts
index 0a9294105b..019a7f6b9e 100644
--- a/src/app/dso-shared/dso-shared.module.ts
+++ b/src/app/dso-shared/dso-shared.module.ts
@@ -5,6 +5,7 @@ import { MetadataFieldSelectorComponent } from './dso-edit-metadata/metadata-fie
 import { DsoEditMetadataFieldValuesComponent } from './dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component';
 import { DsoEditMetadataValueComponent } from './dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component';
 import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component';
+import { DsoEditMetadataValueHeadersComponent } from './dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component';
 
 @NgModule({
   imports: [
@@ -16,6 +17,7 @@ import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata/dso-edit-me
     DsoEditMetadataFieldValuesComponent,
     DsoEditMetadataValueComponent,
     DsoEditMetadataHeadersComponent,
+    DsoEditMetadataValueHeadersComponent,
   ],
   exports: [
     DsoEditMetadataComponent,
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index fd2b049d54..cb141691fb 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2288,8 +2288,6 @@
 
   "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
 
-  "itemtemplate.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the \"Relationships\" tab",
-
   "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
 
   "itemtemplate.edit.metadata.headers.edit": "Edit",
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index e337539c15..d9c01e85ae 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -92,3 +92,15 @@ ngb-modal-backdrop {
   hyphens: auto;
 
 }
+
+.visually-hidden {
+  position: absolute !important;
+  width: 1px !important;
+  height: 1px !important;
+  padding: 0 !important;
+  margin: -1px !important;
+  overflow: hidden !important;
+  clip: rect(0, 0, 0, 0) !important;
+  white-space: nowrap !important;
+  border: 0 !important;
+}

From 4eb00d67c5823d037739e172e629d7d264fc4578 Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Tue, 31 Jan 2023 18:36:20 +0100
Subject: [PATCH 158/160] only check the first page of bitstreams when
 generating the citation_pdf_url meta tag

---
 .../core/metadata/metadata.service.spec.ts    |  92 +++++++++++---
 src/app/core/metadata/metadata.service.ts     | 112 +++++++++---------
 2 files changed, 127 insertions(+), 77 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index 66d9b9921c..553b437d71 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -8,7 +8,12 @@ import { Observable, of as observableOf, of } from 'rxjs';
 import { RemoteData } from '../data/remote-data';
 import { Item } from '../shared/item.model';
 
-import { ItemMock, MockBitstream1, MockBitstream3 } from '../../shared/mocks/item.mock';
+import {
+  ItemMock,
+  MockBitstream1,
+  MockBitstream3,
+  MockBitstream2
+} from '../../shared/mocks/item.mock';
 import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { PaginatedList } from '../data/paginated-list.model';
 import { Bitstream } from '../shared/bitstream.model';
@@ -24,6 +29,7 @@ import { HardRedirectService } from '../services/hard-redirect.service';
 import { getMockStore } from '@ngrx/store/testing';
 import { AddMetaTagAction, ClearMetaTagAction } from './meta-tag.actions';
 import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+import { AppConfig } from '../../../config/app-config.interface';
 
 describe('MetadataService', () => {
   let metadataService: MetadataService;
@@ -44,6 +50,8 @@ describe('MetadataService', () => {
   let router: Router;
   let store;
 
+  let appConfig: AppConfig;
+
   const initialState = { 'core': { metaTag: { tagsInUse: ['title', 'description'] }}};
 
 
@@ -86,6 +94,14 @@ describe('MetadataService', () => {
     store = getMockStore({ initialState });
     spyOn(store, 'dispatch');
 
+    appConfig = {
+      item: {
+        bitstream: {
+          pageSize: 5
+        }
+      }
+    } as any;
+
     metadataService = new MetadataService(
       router,
       translateService,
@@ -98,6 +114,7 @@ describe('MetadataService', () => {
       rootService,
       store,
       hardRedirectService,
+      appConfig,
       authorizationService
     );
   });
@@ -358,29 +375,66 @@ 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.findListByHref as jasmine.Spy).and.returnValues(
-          ...mockBitstreamPages$(bitstreams).map(bp => createSuccessfulRemoteDataObject$(bp)),
-        );
+      describe(`when there's a bitstream with an allowed format on the first page`, () => {
+        let bitstreams;
 
-        (metadataService as any).processRouteChange({
-          data: {
-            value: {
-              dso: createSuccessfulRemoteDataObject(ItemMock),
+        beforeEach(() => {
+          bitstreams = [MockBitstream2, MockBitstream3, MockBitstream1];
+          (bundleDataService.findByItemAndName as jasmine.Spy).and.returnValue(mockBundleRD$(bitstreams));
+          (bitstreamDataService.findListByHref as jasmine.Spy).and.returnValues(
+            ...mockBitstreamPages$(bitstreams).map(bp => createSuccessfulRemoteDataObject$(bp)),
+          );
+        });
+
+        it('should link to first Bitstream with allowed format', fakeAsync(() => {
+          (metadataService as any).processRouteChange({
+            data: {
+              value: {
+                dso: createSuccessfulRemoteDataObject(ItemMock),
+              }
             }
-          }
-        });
-        tick();
-        expect(meta.addTag).toHaveBeenCalledWith({
-          name: 'citation_pdf_url',
-          content: 'https://request.org/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/download'
-        });
-      }));
+          });
+          tick();
+          expect(meta.addTag).toHaveBeenCalledWith({
+            name: 'citation_pdf_url',
+            content: 'https://request.org/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/download'
+          });
+        }));
+
+      });
+
     });
   });
 
+  describe(`when there's no bitstream with an allowed format on the first page`, () => {
+    let bitstreams;
+
+    beforeEach(() => {
+      bitstreams = [MockBitstream1, MockBitstream3, MockBitstream2];
+      (bundleDataService.findByItemAndName as jasmine.Spy).and.returnValue(mockBundleRD$(bitstreams));
+      (bitstreamDataService.findListByHref as jasmine.Spy).and.returnValues(
+        ...mockBitstreamPages$(bitstreams).map(bp => createSuccessfulRemoteDataObject$(bp)),
+      );
+    });
+
+    it(`shouldn't add a citation_pdf_url meta tag`, fakeAsync(() => {
+      (metadataService as any).processRouteChange({
+        data: {
+          value: {
+            dso: createSuccessfulRemoteDataObject(ItemMock),
+          }
+        }
+      });
+      tick();
+      expect(meta.addTag).not.toHaveBeenCalledWith({
+        name: 'citation_pdf_url',
+        content: 'https://request.org/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/download'
+      });
+    }));
+
+  });
+
+
   describe('tagstore', () => {
     beforeEach(fakeAsync(() => {
       (metadataService as any).processRouteChange({
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 9d5ee80bba..204c925e6b 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -1,14 +1,21 @@
-import { Injectable } from '@angular/core';
+import { Injectable, Inject } from '@angular/core';
 
 import { Meta, MetaDefinition, Title } from '@angular/platform-browser';
 import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 
 import { TranslateService } from '@ngx-translate/core';
 
-import { BehaviorSubject, combineLatest, EMPTY, Observable, of as observableOf } from 'rxjs';
-import { expand, filter, map, switchMap, take } from 'rxjs/operators';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  of as observableOf,
+  concat as observableConcat,
+  EMPTY
+} from 'rxjs';
+import { filter, map, switchMap, take, mergeMap } from 'rxjs/operators';
 
-import { hasNoValue, hasValue } from '../../shared/empty.util';
+import { hasNoValue, hasValue, isNotEmpty } from '../../shared/empty.util';
 import { DSONameService } from '../breadcrumbs/dso-name.service';
 import { BitstreamDataService } from '../data/bitstream-data.service';
 import { BitstreamFormatDataService } from '../data/bitstream-format-data.service';
@@ -37,6 +44,7 @@ import { coreSelector } from '../core.selectors';
 import { CoreState } from '../core-state.model';
 import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
 import { getDownloadableBitstream } from '../shared/bitstream.operators';
+import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 
 /**
  * The base selector function to select the metaTag section in the store
@@ -87,6 +95,7 @@ export class MetadataService {
     private rootService: RootDataService,
     private store: Store<CoreState>,
     private hardRedirectService: HardRedirectService,
+    @Inject(APP_CONFIG) private appConfig: AppConfig,
     private authorizationService: AuthorizationDataService
   ) {
   }
@@ -298,7 +307,13 @@ export class MetadataService {
         true,
         true,
         followLink('primaryBitstream'),
-        followLink('bitstreams', {}, followLink('format')),
+        followLink('bitstreams', {
+            findListOptions: {
+              // limit the number of bitstreams used to find the citation pdf url to the number
+              // shown by default on an item page
+              elementsPerPage: this.appConfig.item.bitstream.pageSize
+            }
+        }, followLink('format')),
       ).pipe(
         getFirstSucceededRemoteDataPayload(),
         switchMap((bundle: Bundle) =>
@@ -363,64 +378,45 @@ export class MetadataService {
   }
 
   /**
-   * For Items with more than one Bitstream (and no primary Bitstream), link to the first Bitstream with a MIME type
+   * For Items with more than one Bitstream (and no primary Bitstream), link to the first Bitstream
+   * with a MIME type.
+   *
+   * Note this will only check the current page (page size determined item.bitstream.pageSize in the
+   * config) of bitstreams for performance reasons.
+   * See https://github.com/DSpace/DSpace/issues/8648 for more info
+   *
    * included in {@linkcode CITATION_PDF_URL_MIMETYPES}
    * @param bitstreamRd
    * @private
    */
   private getFirstAllowedFormatBitstreamLink(bitstreamRd: RemoteData<PaginatedList<Bitstream>>): Observable<string> {
-    return observableOf(bitstreamRd.payload).pipe(
-      // Because there can be more than one page of bitstreams, this expand operator
-      // will retrieve them in turn. Due to the take(1) at the bottom, it will only
-      // retrieve pages until a match is found
-      expand((paginatedList: PaginatedList<Bitstream>) => {
-        if (hasNoValue(paginatedList.next)) {
-          // If there's no next page, stop.
-          return EMPTY;
-        } else {
-          // Otherwise retrieve the next page
-          return this.bitstreamDataService.findListByHref(
-            paginatedList.next,
-            undefined,
-            true,
-            true,
-            followLink('format')
-          ).pipe(
-            getFirstCompletedRemoteData(),
-            map((next: RemoteData<PaginatedList<Bitstream>>) => {
-              if (hasValue(next.payload)) {
-                return next.payload;
-              } else {
-                return EMPTY;
-              }
-            })
-          );
-        }
-      }),
-      // Return the array of bitstreams inside each paginated list
-      map((paginatedList: PaginatedList<Bitstream>) => paginatedList.page),
-      // Emit the bitstreams in the list one at a time
-      switchMap((bitstreams: Bitstream[]) => bitstreams),
-      // Retrieve the format for each bitstream
-      switchMap((bitstream: Bitstream) => bitstream.format.pipe(
-        getFirstSucceededRemoteDataPayload(),
-        // Keep the original bitstream, because it, not the format, is what we'll need
-        // for the link at the end
-        map((format: BitstreamFormat) => [bitstream, format])
-      )),
-      // Check if bitstream downloadable
-      switchMap(([bitstream, format]: [Bitstream, BitstreamFormat]) => observableOf(bitstream).pipe(
-        getDownloadableBitstream(this.authorizationService),
-        map((bit: Bitstream) => [bit, format])
-      )),
-      // Filter out only pairs with whitelisted formats and non-null bitstreams, null from download check
-      filter(([bitstream, format]: [Bitstream, BitstreamFormat]) =>
-        hasValue(format) && hasValue(bitstream) && this.CITATION_PDF_URL_MIMETYPES.includes(format.mimetype)),
-      // We only need 1
-      take(1),
-      // Emit the link of the match
-      map(([bitstream, ]: [Bitstream, BitstreamFormat]) => getBitstreamDownloadRoute(bitstream))
-    );
+    if (hasValue(bitstreamRd.payload) && isNotEmpty(bitstreamRd.payload.page)) {
+      // Retrieve the formats of all bitstreams in the page sequentially
+      return observableConcat(
+        ...bitstreamRd.payload.page.map((bitstream: Bitstream) => bitstream.format.pipe(
+          getFirstSucceededRemoteDataPayload(),
+          // Keep the original bitstream, because it, not the format, is what we'll need
+          // for the link at the end
+          map((format: BitstreamFormat) => [bitstream, format])
+        ))
+      ).pipe(
+        // Verify that the bitstream is downloadable
+        mergeMap(([bitstream, format]: [Bitstream, BitstreamFormat]) => observableOf(bitstream).pipe(
+          getDownloadableBitstream(this.authorizationService),
+          map((bit: Bitstream) => [bit, format])
+        )),
+        // Filter out only pairs with whitelisted formats and non-null bitstreams, null from download check
+        filter(([bitstream, format]: [Bitstream, BitstreamFormat]) =>
+          hasValue(format) && hasValue(bitstream) && this.CITATION_PDF_URL_MIMETYPES.includes(format.mimetype)),
+        // We only need 1
+        take(1),
+        // Emit the link of the match
+        // tap((v) => console.log('result', v)),
+        map(([bitstream, ]: [Bitstream, BitstreamFormat]) => getBitstreamDownloadRoute(bitstream))
+      );
+    } else {
+      return EMPTY;
+    }
   }
 
   /**

From e880062cfd0c8593904a2b2a41a6fcfb0349e247 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 2 Feb 2023 11:44:55 +0100
Subject: [PATCH 159/160] 97742: Add missing export

---
 src/app/dso-shared/dso-shared.module.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/dso-shared/dso-shared.module.ts b/src/app/dso-shared/dso-shared.module.ts
index 1614da1cfe..7d44d6a920 100644
--- a/src/app/dso-shared/dso-shared.module.ts
+++ b/src/app/dso-shared/dso-shared.module.ts
@@ -28,6 +28,7 @@ import { ThemedDsoEditMetadataComponent } from './dso-edit-metadata/themed-dso-e
     DsoEditMetadataFieldValuesComponent,
     DsoEditMetadataValueComponent,
     DsoEditMetadataHeadersComponent,
+    DsoEditMetadataValueHeadersComponent,
   ],
 })
 export class DsoSharedModule {

From 3bf5b9fd0b80ad316ce70ad438a781f8997f2731 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Mon, 6 Feb 2023 10:37:16 +0100
Subject: [PATCH 160/160] [CST-7221] Opaque search bar

---
 src/app/search-navbar/search-navbar.component.scss | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/app/search-navbar/search-navbar.component.scss b/src/app/search-navbar/search-navbar.component.scss
index 40433fc619..d5f3d8d615 100644
--- a/src/app/search-navbar/search-navbar.component.scss
+++ b/src/app/search-navbar/search-navbar.component.scss
@@ -1,9 +1,6 @@
 input[type="text"] {
   margin-top: calc(-0.5 * var(--bs-font-size-base));
-
-  &:focus {
-    background-color: rgba(255, 255, 255, 0.5) !important;
-  }
+  background-color: #fff !important;
 
   &.collapsed {
     opacity: 0;